CHANGELOG @@ -19,15 +19,8 @@ class String # Get the cents amount matches = scan /(\-?\d+(\.(\d+))?)/ - cents = matches[0] ? (matches[0][0].to_f * 100).round : 0 + cents = matches[0] ? (matches[0][0].to_f * 100) : 0 Money.new(cents, currency) end end - -# Allow writing of Nil.to_money => Money.empty -class NilClass - def to_money - Money.empty - end -end \ No newline at end of file lib/money/core_extensions.rb @@ -49,7 +49,7 @@ class Money # Alternativly you can use the convinience methods like # Money.ca_dollar and Money.us_dollar def initialize(cents, currency = default_currency) - @cents, @currency = cents, currency + @cents, @currency = cents.round, currency end # Do two money objects equal? Only works if both objects are of the same currency @@ -101,6 +101,11 @@ class Money def /(fixnum) Money.new(cents / fixnum, currency) end + + # Test if the money amount is zero + def zero? + cents == 0 + end # Format the price according to several rules lib/money/money.rb @@ -24,7 +24,9 @@ class CoreExtensionsTest < Test::Unit::TestCase end def test_nil - assert_equal Money.empty, nil.to_money + assert_raise(NoMethodError) do + nil.to_money + end end end \ No newline at end of file tests/core_extensions_test.rb @@ -50,6 +50,12 @@ class MoneyTest < Test::Unit::TestCase end end + def test_zero + assert_equal true, Money.empty.zero? + assert_equal false, Money.ca_dollar(1).zero? + assert_equal false, Money.ca_dollar(-1).zero? + end + def test_real_exchange Money.bank = VariableExchangeBank.new Money.bank.add_rate("USD", "CAD", 1.24515) tests/money_test.rb bc1dc608bb6ec485771fdbeccb940740cb275f10 tobi tobi@da9ee5fb-4aef-0310-b2bf-b6c93f260786 http://github.com/collectiveidea/money/commit/6ba47892a17f5c295af63e625e17202a50b26f51 6ba47892a17f5c295af63e625e17202a50b26f51 2006-01-15T08:48:34-08:00 2006-01-15T08:48:34-08:00 added money.zero?, removed nil.to_money git-svn-id: svn://leetsoft.com/money/trunk@14 da9ee5fb-4aef-0310-b2bf-b6c93f260786 c2540f9e3be1598eb046879f105597a3cb0587ee tobi tobi@da9ee5fb-4aef-0310-b2bf-b6c93f260786