wowecon 0.1.3 → 0.2.0

data/lib/wowecon.rb

@@ -27,8 +27,8 @@ module Wowecon
           currency[currency_type] = value[0].to_i
         end
       end
-      
-      currency.merge({:float => (currency[:gold] + (currency[:silver].to_f / 100) + (currency[:copper].to_f / 10000)).to_f})
+
+      {:value => "#{currency[:gold]}#{sprintf("%02d", currency[:silver])}#{sprintf("%02d", currency[:copper])}".to_i}
     else
       {:error => "price not found"}
     end

data/lib/wowecon/currency.rb

@@ -4,23 +4,16 @@ module Wowecon
   class Currency
     include Wowecon::CurrencyHelpers
     
-    attr_accessor :gold, :silver, :copper
-    
     def initialize(value)
-      if value.class == Float
-        f           = sprintf("%.4f", value).split(".")
-        self.gold   = f[0].to_i
-        self.silver = f[1][0,2].to_i
-        self.copper = f[1][2,2].to_i
+      if value.class == Fixnum
+        @value = value
+      elsif value.class == Float
+        @value = sprintf("%.4f", value).split(".").join("").to_i
       elsif value.class == Hash
         if value.key?(:gold) and value.key?(:silver) and value.key?(:copper)
-          self.gold   = value[:gold]
-          self.silver = value[:silver]
-          self.copper = value[:copper]
+          @value = "#{value[:gold]}#{sprintf("%02d", value[:silver])}#{sprintf("%02d", value[:copper])}".to_i
         else
-          self.gold   = 0
-          self.silver = 0
-          self.copper = 0
+          @value = 0
         end
       end
     end

data/lib/wowecon/currency_helpers.rb

@@ -1,12 +1,21 @@
 module Wowecon
   module CurrencyHelpers
 
+    @value = 0
+
+    def to_i
+      @value
+    end
+
     def to_hash
-      {:gold => @gold, :silver => @silver, :copper => @copper}
+      copper = @value.to_s[-2..-1].to_i
+      silver = @value.to_s[-4..-3].to_i
+      gold   = @value.to_s[0..-5].to_i      
+      {:gold => gold, :silver => silver, :copper => copper}
     end
   
     def to_f
-      (@gold + (@silver.to_f / 100) + (@copper.to_f / 10000)).to_f
+      @value.to_f / 10000
     end
   
     def to_s
@@ -18,7 +27,7 @@ module Wowecon
       end
       
       if output == ""
-        "no price"
+        "0"
       else
         output.strip
       end
@@ -34,5 +43,9 @@ module Wowecon
       tags
     end
     
+    def ==(other) 
+      @value == other.to_i
+    end
+    
   end
 end

data/spec/currency_spec.rb

@@ -16,6 +16,15 @@ describe Wowecon::Currency do
     currency.class.should == Wowecon::Currency
   end
   
+  it "can be initialised using an integer" do
+    currency = Wowecon::Currency.new(1420091)
+    currency.class.should == Wowecon::Currency
+  end
+  
+  it "responds to integer" do
+    (@currency.should respond_to :to_i) && @currency.to_i.should == 14200910
+  end
+  
   it "responds to hash" do
     (@currency.should respond_to :to_hash) && @currency.to_hash.should == {:gold => 1420, :silver => 9, :copper => 10}
   end
@@ -24,9 +33,9 @@ describe Wowecon::Currency do
     (@currency.should respond_to :to_f) && @currency.to_f.should == 1420.091
   end
   
-  it "returns a currency value of zero if initialised with an invalid hash" do
+  it "returns zero if initialised with an invalid hash" do
     zero = Wowecon::Currency.new({:error => "price not found"})
-    zero.to_s.should == "no price" && zero.to_f.should == 0 && zero.to_hash.should == {:gold => 0, :silver => 0, :copper => 0}
+    zero.should == 0
   end
   
   it "can create a string representation of the currency value" do

data/spec/wowecon_spec.rb

@@ -8,20 +8,8 @@ describe Wowecon do
     
     unless price.has_key? :error
       describe "if price data was found" do
-        it "should have an integer gold value" do
-          (price.should have_key :gold) && price[:gold].class.should == Fixnum
-        end
-        
-        it "should have an integer silver value" do
-          (price.should have_key :silver) && price[:silver].class.should == Fixnum
-        end
-        
-        it "should have an integer copper value" do
-          (price.should have_key :copper) && price[:copper].class.should == Fixnum
-        end
-        
-        it "should have float value representing the complete price" do
-          (price.should have_key :float) && price[:float].class.should == Float
+        it "should have an integer value" do
+          (price.should have_key :value) && price[:value].class.should == Fixnum
         end
       end
     else
@@ -36,9 +24,9 @@ describe Wowecon do
   
   # use http://data.wowecon.com/?type=price&item_name=Rock%20Furrow%20Boots to confirm
   describe "With known market data" do
-    it "should return a value of 7401.0 for this item" do
+    it "should return a value of 62000100 for this item" do
       price = Wowecon.price("Rock Furrow Boots")
-      price.should == {:gold=>7401, :silver=>0, :copper=>0, :float=>7401.0}
+      price.should == {:value => 62000100}
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: wowecon
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ben Darlow
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-04 00:00:00 +01:00
+date: 2011-07-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency