@@ -9,5 +9,5 @@ require 'rshoeboxed/list_proxy' require 'rshoeboxed/parse_error' module RShoeboxed - VERSION = '0.0.3' + VERSION = '0.0.4' end lib/rshoeboxed.rb @@ -5,7 +5,7 @@ require 'rexml/document' module RShoeboxed class Receipt attr_accessor :id, :store, :image_url, :categories - attr_reader :date, :total + attr_reader :sell_date, :created_date, :modified_date, :total def self.parse(xml) document = REXML::Document.new(xml) @@ -14,7 +14,9 @@ module RShoeboxed begin receipt.id = receipt_element.attributes["id"] receipt.store = receipt_element.attributes["store"] - receipt.date = receipt_element.attributes["date"] + receipt.sell_date = receipt_element.attributes["selldate"] + receipt.created_date = receipt_element.attributes["createdDate"] + receipt.modified_date = receipt_element.attributes["modifiedDate"] receipt.total = receipt_element.attributes["total"] receipt.image_url = receipt_element.attributes["imgurl"] @@ -35,14 +37,26 @@ module RShoeboxed @total = total end - def date=(date) + def sell_date=(date) date = Date.parse(date) if date.is_a?(String) - @date = date + @sell_date = date + end + + def created_date=(date) + date = Date.parse(date) if date.is_a?(String) + @created_date = date + end + + def modified_date=(date) + date = Date.parse(date) if date.is_a?(String) + @modified_date = date end def ==(receipt) self.id == receipt.id && self.store == receipt.store && self.image_url == receipt.image_url && - self.categories == receipt.categories && self.date == receipt.date && self.total == receipt.total + self.categories == receipt.categories && self.sell_date == receipt.sell_date && + self.modified_date == receipt.modified_date && self.created_date == receipt.created_date && + self.total == receipt.total end end end lib/rshoeboxed/receipt.rb @@ -1,4 +1,4 @@ -<Receipt store="Morgan Imports" id="1" total="$1,929.00" date="5/12/2008" imgurl="http://www.shoeboxed.com/receipt.jpeg"> +<Receipt store="Morgan Imports" id="1" total="$1,929.00" selldate="5/12/2008" createdDate="4/12/2008" modifiedDate="4/20/2008" imgurl="http://www.shoeboxed.com/receipt.jpeg"> <Categories> <Category name="Category 1" id="1"/> </Categories> test/fixtures/receipt_info_response.xml @@ -1,11 +1,11 @@ <GetReceiptCallResponse> <Receipts count="2"> - <Receipt store="Great Plains Trust Company" id="23984923842" total="$3,378.30" date="5/12/2008" imgurl="http://www.shoeboxed.com/receipt1.jpeg"> + <Receipt store="Great Plains Trust Company" id="23984923842" total="$3,378.30" selldate="5/12/2008" createdDate="4/12/2008" modifiedDate="4/20/2008" imgurl="http://www.shoeboxed.com/receipt1.jpeg"> <Categories> <Category name="Category 1" id="1"/> </Categories> </Receipt> - <Receipt store="RadioShack" id="39239293" total="$3.51" date="5/12/2008" imgurl="http://www.shoeboxed.com/receipt2.jpeg"> + <Receipt store="RadioShack" id="39239293" total="$3.51" selldate="5/12/2008" createdDate="4/12/2008" modifiedDate="4/20/2008" imgurl="http://www.shoeboxed.com/receipt2.jpeg"> <Categories> <Category name="Category 2" id="2"/> </Categories> test/fixtures/receipt_response.xml @@ -47,7 +47,9 @@ class TestConnection < Test::Unit::TestCase assert_not_nil receipt assert_equal "1", receipt.id assert_equal "Morgan Imports", receipt.store - assert_equal Date.new(2008, 5, 12), receipt.date + assert_equal Date.new(2008, 5, 12), receipt.sell_date + assert_equal Date.new(2008, 4, 12), receipt.created_date + assert_equal Date.new(2008, 4, 20), receipt.modified_date assert_equal BigDecimal.new("1929.00"), receipt.total assert_equal "http://www.shoeboxed.com/receipt.jpeg", receipt.image_url assert_equal [@category1], receipt.categories @@ -74,7 +76,9 @@ class TestConnection < Test::Unit::TestCase receipt = receipts[0] assert_equal "23984923842", receipt.id assert_equal "Great Plains Trust Company", receipt.store - assert_equal Date.new(2008, 5, 12), receipt.date + assert_equal Date.new(2008, 5, 12), receipt.sell_date + assert_equal Date.new(2008, 4, 12), receipt.created_date + assert_equal Date.new(2008, 4, 20), receipt.modified_date assert_equal BigDecimal.new("3378.30"), receipt.total assert_equal "http://www.shoeboxed.com/receipt1.jpeg", receipt.image_url assert_equal [@category1], receipt.categories @@ -82,7 +86,9 @@ class TestConnection < Test::Unit::TestCase receipt = receipts[1] assert_equal "39239293", receipt.id assert_equal "RadioShack", receipt.store - assert_equal Date.new(2008, 5, 12), receipt.date + assert_equal Date.new(2008, 5, 12), receipt.sell_date + assert_equal Date.new(2008, 4, 12), receipt.created_date + assert_equal Date.new(2008, 4, 20), receipt.modified_date assert_equal BigDecimal.new("3.51"), receipt.total assert_equal "http://www.shoeboxed.com/receipt2.jpeg", receipt.image_url assert_equal [@category2], receipt.categories test/test_connection.rb @@ -17,7 +17,9 @@ class TestReceipt < Test::Unit::TestCase receipt = receipts.first assert_equal "1", receipt.id assert_equal "Morgan Imports", receipt.store - assert_equal Date.new(2008, 5, 12), receipt.date + assert_equal Date.new(2008, 5, 12), receipt.sell_date + assert_equal Date.new(2008, 4, 12), receipt.created_date + assert_equal Date.new(2008, 4, 20), receipt.modified_date assert_equal BigDecimal.new("1929.00"), receipt.total assert_equal "http://www.shoeboxed.com/receipt.jpeg", receipt.image_url assert_equal [@category1], receipt.categories @@ -36,8 +38,11 @@ class TestReceipt < Test::Unit::TestCase receipt.total = '$1,000.19' assert_equal BigDecimal.new('1000.19'), receipt.total - receipt.date = '1/1/2001' - assert_equal Date.parse('1/1/2001'), receipt.date + receipt.created_date = '1/2/2001' + assert_equal Date.parse('1/2/2001'), receipt.created_date + + receipt.modified_date = '1/3/2001' + assert_equal Date.parse('1/3/2001'), receipt.modified_date receipt.image_url = "http://www.example.com/one.image" assert_equal "http://www.example.com/one.image", receipt.image_url @@ -45,4 +50,9 @@ class TestReceipt < Test::Unit::TestCase receipt.categories = [@category1] assert_equal [@category1], receipt.categories end -end \ No newline at end of file + + def test_equal + # lame test but at least execute the code + assert_equal Receipt.new, Receipt.new + end +end test/test_receipt.rb f59f9818b6e971d608ac685b07a846ba35639aa4 Ben Curren ben@esomnie.com http://github.com/bcurren/rshoeboxed/commit/7fe7ed0a66394998acea146338dfce10bd1ce4b0 7fe7ed0a66394998acea146338dfce10bd1ce4b0 2009-02-13T17:00:51-08:00 2009-02-13T17:00:51-08:00 Added new receipt dates. d3e74f61fa4ac0ecb16973ee4b65b06c97ce3a0a Ben Curren ben@esomnie.com