money 5.0.0 → 5.1.0.beta1

data/lib/money/money/arithmetic.rb

@@ -6,9 +6,9 @@ class Money
     # @return [Money]
     #
     # @example
-    #    - Money.new(100) #=> #<Money @cents=-100>
+    #    - Money.new(100) #=> #<Money @fractional=-100>
     def -@
-      Money.new(-cents, currency)
+      Money.new(-fractional, currency)
     end
 
 
@@ -26,7 +26,7 @@ class Money
     def ==(other_money)
       if other_money.respond_to?(:to_money)
         other_money = other_money.to_money
-        cents == other_money.cents && self.currency == other_money.currency
+        fractional == other_money.fractional && self.currency == other_money.currency
       else
         false
       end
@@ -47,9 +47,9 @@ class Money
       if other_money.respond_to?(:to_money)
         other_money = other_money.to_money
         if self.currency == other_money.currency
-          cents <=> other_money.cents
+          fractional <=> other_money.fractional
         else
-          cents <=> other_money.exchange_to(currency).cents
+          fractional <=> other_money.exchange_to(currency).fractional
         end
       else
         raise ArgumentError, "Comparison of #{self.class} with #{other_money.inspect} failed"
@@ -66,7 +66,7 @@ class Money
     #   Money.new(0).positive?  #=> false
     #   Money.new(-1).positive? #=> false
     def positive?
-      cents > 0
+      fractional > 0
     end
 
     # Test if the amount is negative. Returns +true+ if the money amount is
@@ -79,7 +79,7 @@ class Money
     #   Money.new(0).negative?  #=> false
     #   Money.new(1).negative?  #=> false
     def negative?
-      cents < 0
+      fractional < 0
     end
 
     # Returns a new Money object containing the sum of the two operands' monetary
@@ -91,12 +91,12 @@ class Money
     # @return [Money]
     #
     # @example
-    #   Money.new(100) + Money.new(100) #=> #<Money @cents=200>
+    #   Money.new(100) + Money.new(100) #=> #<Money @fractional=200>
     def +(other_money)
       if currency == other_money.currency
-        Money.new(cents + other_money.cents, other_money.currency)
+        Money.new(fractional + other_money.fractional, other_money.currency)
       else
-        Money.new(cents + other_money.exchange_to(currency).cents, currency)
+        Money.new(fractional + other_money.exchange_to(currency).fractional, currency)
       end
     end
 
@@ -110,12 +110,12 @@ class Money
     # @return [Money]
     #
     # @example
-    #   Money.new(100) - Money.new(99) #=> #<Money @cents=1>
+    #   Money.new(100) - Money.new(99) #=> #<Money @fractional=1>
     def -(other_money)
       if currency == other_money.currency
-        Money.new(cents - other_money.cents, other_money.currency)
+        Money.new(fractional - other_money.fractional, other_money.currency)
       else
-        Money.new(cents - other_money.exchange_to(currency).cents, currency)
+        Money.new(fractional - other_money.exchange_to(currency).fractional, currency)
       end
     end
 
@@ -131,13 +131,13 @@ class Money
     # @raise [ArgumentError] If +value+ is a Money instance.
     #
     # @example
-    #   Money.new(100) * 2 #=> #<Money @cents=200>
+    #   Money.new(100) * 2 #=> #<Money @fractional=200>
     #
     def *(value)
       if value.is_a?(Money)
         raise ArgumentError, "Can't multiply a Money by a Money"
       else
-        Money.new(cents * value, currency)
+        Money.new(fractional * value, currency)
       end
     end
 
@@ -153,18 +153,18 @@ class Money
     # @return [Float] The resulting number if you divide Money by a Money.
     #
     # @example
-    #   Money.new(100) / 10            #=> #<Money @cents=10>
+    #   Money.new(100) / 10            #=> #<Money @fractional=10>
     #   Money.new(100) / Money.new(10) #=> 10.0
     #
     def /(value)
       if value.is_a?(Money)
         if currency == value.currency
-          (cents / BigDecimal.new(value.cents.to_s)).to_f
+          (fractional / BigDecimal.new(value.fractional.to_s)).to_f
         else
-          (cents / BigDecimal(value.exchange_to(currency).cents.to_s)).to_f
+          (fractional / BigDecimal(value.exchange_to(currency).fractional.to_s)).to_f
         end
       else
-        Money.new(cents / value, currency)
+        Money.new(fractional / value, currency)
       end
     end
 
@@ -189,16 +189,21 @@ class Money
     # @return [Array<Money,Money>,Array<Fixnum,Money>]
     #
     # @example
-    #   Money.new(100).divmod(9)            #=> [#<Money @cents=11>, #<Money @cents=1>]
-    #   Money.new(100).divmod(Money.new(9)) #=> [11, #<Money @cents=1>]
+    #   Money.new(100).divmod(9)            #=> [#<Money @fractional=11>, #<Money @fractional=1>]
+    #   Money.new(100).divmod(Money.new(9)) #=> [11, #<Money @fractional=1>]
     def divmod(val)
       if val.is_a?(Money)
-        a = self.cents
-        b = self.currency == val.currency ? val.cents : val.exchange_to(self.currency).cents
+        a = self.fractional
+        b = self.currency == val.currency ? val.fractional : val.exchange_to(self.currency).cents
         q, m = a.divmod(b)
         return [q, Money.new(m, self.currency)]
       else
-        return [self.div(val), Money.new(self.cents.modulo(val), self.currency)]
+        if self.class.infinite_precision
+          q, m = self.fractional.divmod(BigDecimal(val.to_s))
+          return [Money.new(q, self.currency), Money.new(m, self.currency)]
+        else
+          return [self.div(val), Money.new(self.fractional.modulo(val), self.currency)]
+        end
       end
     end
 
@@ -209,8 +214,8 @@ class Money
     # @return [Money]
     #
     # @example
-    #   Money.new(100).modulo(9)            #=> #<Money @cents=1>
-    #   Money.new(100).modulo(Money.new(9)) #=> #<Money @cents=1>
+    #   Money.new(100).modulo(9)            #=> #<Money @fractional=1>
+    #   Money.new(100).modulo(Money.new(9)) #=> #<Money @fractional=1>
     def modulo(val)
       self.divmod(val)[1]
     end
@@ -233,14 +238,14 @@ class Money
     # @return [Money]
     #
     # @example
-    #   Money.new(100).remainder(9) #=> #<Money @cents=1>
+    #   Money.new(100).remainder(9) #=> #<Money @fractional=1>
     def remainder(val)
       a, b = self, val
       b = b.exchange_to(a.currency) if b.is_a?(Money) and a.currency != b.currency
 
       a_sign, b_sign = :pos, :pos
-      a_sign = :neg if a.cents < 0
-      b_sign = :neg if (b.is_a?(Money) and b.cents < 0) or (b < 0)
+      a_sign = :neg if a.fractional < 0
+      b_sign = :neg if (b.is_a?(Money) and b.fractional < 0) or (b < 0)
 
       return a.modulo(b) if a_sign == b_sign
       a.modulo(b) - (b.is_a?(Money) ? b : Money.new(b, a.currency))
@@ -251,9 +256,9 @@ class Money
     # @return [Money]
     #
     # @example
-    #   Money.new(-100).abs #=> #<Money @cents=100>
+    #   Money.new(-100).abs #=> #<Money @fractional=100>
     def abs
-      Money.new(self.cents.abs, self.currency)
+      Money.new(self.fractional.abs, self.currency)
     end
 
     # Test if the money amount is zero.
@@ -264,7 +269,7 @@ class Money
     #   Money.new(100).zero? #=> false
     #   Money.new(0).zero?   #=> true
     def zero?
-      cents == 0
+      fractional == 0
     end
 
     # Test if the money amount is non-zero. Returns this money object if it is
@@ -273,10 +278,10 @@ class Money
     # @return [Money, nil]
     #
     # @example
-    #   Money.new(100).nonzero? #=> #<Money @cents=100>
+    #   Money.new(100).nonzero? #=> #<Money @fractional=100>
     #   Money.new(0).nonzero?   #=> nil
     def nonzero?
-      cents != 0 ? self : nil
+      fractional != 0 ? self : nil
     end
 
   end

data/lib/money/money/formatting.rb

@@ -73,7 +73,7 @@ class Money
     #   Money.ca_dollar(100).format(:no_cents => true) #=> "$1"
     #   Money.ca_dollar(599).format(:no_cents => true) #=> "$5"
     #
-    # @option *rules [Boolean] :no_cents_if_whole (false) Whether cents should be 
+    # @option *rules [Boolean] :no_cents_if_whole (false) Whether cents should be
     #  omitted if the cent value is zero
     #
     # @example
@@ -107,6 +107,10 @@ class Money
     #   # You can specify a string as value to enforce using a particular symbol.
     #   Money.new(100, "AWG").format(:symbol => "ƒ") #=> "ƒ1.00"
     #
+    #   # You can specify a indian currency format
+    #   Money.new(10000000, "INR").format(:south_asian_number_formatting => true) #=> "1,00,000.00"
+    #   Money.new(10000000).format(:south_asian_number_formatting => true) #=> "$1,00,000.00"
+    #
     # @option *rules [Boolean, String, nil] :decimal_mark (true) Whether the
     #  currency should be separated by the specified character or '.'
     #
@@ -145,7 +149,7 @@ class Money
       rules = normalize_formatting_rules(rules)
       rules = localize_formatting_rules(rules)
 
-      if cents == 0
+      if fractional == 0
         if rules[:display_free].respond_to?(:to_str)
           return rules[:display_free]
         elsif rules[:display_free]
@@ -184,7 +188,7 @@ class Money
         end
 
       if symbol_value && !symbol_value.empty?
-        formatted = if symbol_position == :before 
+        formatted = if symbol_position == :before
           "#{symbol_value}#{formatted}"
         else
           symbol_space = rules[:symbol_after_without_space] ? "" : " "
@@ -192,7 +196,7 @@ class Money
         end
       end
 
-      if rules.has_key?(:decimal_mark) and rules[:decimal_mark] and
+      if rules.has_key?(:decimal_mark) && rules[:decimal_mark] &&
         rules[:decimal_mark] != decimal_mark
         formatted.sub!(decimal_mark, rules[:decimal_mark])
       end
@@ -204,13 +208,7 @@ class Money
       end
 
       # Apply thousands_separator
-      regexp_decimal = Regexp.escape(decimal_mark)
-      regexp_format  = if formatted =~ /#{regexp_decimal}/
-           /(\d)(?=(?:\d{3})+(?:#{regexp_decimal}))/
-         else
-           /(\d)(?=(?:\d{3})+(?:[^\d]{1}|$))/
-         end
-      formatted.gsub!(regexp_format, "\\1#{thousands_separator_value}")
+      formatted.gsub!(regexp_format(formatted, rules, decimal_mark), "\\1#{thousands_separator_value}")
 
       if rules[:with_currency]
         formatted << " "
@@ -236,16 +234,29 @@ class Money
         rules = rules.pop
         rules = { rules => true } if rules.is_a?(Symbol)
       end
-      if not rules.include?(:decimal_mark) and rules.include?(:separator)
+      if !rules.include?(:decimal_mark) && rules.include?(:separator)
         rules[:decimal_mark] = rules[:separator]
       end
-      if not rules.include?(:thousands_separator) and rules.include?(:delimiter)
+      if !rules.include?(:thousands_separator) && rules.include?(:delimiter)
         rules[:thousands_separator] = rules[:delimiter]
       end
       rules
     end
   end
 
+  def regexp_format(formatted, rules, decimal_mark)
+    regexp_decimal = Regexp.escape(decimal_mark)
+    if rules[:south_asian_number_formatting]
+      /(\d+?)(?=(\d\d)+(\d)(?:\.))/
+    else
+      if formatted =~ /#{regexp_decimal}/
+        /(\d)(?=(?:\d{3})+(?:#{regexp_decimal}))/
+      else
+        /(\d)(?=(?:\d{3})+(?:[^\d]{1}|$))/
+      end
+    end
+  end
+
   def localize_formatting_rules(rules)
     if currency.iso_code == "JPY" && I18n.locale == :ja
       rules[:symbol] = "円"

data/lib/money/money/parsing.rb

@@ -21,12 +21,12 @@ class Money
       #   the +input+ string.
       #
       # @example
-      #   '100'.to_money                #=> #<Money @cents=10000>
-      #   '100.37'.to_money             #=> #<Money @cents=10037>
-      #   '100 USD'.to_money            #=> #<Money @cents=10000, @currency=#<Money::Currency id: usd>>
-      #   'USD 100'.to_money            #=> #<Money @cents=10000, @currency=#<Money::Currency id: usd>>
-      #   '$100 USD'.to_money           #=> #<Money @cents=10000, @currency=#<Money::Currency id: usd>>
-      #   'hello 2000 world'.to_money   #=> #<Money @cents=200000 @currency=#<Money::Currency id: usd>>
+      #   '100'.to_money                #=> #<Money @fractional=10000>
+      #   '100.37'.to_money             #=> #<Money @fractional=10037>
+      #   '100 USD'.to_money            #=> #<Money @fractional=10000, @currency=#<Money::Currency id: usd>>
+      #   'USD 100'.to_money            #=> #<Money @fractional=10000, @currency=#<Money::Currency id: usd>>
+      #   '$100 USD'.to_money           #=> #<Money @fractional=10000, @currency=#<Money::Currency id: usd>>
+      #   'hello 2000 world'.to_money   #=> #<Money @fractional=200000 @currency=#<Money::Currency id: usd>>
       #
       # @example Mismatching currencies
       #   'USD 2000'.to_money("EUR")    #=> ArgumentError
@@ -64,12 +64,12 @@ class Money
         end
         currency = Money::Currency.wrap(currency)
 
-        cents = extract_cents(i, currency)
-        new(cents, currency)
+        fractional = extract_cents(i, currency)
+        new(fractional, currency)
       end
 
       # Converts a String into a Money object treating the +value+
-      # as dollars and converting them to the corresponding cents value,
+      # as amount and converting to fractional unit,
       # according to +currency+ subunit property,
       # before instantiating the Money object.
       #
@@ -84,13 +84,13 @@ class Money
       #
       # @example
       #   Money.from_string("100")
-      #   #=> #<Money @cents=10000 @currency="USD">
+      #   #=> #<Money @fractional=10000 @currency="USD">
       #   Money.from_string("100", "USD")
-      #   #=> #<Money @cents=10000 @currency="USD">
+      #   #=> #<Money @fractional=10000 @currency="USD">
       #   Money.from_string("100", "EUR")
-      #   #=> #<Money @cents=10000 @currency="EUR">
+      #   #=> #<Money @fractional=10000 @currency="EUR">
       #   Money.from_string("100", "BHD")
-      #   #=> #<Money @cents=100 @currency="BHD">
+      #   #=> #<Money @fractional=100 @currency="BHD">
       #
       # @see String#to_money
       # @see Money.parse
@@ -100,7 +100,7 @@ class Money
       end
 
       # Converts a Fixnum into a Money object treating the +value+
-      # as dollars and converting them to the corresponding cents value,
+      # as amount and to corresponding fractional unit,
       # according to +currency+ subunit property,
       # before instantiating the Money object.
       #
@@ -111,13 +111,13 @@ class Money
       #
       # @example
       #   Money.from_fixnum(100)
-      #   #=> #<Money @cents=10000 @currency="USD">
+      #   #=> #<Money @fractional=10000 @currency="USD">
       #   Money.from_fixnum(100, "USD")
-      #   #=> #<Money @cents=10000 @currency="USD">
+      #   #=> #<Money @fractional=10000 @currency="USD">
       #   Money.from_fixnum(100, "EUR")
-      #   #=> #<Money @cents=10000 @currency="EUR">
+      #   #=> #<Money @fractional=10000 @currency="EUR">
       #   Money.from_fixnum(100, "BHD")
-      #   #=> #<Money @cents=100 @currency="BHD">
+      #   #=> #<Money @fractional=100 @currency="BHD">
       #
       # @see Fixnum#to_money
       # @see Money.from_numeric
@@ -129,7 +129,7 @@ class Money
       end
 
       # Converts a Float into a Money object treating the +value+
-      # as dollars and converting them to the corresponding cents value,
+      # as dollars and to corresponding fractional unit,
       # according to +currency+ subunit property,
       # before instantiating the Money object.
       #
@@ -143,13 +143,13 @@ class Money
       #
       # @example
       #   Money.from_float(100.0)
-      #   #=> #<Money @cents=10000 @currency="USD">
+      #   #=> #<Money @fractional=10000 @currency="USD">
       #   Money.from_float(100.0, "USD")
-      #   #=> #<Money @cents=10000 @currency="USD">
+      #   #=> #<Money @fractional=10000 @currency="USD">
       #   Money.from_float(100.0, "EUR")
-      #   #=> #<Money @cents=10000 @currency="EUR">
+      #   #=> #<Money @fractional=10000 @currency="EUR">
       #   Money.from_float(100.0, "BHD")
-      #   #=> #<Money @cents=100 @currency="BHD">
+      #   #=> #<Money @fractional=100 @currency="BHD">
       #
       # @see Float#to_money
       # @see Money.from_numeric
@@ -159,7 +159,7 @@ class Money
       end
 
       # Converts a BigDecimal into a Money object treating the +value+
-      # as dollars and converting them to the corresponding cents value,
+      # as dollars and converting to corresponding fractional unit,
       # according to +currency+ subunit property,
       # before instantiating the Money object.
       #
@@ -170,13 +170,13 @@ class Money
       #
       # @example
       #   Money.from_bigdecimal(BigDecimal.new("100")
-      #   #=> #<Money @cents=10000 @currency="USD">
+      #   #=> #<Money @fractional=10000 @currency="USD">
       #   Money.from_bigdecimal(BigDecimal.new("100", "USD")
-      #   #=> #<Money @cents=10000 @currency="USD">
+      #   #=> #<Money @fractional=10000 @currency="USD">
       #   Money.from_bigdecimal(BigDecimal.new("100", "EUR")
-      #   #=> #<Money @cents=10000 @currency="EUR">
+      #   #=> #<Money @fractional=10000 @currency="EUR">
       #   Money.from_bigdecimal(BigDecimal.new("100", "BHD")
-      #   #=> #<Money @cents=100 @currency="BHD">
+      #   #=> #<Money @fractional=100 @currency="BHD">
       #
       # @see BigDecimal#to_money
       # @see Money.from_numeric
@@ -188,7 +188,7 @@ class Money
       end
 
       # Converts a Numeric value into a Money object treating the +value+
-      # as dollars and converting them to the corresponding cents value,
+      # as dollars and converting to corresponding fractional unit,
       # according to +currency+ subunit property,
       # before instantiating the Money object.
       #
@@ -209,9 +209,9 @@ class Money
       #
       # @example
       #   Money.from_numeric(100)
-      #   #=> #<Money @cents=10000 @currency="USD">
+      #   #=> #<Money @fractional=10000 @currency="USD">
       #   Money.from_numeric(100.00)
-      #   #=> #<Money @cents=10000 @currency="USD">
+      #   #=> #<Money @fractional=10000 @currency="USD">
       #   Money.from_numeric("100")
       #   #=> ArgumentError
       #
@@ -258,10 +258,10 @@ class Money
         #if the number ends with punctuation, just throw it out.  If it means decimal,
         #it won't hurt anything.  If it means a literal period or comma, this will
         #save it from being mis-interpreted as a decimal.
-        num.chop! if num.match /[\.|,]$/
+        num.chop! if num.match(/[\.|,]$/)
 
           # gather all decimal_marks within the result number
-          used_decimal_marks = num.scan /[^\d]/
+          used_decimal_marks = num.scan(/[^\d]/)
 
           # determine the number of unique decimal_marks within the number
           #