From 9042bba0a22a9329a10523bee56c3104ff66e463 Mon Sep 17 00:00:00 2001 From: David Vrensk Date: Thu, 6 Dec 2012 15:53:43 +0100 Subject: [PATCH 1/2] Bug fix: the sample spec did not run --- GildedRose/ruby/gilded_rose_spec.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/GildedRose/ruby/gilded_rose_spec.rb b/GildedRose/ruby/gilded_rose_spec.rb index a84947d1..e6dce6f4 100644 --- a/GildedRose/ruby/gilded_rose_spec.rb +++ b/GildedRose/ruby/gilded_rose_spec.rb @@ -1,13 +1,13 @@ - require File.join(File.dirname(__FILE__), 'gilded_rose') - describe GildedRose do - describe "#update_quality" do - items = [Item.new("foo", 0, 0)] - GildedRose.new().update_quality(items) - items[0].name.should == "fixme" - end + describe "#update_quality" do + it "does not change the name" do + items = [Item.new("foo", 0, 0)] + GildedRose.new().update_quality(items) + items[0].name.should == "fixme" + end + end end From 75416894524890c9405cd5679df22dcc6b59b35e Mon Sep 17 00:00:00 2001 From: David Vrensk Date: Thu, 6 Dec 2012 15:54:52 +0100 Subject: [PATCH 2/2] Style fix: ruby always uses 2-space indentation --- GildedRose/ruby/gilded_rose.rb | 116 ++++++++++++++++----------------- 1 file changed, 57 insertions(+), 59 deletions(-) diff --git a/GildedRose/ruby/gilded_rose.rb b/GildedRose/ruby/gilded_rose.rb index 43b43a10..1107408a 100755 --- a/GildedRose/ruby/gilded_rose.rb +++ b/GildedRose/ruby/gilded_rose.rb @@ -1,67 +1,65 @@ class GildedRose - def update_quality(items) - items.each do |item| - if item.name != "Aged Brie" and 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 - 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 + def update_quality(items) + items.each do |item| + if item.name != "Aged Brie" and 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 - 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 + items + end end class Item - attr_accessor :name, :sell_in, :quality - - def initialize(name, sell_in, quality) - @name = name - @sell_in = sell_in - @quality = quality - end - - def to_s() - "#{@name}, #{@sell_in}, #{@quality}" - end -end - + attr_accessor :name, :sell_in, :quality + def initialize(name, sell_in, quality) + @name = name + @sell_in = sell_in + @quality = quality + end + + def to_s() + "#{@name}, #{@sell_in}, #{@quality}" + end +end