money 3.5.3 → 3.5.4

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+Money 3.5.4
+===========
+
+Features
+--------
+ - Added Currency#decimal_places.
+
+Bugfixes
+--------
+ - Fixed error with Money#to_s error with negative amounts that are only cents.
+
 Money 3.5.3
 ===========
 

data/lib/money/currency.rb

@@ -237,6 +237,19 @@ class Money
     # @return [String]
     attr_reader :delimiter
 
+    # The number of decimal places needed.
+    #
+    # @return [Integer]
+    def decimal_places
+      if subunit_to_unit == 1
+        0
+      elsif subunit_to_unit % 10 == 0
+        Math.log10(subunit_to_unit).to_s.to_i
+      else
+        Math.log10(subunit_to_unit).to_s.to_i+1
+      end
+    end
+
     # Create a new +Currency+ object.
     #
     # @param [String, Symbol, #to_s] id Used to look into +TABLE+ and retrieve

data/lib/money/money.rb

@@ -900,17 +900,13 @@ class Money
   # @example
   #   Money.ca_dollar(100).to_s #=> "1.00"
   def to_s
-    decimal_places = if currency.subunit_to_unit == 1
-                       0
-                     elsif currency.subunit_to_unit % 10 == 0
-                       Math.log10(currency.subunit_to_unit).to_s.to_i
-                     else
-                       Math.log10(currency.subunit_to_unit).to_s.to_i+1
-                     end
     unit, subunit  = cents.abs.divmod(currency.subunit_to_unit).map{|o| o.to_s}
-    unit = (unit.to_i * -1).to_s if cents < 0
-    return unit if decimal_places == 0
-    subunit = (("0" * decimal_places) + subunit)[(-1*decimal_places)..-1]
+    if currency.decimal_places == 0
+      return "-#{unit}" if cents < 0
+      return unit
+    end
+    subunit = (("0" * currency.decimal_places) + subunit)[(-1*currency.decimal_places)..-1]
+    return "-#{unit}#{separator}#{subunit}" if cents < 0
     "#{unit}#{separator}#{subunit}"
   end
 
@@ -1099,15 +1095,14 @@ class Money
     # avoiding floating point arithmetic here to ensure accuracy
     cents = (major.to_i * currency.subunit_to_unit)
     # Because of an bug in JRuby, we can't just call #floor
-    decimal_places = Math.log10(currency.subunit_to_unit).to_s.to_i
     minor = minor.to_s
-    minor = if minor.size < decimal_places
-              (minor + ("0" * decimal_places))[0,decimal_places].to_i
-            elsif minor.size > decimal_places
-              if minor[decimal_places,1].to_i >= 5
-                minor[0,decimal_places].to_i+1
+    minor = if minor.size < currency.decimal_places
+              (minor + ("0" * currency.decimal_places))[0,currency.decimal_places].to_i
+            elsif minor.size > currency.decimal_places
+              if minor[currency.decimal_places,1].to_i >= 5
+                minor[0,currency.decimal_places].to_i+1
               else
-                minor[0,decimal_places].to_i
+                minor[0,currency.decimal_places].to_i
               end
             else
               minor.to_i

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: money
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: false
   segments: 
   - 3
   - 5
-  - 3
-  version: 3.5.3
+  - 4
+  version: 3.5.4
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 -05:00
+date: 2010-12-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency