wowecon 0.2.0 → 0.2.1

data/lib/wowecon/currency.rb

@@ -5,16 +5,19 @@ module Wowecon
     include Wowecon::CurrencyHelpers
     
     def initialize(value)
-      if value.class == Fixnum
-        @value = value
-      elsif value.class == Float
-        @value = sprintf("%.4f", value).split(".").join("").to_i
-      elsif value.class == Hash
+      @value = case
+      when value.kind_of?(Fixnum)
+        value
+      when value.kind_of?(Float)
+        sprintf("%.4f", value).split(".").join("").to_i
+      when value.kind_of?(Hash)
         if value.key?(:gold) and value.key?(:silver) and value.key?(:copper)
-          @value = "#{value[:gold]}#{sprintf("%02d", value[:silver])}#{sprintf("%02d", value[:copper])}".to_i
+          "#{value[:gold]}#{sprintf("%02d", value[:silver])}#{sprintf("%02d", value[:copper])}".to_i
         else
-          @value = 0
+          nil
         end
+      else
+        nil
       end
     end
 

data/lib/wowecon/currency_helpers.rb

@@ -47,5 +47,9 @@ module Wowecon
       @value == other.to_i
     end
     
+    def nil?
+      @value.nil?
+    end
+    
   end
 end

data/spec/currency_spec.rb

@@ -1,48 +1,54 @@
 require_relative "../lib/wowecon/currency.rb"
 
 describe Wowecon::Currency do
-  
-  before :each do
-    @currency = Wowecon::Currency.new({:gold => 1420, :silver => 9, :copper => 10})
-  end
-  
+
   it "can be initialised using a floating point value" do
-    currency = Wowecon::Currency.new(1420.091)
-    currency.class.should == Wowecon::Currency
+    @currency = Wowecon::Currency.new(1420.091)
+    @currency.class.should == Wowecon::Currency
   end
   
   it "can be initialised using a hash" do
-    currency = Wowecon::Currency.new({:gold => 1420, :silver => 9, :copper => 10})
-    currency.class.should == Wowecon::Currency
+    @currency = Wowecon::Currency.new({:gold => 1420, :silver => 9, :copper => 10})
+    @currency.class.should == Wowecon::Currency
   end
   
   it "can be initialised using an integer" do
-    currency = Wowecon::Currency.new(1420091)
-    currency.class.should == Wowecon::Currency
+    @currency = Wowecon::Currency.new(1420091)
+    @currency.class.should == Wowecon::Currency
   end
   
   it "responds to integer" do
+    @currency = Wowecon::Currency.new({:gold => 1420, :silver => 9, :copper => 10})
     (@currency.should respond_to :to_i) && @currency.to_i.should == 14200910
   end
   
   it "responds to hash" do
+    @currency = Wowecon::Currency.new({:gold => 1420, :silver => 9, :copper => 10})
     (@currency.should respond_to :to_hash) && @currency.to_hash.should == {:gold => 1420, :silver => 9, :copper => 10}
   end
   
   it "responds to float" do
+    @currency = Wowecon::Currency.new({:gold => 1420, :silver => 9, :copper => 10})
     (@currency.should respond_to :to_f) && @currency.to_f.should == 1420.091
   end
   
-  it "returns zero if initialised with an invalid hash" do
-    zero = Wowecon::Currency.new({:error => "price not found"})
-    zero.should == 0
+  it "returns nil if initialised with an invalid hash" do
+    @zero = Wowecon::Currency.new({:error => "price not found"})
+    @zero.should be_nil
+  end
+  
+  it "returns nil if initialised with nil" do
+    @nilcurrency = Wowecon::Currency.new(nil)
+    @nilcurrency.should be_nil
   end
   
   it "can create a string representation of the currency value" do
+    @currency = Wowecon::Currency.new({:gold => 1420, :silver => 9, :copper => 10})
     @currency.to_s.should == "1,420g 9s 10c"
   end
   
   it "can create a HTML tag representation of the currency value" do
+    @currency = Wowecon::Currency.new({:gold => 1420, :silver => 9, :copper => 10})
     @currency.to_html.should == '<var class="gold">1,420</var><var class="silver">9</var><var class="copper">10</var>'
   end
   

metadata

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