cashrb 1.0.3 → 1.1.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+cashrb v1.1.0
+=============
+ - use "include Comparable" instead of custom functions
+ - #== no longer throws an IncompatibleCurrency exception
+ - cleanup tests that we auto passing
+ - if currency implements :cents_in_whole, use it
+
 cashrb v1.0.3
 =============
  - change to "require 'cashrb'" to avoid clash with 'cash' gem

data/README.md

@@ -58,3 +58,15 @@ Usage
 
     n = Cash.new(1.9)
     n.cents #=> 1
+
+    # If your currency object implements :cents_in_whole, we'll go ahead and
+    # use that.
+
+    module MyCurrency
+      def self.cents_in_whole
+        10
+      end
+    end
+
+    n = Cash.new(9, :currency => MyCurrency)
+    n.to_f #=> 0.9

data/cashrb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "cashrb"
-  s.version     = "1.0.3"
+  s.version     = "1.1.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Shane Emmons"]
   s.email       = ["semmons99@gmail.com"]

data/lib/cashrb/cash.rb

@@ -3,15 +3,15 @@ require 'bigdecimal'
 ##
 # Provides methods for performing financial calculations without using floats.
 class Cash
+  include Comparable
+
   class IncompatibleCurrency < ArgumentError; end
 
   DEFAULT_CENTS_IN_WHOLE  = 100
   DEFAULT_ROUNDING_METHOD = BigDecimal::ROUND_HALF_UP
   DEFAULT_CURRENCY        = nil
 
-  CURRENCY_AWARE_METHODS  = [
-    :+, :-, :/, :%, :divmod, :==, :<=>, :>, :<, :>=, :<=
-  ]
+  CURRENCY_AWARE_METHODS  = [:+, :-, :/, :%, :divmod, :<=>]
 
   class << self
     attr_accessor :default_cents_in_whole
@@ -70,30 +70,10 @@ class Cash
     [Cash.new(quotient), Cash.new(remainder)]
   end
 
-  def ==(value)
-    @cents == value.cents
-  end
-
   def <=>(value)
     @cents <=> value.cents
   end
 
-  def >(value)
-    @cents > value.cents
-  end
-
-  def <(value)
-    @cents < value.cents
-  end
-
-  def >=(value)
-    @cents >= value.cents
-  end
-
-  def <=(value)
-    @cents <= value.cents
-  end
-
   def to_s
     return self.cents.to_s if @cents_in_whole == 1
 
@@ -138,10 +118,14 @@ class Cash
       :currency        => self.class.default_currency,
     }.merge(options)
 
-    @cents_in_whole  = opts[:cents_in_whole]
+    @currency        = opts[:currency]
+    @cents_in_whole  = if @currency.respond_to? :cents_in_whole
+                         @currency.cents_in_whole 
+                       else
+                         opts[:cents_in_whole]
+                       end
     @decimal_places  = decimal_places(@cents_in_whole)
     @rounding_method = opts[:rounding_method]
-    @currency        = opts[:currency]
     nil
   end
 

data/test/test_cash.rb

@@ -50,6 +50,14 @@ class TestCash < MiniTest::Unit::TestCase
     assert_equal :usd, rs.currency
   end
 
+  def test_new_with_currency_respond_to_cents_in_whole
+    currency = MiniTest::Mock.new
+    currency.expect(:cents_in_whole, 10)
+
+    rs = Cash.new(9, :currency => currency)
+    assert_equal 0.9, rs.to_f
+  end
+
   def test_plus_with_Cash_Cash
     rs = Cash.new(6) + Cash.new(4)
     assert_equal Cash.new(10), rs
@@ -127,18 +135,17 @@ class TestCash < MiniTest::Unit::TestCase
 
   def test_equal_to_when_equal_to
     rs = Cash.new(6) == Cash.new(6)
-    assert true
+    assert rs
   end
 
   def test_equal_to_when_not_equal_to
     rs = Cash.new(6) == Cash.new(4)
-    refute false
+    refute rs
   end
 
   def test_equal_to_with_different_currencies
-    assert_raises Cash::IncompatibleCurrency do
-      Cash.new(6) == Cash.new(6, :currency => :usd)
-    end
+    rs = Cash.new(6) == Cash.new(6, :currency => :usd)
+    refute rs
   end
 
   def test_compare_when_greater_than
@@ -164,17 +171,17 @@ class TestCash < MiniTest::Unit::TestCase
 
   def test_greater_than_when_greater_than
     rs = Cash.new(6) > Cash.new(4)
-    assert true
+    assert rs
   end
 
   def test_greater_than_when_less_than
     rs = Cash.new(4) > Cash.new(6)
-    refute false
+    refute rs
   end
 
   def test_greater_than_when_equal_to
     rs = Cash.new(6) > Cash.new(6)
-    refute false
+    refute rs
   end
 
   def test_greater_than_with_different_currencies
@@ -185,17 +192,17 @@ class TestCash < MiniTest::Unit::TestCase
 
   def test_less_than_when_greater_than
     rs = Cash.new(6) < Cash.new(4)
-    refute false
+    refute rs
   end
 
   def test_less_than_when_less_than
     rs = Cash.new(4) < Cash.new(6)
-    assert true
+    assert rs
   end
 
   def test_less_than_when_equal_to
     rs = Cash.new(6) < Cash.new(6)
-    refute false
+    refute rs
   end
 
   def test_less_than_with_different_currencies
@@ -206,17 +213,17 @@ class TestCash < MiniTest::Unit::TestCase
 
   def test_greater_than_or_equal_to_when_greater_than
     rs = Cash.new(6) >= Cash.new(4)
-    assert true
+    assert rs
   end
 
   def test_greater_than_or_equal_to_when_less_than
     rs = Cash.new(4) >= Cash.new(6)
-    refute false
+    refute rs
   end
 
   def test_greater_than_or_equal_to_when_equal_to
     rs = Cash.new(6) >= Cash.new(6)
-    assert true
+    assert rs
   end
 
   def test_greater_than_or_equal_to_with_different_currencies
@@ -227,17 +234,17 @@ class TestCash < MiniTest::Unit::TestCase
 
   def test_less_than_or_equal_to_when_greater_than
     rs = Cash.new(6) <= Cash.new(4)
-    refute false
+    refute rs
   end
 
   def test_less_than_or_equal_to_when_less_than
     rs = Cash.new(4) <= Cash.new(6)
-    assert true
+    assert rs
   end
 
   def test_less_than_or_equal_to_when_equal_to
     rs = Cash.new(6) <= Cash.new(6)
-    assert true
+    assert rs
   end
 
   def test_less_than_or_equal_to_with_different_currencies

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cashrb
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-31 00:00:00.000000000 -04:00
+date: 2011-04-01 00:00:00.000000000 -04:00
 default_executable: 
 dependencies: []
 description: Dead simple gem to work with Money/Currency without the hassle of Floats