money 1.4 → 1.5

data/lib/bank/no_exchange_bank.rb

@@ -1,6 +1,7 @@
 class NoExchangeBank# :nodoc:
 
   def reduce(money, currency)
+    return money if money.currency == currency
     raise Money::MoneyError.new("Current Money::bank does not support money exchange. Please implement a bank object that does and assign it to the Money class.")
   end
   

data/lib/money/money.rb

@@ -66,16 +66,16 @@ class Money
   end
 
   def +(other_money)
-    if currency == other_money.currency
-      Money.new(cents + other_money.cents,currency)
+    if self.cents == 0 or currency == other_money.currency
+      Money.new(cents + other_money.cents, other_money.currency)
     else
       Money.new(cents + other_money.exchange_to(currency).cents,currency)
     end   
   end
 
   def -(other_money)
-    if currency == other_money.currency
-      Money.new(cents - other_money.cents, currency)
+    if self.cents == 0 or currency == other_money.currency
+      Money.new(cents - other_money.cents, other_money.currency)
     else
       Money.new(cents - other_money.exchange_to(currency).cents, currency)
     end   

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: money
 version: !ruby/object:Gem::Version 
-  version: "1.4"
-date: 2005-06-13
+  version: "1.5"
+date: 2005-07-20
 summary: Class aiding in the handling of Money.
 require_paths: 
   - lib