lib/goodwill/auction.rb in goodwill-0.2.1 vs lib/goodwill/auction.rb in goodwill-0.3.0

@@ -3,10 +3,13 @@
 require 'goodwill/csspaths'
 require 'goodwill/urlpaths'
 require 'goodwill/mechanize'
 
 module Goodwill
+  #
+  # A ShopGoodwill Auction
+  #
   class Auction
     include Goodwill::Mechanize
     include CSSPaths
     include URLPaths
 
@@ -25,33 +28,39 @@
       @state = state
       @country = country
 
       @href = ITEM_SEARCH_URL + itemid.to_s
       item_page = mechanize.get(@href)
-      @bids = item_page.search(BIDS_PATH).text[/\d+/]
-      @current = item_page.search(CURRENT_PRICE_PATH).text
-      @end = item_page.search(END_TIME_PATH).text
+      @bids = item_page.search(BIDS_PATH).text[/\d+/].to_i
+      @current = item_page.search(CURRENT_PRICE_PATH).text.tr('$', '').to_f
+      @end = DateTime.strptime(item_page.search(END_TIME_PATH).text, '%m/%d/%Y %l:%M:%S %p %Z')
       @item = item_page.search(ITEM_TITLE_PATH).text
       @seller = item_page.search(SELLER_PATH).text
       @bidding = false
       @shipping = calculate_shipping(@itemid, @zipcode, @state, @country)
     end
 
-    def ==(another_auction)
-      self.itemid == another_auction.itemid
+    def ==(other)
+      itemid == other.itemid
     end
 
     def to_hash
       hash = {}
-      instance_variables.each {|var| hash[var.to_s.delete("@")] = instance_variable_get(var) }
+      instance_variables.each do |var|
+        if var == :@end
+          hash[var.to_s.delete('@')] = instance_variable_get(var).to_s
+        else
+          hash[var.to_s.delete('@')] = instance_variable_get(var)
+        end
+      end
       hash
     end
 
     private
 
     def calculate_shipping(itemid, zipcode, state, country)
       params = "?itemid=#{itemid}&zip=#{zipcode}&state=#{state}&country=#{country}"
       page = mechanize.get(SHIPPING_URL + params)
-      page.search(SHIPPING_PATH).text
+      page.search(SHIPPING_PATH).text.tr('$', '').to_f
     end
   end
 end