money 2.1.1 → 2.1.2

data/lib/money/core_extensions.rb

@@ -20,19 +20,105 @@ class String
   #   '$100 USD'.to_money   # => #<Money @cents=10000, @currency="USD">
   def to_money
     # Get the currency.
-    matches = scan /([A-Z]{2,3})/ 
+    matches = scan /([A-Z]{2,3})/
     currency = matches[0] ? matches[0][0] : Money.default_currency
+    cents = calculate_cents(self)
+    Money.new(cents, currency)
+  end
+  
+  private
+  
+  def calculate_cents(number)
+    # remove anything that's not a number, potential delimiter, or minus sign
+    num = number.gsub(/[^\d|\.|,|\'|\s|\-]/, '').strip
+    
+    # set a boolean flag for if the number is negative or not
+    negative = num.split(//).first == "-"
+    
+    # if negative, remove the minus sign from the number
+    num = num.gsub(/^-/, '') if negative
     
-    # Get the cents amount
-    sans_spaces = gsub(/\s+/, '')
-    matches = sans_spaces.scan /(\-?\d+(?:[\.,]\d+)?)/
-    cents = if matches[0]
-              value = matches[0][0].gsub(/,/, '.')
-              value.to_f * 100
+    # gather all separators within the result number
+    used_separators = num.scan /[^\d]/
+    
+    # determine the number of unique separators within the number
+    #
+    # e.g.
+    # $1,234,567.89 would return 2 (, and .)
+    # $125,00 would return 1
+    # $199 would return 0
+    # $1 234,567.89 would raise an error (separators are space, comma, and period)
+    case used_separators.uniq.length
+    # no separator or delimiter; major (dollars) is the number, and minor (cents) is 0
+    when 0 then major, minor = num, 0
+    
+    # two separators, so we know the last item in this array is the 
+    # major/minor delimiter and the rest are separators
+    when 2
+      separator, delimiter = used_separators.uniq
+      # remove all separators, split on the delimiter
+      major, minor = num.gsub(separator, '').split(delimiter)
+      min = 0 unless min
+    when 1
+      # we can't determine if the comma or period is supposed to be a separator or a delimiter
+      # e.g.
+      # 1,00 - comma is a delimiter
+      # 1.000 - period is a delimiter
+      # 1,000 - comma is a separator
+      # 1,000,000 - comma is a separator
+      # 10000,00 - comma is a delimiter
+      # 1000,000 - comma is a delimiter
+      
+      # assign first separator for reusability
+      separator = used_separators.first
+      
+      # separator is used as a separator when there are multiple instances, always
+      if num.scan(separator).length > 1 # multiple matches; treat as separator
+        major, minor = num.gsub(separator, ''), 0
+      else
+        # ex: 1,000 - 1.0000 - 10001.000
+        # split number into possible major (dollars) and minor (cents) values
+        possible_major, possible_minor = num.split(separator)
+        
+        # if the minor (cents) length isn't 3, assign major/minor from the possibles
+        # e.g.
+        #   1,00 => 1.00
+        #   1.0000 => 1.00
+        #   1.2 => 1.20
+        if possible_minor.length != 3 # delimiter
+          major, minor = possible_major, possible_minor
+        else
+          # minor length is three
+          # let's try to figure out intent of the delimiter
+          
+          # the major length is greater than three, which means 
+          # the comma or period is used as a delimiter
+          # e.g.
+          #   1000,000
+          #   100000,000
+          if possible_major.length > 3
+            major, minor = possible_major, possible_minor
+          else
+            # number is in format ###{sep}### or ##{sep}### or #{sep}###
+            # handle as , is sep, . is delimiter
+            if separator == '.'
+              major, minor = possible_major, possible_minor
             else
-              0
+              major, minor = "#{possible_major}#{possible_minor}", 0
             end
+          end
+        end
+      end
+    else
+      raise ArgumentError, "Invalid currency amount"
+    end
     
-    Money.new(cents, currency)
+    # build the string based on major/minor since separator/delimiters have been removed
+    # transform to a float, multiply by 100 to convert to cents
+    cents = "#{major}.#{minor}".to_f * 100
+    
+    # if negative, multiply by -1; otherwise, return positive cents
+    negative ? cents * -1 : cents
   end
+  
 end

data/lib/money/money.rb

@@ -95,7 +95,7 @@ class Money
       Money.new(cents + other_money.cents, other_money.currency)
     else
       Money.new(cents + other_money.exchange_to(currency).cents,currency)
-    end   
+    end
   end
 
   def -(other_money)
@@ -103,7 +103,7 @@ class Money
       Money.new(cents - other_money.cents, other_money.currency)
     else
       Money.new(cents - other_money.exchange_to(currency).cents, currency)
-    end   
+    end
   end
 
   # get the cents value of the object
@@ -113,17 +113,17 @@ class Money
 
   # multiply money by fixnum
   def *(fixnum)
-    Money.new(cents * fixnum, currency)    
+    Money.new(cents * fixnum, currency)
   end
 
   # divide money by fixnum
   def /(fixnum)
-    Money.new(cents / fixnum, currency)    
+    Money.new(cents / fixnum, currency)
   end
   
   # Test if the money amount is zero
   def zero?
-    cents == 0 
+    cents == 0
   end
 
 
@@ -220,7 +220,7 @@ class Money
   # Conversation to self
   def to_money
     self
-  end  
+  end
   
   private
   

data/money.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "money"
-  s.version = "2.1.1"
+  s.version = "2.1.2"
   s.summary = "Money and currency exchange support library"
   s.email = "hongli@phusion.nl"
   s.homepage = "http://money.rubyforge.org/"

data/test/core_extensions_spec.rb

@@ -17,12 +17,25 @@ describe "Money core extensions" do
     "100.37".to_money.should == Money.new(100_37)
     "100,37".to_money.should == Money.new(100_37)
     "100 000".to_money.should == Money.new(100_000_00)
+    "100,000.00".to_money.should == Money.new(100_000_00)
+    "1,000".to_money.should == Money.new(1_000_00)
+    "-1,000".to_money.should == Money.new(-1_000_00)
+    "1,000.0000".to_money.should == Money.new(1_000_00)
+    "1,000.5000".to_money.should == Money.new(1_000_50)
+    "1.550".to_money.should == Money.new(1_55)
     
     "100 USD".to_money.should == Money.new(100_00, "USD")
     "-100 USD".to_money.should == Money.new(-100_00, "USD")
     "100 EUR".to_money.should == Money.new(100_00, "EUR")
     "100.37 EUR".to_money.should == Money.new(100_37, "EUR")
     "100,37 EUR".to_money.should == Money.new(100_37, "EUR")
+    "100,000.00 USD".to_money.should == Money.new(100_000_00, "USD")
+    "100.000,00 EUR".to_money.should == Money.new(100_000_00, "EUR")
+    "1,000 USD".to_money.should == Money.new(1_000_00, "USD")
+    "-1,000 USD".to_money.should == Money.new(-1_000_00, "USD")
+    "1,000.5500 USD".to_money.should == Money.new(1_000_55, "USD")
+    "-1,000.6500 USD".to_money.should == Money.new(-1_000_65, "USD")
+    "1.550 USD".to_money.should == Money.new(1_55, "USD")
     
     "USD 100".to_money.should == Money.new(100_00, "USD")
     "EUR 100".to_money.should == Money.new(100_00, "EUR")
@@ -30,7 +43,19 @@ describe "Money core extensions" do
     "CAD -100.37".to_money.should == Money.new(-100_37, "CAD")
     "EUR 100,37".to_money.should == Money.new(100_37, "EUR")
     "EUR -100,37".to_money.should == Money.new(-100_37, "EUR")
+    "USD 100,000.00".to_money.should == Money.new(100_000_00, "USD")
+    "EUR 100.000,00".to_money.should == Money.new(100_000_00, "EUR")
+    "USD 1,000".to_money.should == Money.new(1_000_00, "USD")
+    "USD -1,000".to_money.should == Money.new(-1_000_00, "USD")
+    "USD 1,000.9000".to_money.should == Money.new(1_000_90, "USD")
+    "USD -1,000.090".to_money.should == Money.new(-1_000_09, "USD")
+    "USD 1.5500".to_money.should == Money.new(1_55, "USD")
     
     "$100 USD".to_money.should == Money.new(100_00, "USD")
+    "$1,194.59 USD".to_money.should == Money.new(1_194_59, "USD")
+    "$-1,955 USD".to_money.should == Money.new(-1_955_00, "USD")
+    "$1,194.5900 USD".to_money.should == Money.new(1_194_59, "USD")
+    "$-1,955.000 USD".to_money.should == Money.new(-1_955_00, "USD")
+    "$1.99000 USD".to_money.should == Money.new(1_99, "USD")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: money
 version: !ruby/object:Gem::Version 
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-19 00:00:00 +01:00
+date: 2009-02-21 00:00:00 +01:00
 default_executable: 
 dependencies: []