money 1.5.9 → 1.7.0

data/lib/money/core_extensions.rb

@@ -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

data/lib/money/money.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
@@ -77,13 +77,18 @@ class Money
   end
 
   def -(other_money)
-    return other_money.dup if cents.zero? 
-    return dup if other_money.cents.zero?
 
-    if self.cents == 0 or currency == other_money.currency
+    if currency == other_money.currency
       Money.new(cents - other_money.cents, other_money.currency)
     else
+      
+      return other_money.dup if self.cents.zero?
+
+      return self.dup if other_money.cents.zero?
+      
+      
       Money.new(cents - other_money.exchange_to(currency).cents, currency)
+      
     end   
   end
 
@@ -101,6 +106,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

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
+rubygems_version: 0.8.11
 specification_version: 1
 name: money
 version: !ruby/object:Gem::Version 
-  version: 1.5.9
-date: 2005-10-26
+  version: 1.7.0
+date: 2006-02-13 00:00:00 -05:00
 summary: Class aiding in the handling of Money.
 require_paths: 
   - lib
@@ -24,6 +24,8 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
 authors: 
   - Tobias Luetke
 files: