Merge branch 'master' of github.com:emilybache/Refactoring-Katas

This commit is contained in:
emilybache 2012-12-07 19:10:31 +01:00
commit afc37306a8
2 changed files with 64 additions and 66 deletions

View File

@ -1,67 +1,65 @@
class GildedRose class GildedRose
def update_quality(items) def update_quality(items)
items.each do |item| items.each do |item|
if item.name != "Aged Brie" and item.name != "Backstage passes to a TAFKAL80ETC concert" if item.name != "Aged Brie" and item.name != "Backstage passes to a TAFKAL80ETC concert"
if item.quality > 0 if item.quality > 0
if item.name != "Sulfuras, Hand of Ragnaros" if item.name != "Sulfuras, Hand of Ragnaros"
item.quality = item.quality - 1 item.quality = item.quality - 1
end end
end
else
if item.quality < 50
item.quality = item.quality + 1
if item.name == "Backstage passes to a TAFKAL80ETC concert"
if item.sell_in < 11
if item.quality < 50
item.quality = item.quality + 1
end
end
if item.sell_in < 6
if item.quality < 50
item.quality = item.quality + 1
end
end
end
end
end
if item.name != "Sulfuras, Hand of Ragnaros"
item.sell_in = item.sell_in - 1
end
if item.sell_in < 0
if item.name != "Aged Brie"
if item.name != "Backstage passes to a TAFKAL80ETC concert"
if item.quality > 0
if item.name != "Sulfuras, Hand of Ragnaros"
item.quality = item.quality - 1
end
end
else
item.quality = item.quality - item.quality
end
else
if item.quality < 50
item.quality = item.quality + 1
end
end
end
end end
items else
if item.quality < 50
item.quality = item.quality + 1
if item.name == "Backstage passes to a TAFKAL80ETC concert"
if item.sell_in < 11
if item.quality < 50
item.quality = item.quality + 1
end
end
if item.sell_in < 6
if item.quality < 50
item.quality = item.quality + 1
end
end
end
end
end
if item.name != "Sulfuras, Hand of Ragnaros"
item.sell_in = item.sell_in - 1
end
if item.sell_in < 0
if item.name != "Aged Brie"
if item.name != "Backstage passes to a TAFKAL80ETC concert"
if item.quality > 0
if item.name != "Sulfuras, Hand of Ragnaros"
item.quality = item.quality - 1
end
end
else
item.quality = item.quality - item.quality
end
else
if item.quality < 50
item.quality = item.quality + 1
end
end
end
end end
items
end
end end
class Item class Item
attr_accessor :name, :sell_in, :quality attr_accessor :name, :sell_in, :quality
def initialize(name, sell_in, quality) def initialize(name, sell_in, quality)
@name = name @name = name
@sell_in = sell_in @sell_in = sell_in
@quality = quality @quality = quality
end end
def to_s() def to_s()
"#{@name}, #{@sell_in}, #{@quality}" "#{@name}, #{@sell_in}, #{@quality}"
end end
end end

View File

@ -1,13 +1,13 @@
require File.join(File.dirname(__FILE__), 'gilded_rose') require File.join(File.dirname(__FILE__), 'gilded_rose')
describe GildedRose do describe GildedRose do
describe "#update_quality" do describe "#update_quality" do
items = [Item.new("foo", 0, 0)] it "does not change the name" do
GildedRose.new().update_quality(items) items = [Item.new("foo", 0, 0)]
items[0].name.should == "fixme" GildedRose.new().update_quality(items)
end items[0].name.should == "fixme"
end
end
end end