money 5.0.0 → 5.1.0.beta1

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## master
+
+- Renamed Money#cents to Money#fractional. Money#cents can still be used as a synonym and equivalent of Money#fractional.
+- Added Money.new_with_amount and Money#amount. Money.new_with_dollars and Money#dollars remain as synonyms.
+- Calling Bank::Base.instance doesn't make Bank::VariableExchange.instance
+  return Bank::Base.instance anymore (semaperepelitsa)
+- Update Turkmenistan manat from TMM to TMT currency (GH-181). [Thanks @Exoth]
+- Moved ZWD Zimbabwean dollars to currency_bc.json, also added there ZWL, ZWN, and ZWR Zimbabwean dollars (GH-184).
+- Switch to multi_json gem (GH-170)
+- Fix "warning: ambiguous first argument..." (GH-166)
+- Update dependencies to latest and greatest (GH-172)
+- TravisBot is now watching Pull Request!!! (GH-171)
+- Minor code cleaning
+
 ## 5.0.0
 - Minor bugfix - incorrect use of character range resulted in 
   botched results for Money::Parsing#extract_cents (GH-162)

data/README.md

@@ -1,13 +1,10 @@
 # RubyMoney - Money
 
 [![Build Status](http://travis-ci.org/RubyMoney/money.png)](http://travis-ci.org/RubyMoney/money)
-[![Dependency Status](https://gemnasium.com/RubyMoney/money.png)](https://gemnasium.com/RubyMoney/money)
 
 ## Contributing
 
-When contributing, please make sure to update the CHANGELOG and AUTHORS files
-when you submit your pull request. Upon merging of your first pull request,
-you will be given commit access to the repository.
+See the [Contribution Guidelines](https://github.com/RubyMoney/money/blob/master/CONTRIBUTING.md)
 
 ## Introduction
 
@@ -33,9 +30,12 @@ This library aids one in handling money and different currencies.
 - [API Documentation](http://rubydoc.info/gems/money/frames)
 - [Git Repository](http://github.com/RubyMoney/money)
 
-### Note
+### Notes
 
-Your app must use UTF-8 to function with this library. There are a number of non-ASCII currency attributes.
+- Your app must use UTF-8 to function with this library. There are a
+  number of non-ASCII currency attributes.
+- This app requires Ruby 1.9 and JSON. If you're using JRuby < 1.7.0
+  you'll need to add `gem "json"` to your Gemfile or similar.
 
 ## Downloading
 
@@ -73,9 +73,9 @@ Money.new(1000, "USD") * 5                     == Money.new(5000, "USD")
 
 # Assumptive Currencies
 Money.assume_from_symbol = true
-Money.new("$100") == Money.new(10000, "USD") 
-Money.new("€100") == Money.new(10000, "EUR") 
-Money.new("£100") == Money.new(10000, "GBP") 
+Money.parse("$100") == Money.new(10000, "USD")
+Money.parse("€100") == Money.new(10000, "EUR")
+Money.parse("£100") == Money.new(10000, "GBP")
 
 # Currency conversions
 some_code_to_setup_exchange_rates
@@ -227,40 +227,10 @@ implementations.
 - [nordea](https://github.com/k33l0r/nordea)
 - [nbrb_currency](https://github.com/slbug/nbrb_currency)
 - [money-open-exchange-rates](https://github.com/spk/money-open-exchange-rates)
-- [money-historical-bank](https://github.com/coutud/money-historical-bank)
+- [money-historical-bank](https://github.com/atwam/money-historical-bank)
 
 ## Ruby on Rails
 
-To integrate money in a rails application use [money-rails](http://github.com/RubyMoney/money-rails)
-gem or follow the instructions below.
+To integrate money in a Rails application use [money-rails](http://github.com/RubyMoney/money-rails).
 
-Use the `composed_of` helper to let Active Record deal with embedding the money
-object in your models. The following example requires 2 columns:
-
-``` ruby
-:price_cents, :integer, :default => 0, :null => false
-:currency, :string
-```
-
-Then in your model file:
-
-``` ruby
-composed_of :price,
-  :class_name => "Money",
-  :mapping => [%w(price_cents cents), %w(currency currency_as_string)],
-  :constructor => Proc.new { |cents, currency| Money.new(cents || 0, currency || Money.default_currency) },
-  :converter => Proc.new { |value| value.respond_to?(:to_money) ? value.to_money : raise(ArgumentError, "Can't convert #{value.class} to Money") }
-```
-
-For Money 2.2.x and previous versions, simply use the following `composed_of`
-definition:
-
-``` ruby
-composed_of :price,
-  :class_name => "Money",
-  :mapping => [%w(price_cents cents), %w(currency currency)],
-  :constructor => Proc.new { |cents, currency| Money.new(cents || 0, currency || Money.default_currency) }
-```
-
-Note the difference in the currency column mapping (currency_as_string vs. currency) - this matters!  For further details read the full discussion
-[here](http://github.com/RubyMoney/money/issues/4#comment_224880).
+For depreceated methods of integrating with Rails, check [the wiki](https://github.com/RubyMoney/money/wiki).

data/config/currency.json

@@ -1592,10 +1592,10 @@
     "symbol": "kr",
     "subunit": "Öre",
     "subunit_to_unit": 100,
-    "symbol_first": true,
+    "symbol_first": false,
     "html_entity": "",
-    "decimal_mark": ".",
-    "thousands_separator": ",",
+    "decimal_mark": ",",
+    "thousands_separator": ".",
     "iso_numeric": "752"
   },
   "sgd": {
@@ -1754,7 +1754,7 @@
     "thousands_separator": ",",
     "iso_numeric": "972"
   },
-  "tmm": {
+  "tmt": {
     "priority": 100,
     "iso_code": "TMM",
     "name": "Turkmenistani Manat",
@@ -1765,7 +1765,7 @@
     "html_entity": "",
     "decimal_mark": ".",
     "thousands_separator": ",",
-    "iso_numeric": "795"
+    "iso_numeric": "934"
   },
   "tnd": {
     "priority": 100,
@@ -2052,18 +2052,5 @@
     "decimal_mark": ".",
     "thousands_separator": ",",
     "iso_numeric": "894"
-  },
-  "zwd": {
-    "priority": 100,
-    "iso_code": "ZWD",
-    "name": "Zimbabwean Dollar",
-    "symbol": "$",
-    "subunit": "Cent",
-    "subunit_to_unit": 100,
-    "symbol_first": true,
-    "html_entity": "$",
-    "decimal_mark": ".",
-    "thousands_separator": ",",
-    "iso_numeric": "716"
   }
-}
+}

data/config/currency_bc.json

@@ -12,6 +12,32 @@
     "thousands_separator": ",",
     "iso_numeric": "233"
   },
+  "ghc": {
+    "priority": 100,
+    "iso_code": "GHS",
+    "name": "Ghanaian Cedi",
+    "symbol": "₵",
+    "subunit": "Pesewa",
+    "subunit_to_unit": 100,
+    "symbol_first": true,
+    "html_entity": "₵",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": "288"
+  },
+  "tmm": {
+    "priority": 100,
+    "iso_code": "TMM",
+    "name": "Turkmenistani Manat",
+    "symbol": "m",
+    "subunit": "Tennesi",
+    "subunit_to_unit": 100,
+    "symbol_first": false,
+    "html_entity": "",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": "795"
+  },
   "yen": {
     "priority": 100,
     "iso_code": "JPY",
@@ -25,17 +51,56 @@
     "thousands_separator": ",",
     "iso_numeric": ""
   },
-  "ghc": {
+  "zwd": {
     "priority": 100,
-    "iso_code": "GHS",
-    "name": "Ghanaian Cedi",
-    "symbol": "₵",
-    "subunit": "Pesewa",
+    "iso_code": "ZWD",
+    "name": "Zimbabwean Dollar",
+    "symbol": "$",
+    "subunit": "Cent",
     "subunit_to_unit": 100,
     "symbol_first": true,
-    "html_entity": "₵",
+    "html_entity": "$",
     "decimal_mark": ".",
     "thousands_separator": ",",
-    "iso_numeric": "288"
+    "iso_numeric": "716"
+  },
+  "zwl": {
+    "priority": 100,
+    "iso_code": "ZWL",
+    "name": "Zimbabwean Dollar",
+    "symbol": "$",
+    "subunit": "Cent",
+    "subunit_to_unit": 100,
+    "symbol_first": true,
+    "html_entity": "$",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": "932"
+  },
+  "zwn": {
+    "priority": 100,
+    "iso_code": "ZWN",
+    "name": "Zimbabwean Dollar",
+    "symbol": "$",
+    "subunit": "Cent",
+    "subunit_to_unit": 100,
+    "symbol_first": true,
+    "html_entity": "$",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": "942"
+  },
+  "zwr": {
+    "priority": 100,
+    "iso_code": "ZWR",
+    "name": "Zimbabwean Dollar",
+    "symbol": "$",
+    "subunit": "Cent",
+    "subunit_to_unit": 100,
+    "symbol_first": true,
+    "html_entity": "$",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": "935"
   }
 }

data/lib/money.rb

@@ -1,28 +1,7 @@
-# Copyright (c) 2005 Tobias Luetke
-# Copyright (c) 2008 Phusion
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-require 'bigdecimal'
-require 'i18n' rescue LoadError
-require 'money/currency_loader'
-require 'money/currency'
-require 'money/money'
-require 'money/core_extensions'
+require "bigdecimal"
+require "bigdecimal/util"
+require "i18n" rescue LoadError
+require "money/currency_loader"
+require "money/currency"
+require "money/money"
+require "money/core_extensions"

data/lib/money/bank/base.rb

@@ -45,7 +45,7 @@ class Money
       #
       # @return [Money::Bank::Base]
       def self.instance
-        @@singleton ||= self.new
+        @singleton ||= self.new
       end
 
       # The rounding method to use when exchanging rates.

data/lib/money/bank/variable_exchange.rb

@@ -1,7 +1,6 @@
 require 'money/bank/base'
-
-autoload :JSON, 'json'
-autoload :YAML, 'yaml'
+require 'json'
+require 'yaml'
 
 class Money
   module Bank
@@ -25,10 +24,10 @@ class Money
     #   c2 = 100_00.to_money("CAD")
     #
     #   # Exchange 100 USD to CAD:
-    #   bank.exchange_with(c1, "CAD") #=> #<Money @cents=1245150>
+    #   bank.exchange_with(c1, "CAD") #=> #<Money @fractional=1245150>
     #
     #   # Exchange 100 CAD to USD:
-    #   bank.exchange_with(c2, "USD") #=> #<Money @cents=803115>
+    #   bank.exchange_with(c2, "USD") #=> #<Money @fractional=803115>
     class VariableExchange < Base
 
       attr_reader :rates
@@ -81,10 +80,10 @@ class Money
       #   c2 = 100_00.to_money("CAD")
       #
       #   # Exchange 100 USD to CAD:
-      #   bank.exchange_with(c1, "CAD") #=> #<Money @cents=1245150>
+      #   bank.exchange_with(c1, "CAD") #=> #<Money @fractional=1245150>
       #
       #   # Exchange 100 CAD to USD:
-      #   bank.exchange_with(c2, "USD") #=> #<Money @cents=803115>
+      #   bank.exchange_with(c2, "USD") #=> #<Money @fractional=803115>
       def exchange_with(from, to_currency)
         return from if same_currency?(from.currency, to_currency)
 
@@ -94,9 +93,9 @@ class Money
         end
         _to_currency_  = Currency.wrap(to_currency)
 
-        cents = BigDecimal.new(from.cents.to_s) / (BigDecimal.new(from.currency.subunit_to_unit.to_s) / BigDecimal.new(_to_currency_.subunit_to_unit.to_s))
+        fractional = BigDecimal.new(from.fractional.to_s) / (BigDecimal.new(from.currency.subunit_to_unit.to_s) / BigDecimal.new(_to_currency_.subunit_to_unit.to_s))
 
-        ex = cents * BigDecimal.new(rate.to_s)
+        ex = fractional * BigDecimal.new(rate.to_s)
         ex = ex.to_f
         ex = if block_given?
                yield ex

data/lib/money/core_extensions.rb

@@ -9,9 +9,9 @@ class Numeric
   # @return [Money]
   #
   # @example
-  #   100.to_money                   #=> #<Money @cents=10000>
-  #   100.37.to_money                #=> #<Money @cents=10037>
-  #   BigDecimal.new('100').to_money #=> #<Money @cents=10000>
+  #   100.to_money                   #=> #<Money @fractional=10000>
+  #   100.37.to_money                #=> #<Money @fractional=10037>
+  #   BigDecimal.new('100').to_money #=> #<Money @fractional=10000>
   #
   # @see Money.from_numeric
   #
@@ -33,12 +33,12 @@ class String
   # @return [Money]
   #
   # @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>>
   #
   # @see Money.from_string
   #

data/lib/money/currency.rb

@@ -144,7 +144,7 @@ class Money
     #
     # @return [String]
     attr_reader :thousands_separator
-    alias :delimiter :thousands_separator 
+    alias :delimiter :thousands_separator
 
     # Should the currency symbol precede the amount, or should it come after?
     #

data/lib/money/money.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
-require 'money/bank/variable_exchange'
-require 'money/money/arithmetic'
-require 'money/money/parsing'
-require 'money/money/formatting'
+require "money/bank/variable_exchange"
+require "money/money/arithmetic"
+require "money/money/parsing"
+require "money/money/formatting"
 
 # Represents an amount of money in a given currency.
 class Money
@@ -11,10 +11,23 @@ class Money
   include Formatting
   include Parsing
 
-  # The value of the money in cents.
+  # Convenience method for fractional part of the amount. Synonym of #fractional
   #
   # @return [Integer]
-  attr_reader :cents
+  def cents
+    fractional
+  end
+
+  # The value of the amount represented in the fractional unit of the currency. Example: USD, 1 dollar (amount) == 100 cents (fractional unit).
+  #
+  # @return [Integer]
+  def fractional
+    if self.class.infinite_precision
+      @fractional
+    else
+      @fractional.round(0, self.class.rounding_mode).to_i
+    end
+  end
 
   # The currency the money is in.
   #
@@ -52,6 +65,21 @@ class Money
     #
     # @return [true,false]
     attr_accessor :assume_from_symbol
+
+    # Use this to enable infinite precision cents
+    #
+    # @return [true,false]
+    attr_accessor :infinite_precision
+
+    # Use this to specify the rounding mode
+    #
+    # @return [BigDecimal::ROUND_MODE]
+    attr_accessor :rounding_mode
+
+    # Use this to specify precision for converting Rational to BigDecimal
+    #
+    # @return [Integer]
+    attr_accessor :conversion_precision
   end
 
   # Set the default bank for creating new +Money+ objects.
@@ -66,6 +94,15 @@ class Money
   # Default to not using currency symbol assumptions when parsing
   self.assume_from_symbol = false
 
+  # Default to not using infinite precision cents
+  self.infinite_precision = false
+
+  # Default to bankers rounding
+  self.rounding_mode = BigDecimal::ROUND_HALF_EVEN
+
+  # Default the conversion of Rationals precision to 16
+  self.conversion_precision = 16
+
   # Create a new money object with value 0.
   #
   # @param [Currency, String, Symbol] currency The currency to use.
@@ -73,7 +110,7 @@ class Money
   # @return [Money]
   #
   # @example
-  #   Money.empty #=> #<Money @cents=0>
+  #   Money.empty #=> #<Money @fractional=0>
   def self.empty(currency = default_currency)
     Money.new(0, currency)
   end
@@ -122,37 +159,43 @@ class Money
     Money.new(cents, "EUR")
   end
 
-  # Creates a new Money object of +amount+ value in dollars,
+  # Creates a new Money object of +amount+ value ,
   # with given +currency+.
   #
-  # The amount value is expressed in +dollars+
-  # where the +dollar+ is the main monetary unit,
+  # The amount value is expressed in the main monetary unit,
   # opposite to the subunit-based representation
   # used internally by this library called +cents+.
   #
-  # @param [Numeric] amount The money amount, in dollars.
+  # @param [Numeric] amount The money amount, in main monetary unit.
   # @param [Currency, String, Symbol] currency The currency format.
   # @param [Money::Bank::*] bank The exchange bank to use.
   #
   # @return [Money]
   #
   # @example
-  #   Money.new_with_dollars(100)
-  #   #=> #<Money @cents=10000 @currency="USD">
-  #   Money.new_with_dollars(100, "USD")
-  #   #=> #<Money @cents=10000 @currency="USD">
-  #   Money.new_with_dollars(100, "EUR")
-  #   #=> #<Money @cents=10000 @currency="EUR">
+  #   Money.new_with_amount(100)
+  #   #=> #<Money @fractional=10000 @currency="USD">
+  #   Money.new_with_amount(100, "USD")
+  #   #=> #<Money @fractional=10000 @currency="USD">
+  #   Money.new_with_amount(100, "EUR")
+  #   #=> #<Money @fractional=10000 @currency="EUR">
   #
   # @see Money.new
   #
-  def self.new_with_dollars(amount, currency = Money.default_currency, bank = Money.default_bank)
+  def self.new_with_amount(amount, currency = Money.default_currency, bank = Money.default_bank)
     money = from_numeric(amount, currency)
     # Hack! You can't change a bank
     money.instance_variable_set("@bank", bank)
     money
   end
 
+  # Synonym of #new_with_amount
+  #
+  # @see Money.new_with_amount
+  def self.new_with_dollars(*args)
+    self.new_with_amount(*args)
+  end
+
   # Adds a new exchange rate to the default bank and return the rate.
   #
   # @param [Currency, String, Symbol] from_currency Currency to exchange from.
@@ -168,13 +211,13 @@ class Money
   end
 
 
-  # Creates a new Money object of +cents+ value in cents,
-  # with given +currency+.
+  # Creates a new Money object of value given in the 
+  # +fractional unit+ of the given +currency+.
   #
   # Alternatively you can use the convenience
   # methods like {Money.ca_dollar} and {Money.us_dollar}.
   #
-  # @param [Integer] cents The money amount, in cents.
+  # @param [Integer] The value given in the fractional unit.
   # @param [Currency, String, Symbol] currency The currency format.
   # @param [Money::Bank::*] bank The exchange bank to use.
   #
@@ -182,22 +225,31 @@ class Money
   #
   # @example
   #   Money.new(100)
-  #   #=> #<Money @cents=100 @currency="USD">
+  #   #=> #<Money @fractional=100 @currency="USD">
   #   Money.new(100, "USD")
-  #   #=> #<Money @cents=100 @currency="USD">
+  #   #=> #<Money @fractional=100 @currency="USD">
   #   Money.new(100, "EUR")
-  #   #=> #<Money @cents=100 @currency="EUR">
+  #   #=> #<Money @fractional=100 @currency="EUR">
   #
   # @see Money.new_with_dollars
   #
-  def initialize(cents, currency = Money.default_currency, bank = Money.default_bank)
-    @cents = cents.round.to_i
+  def initialize(fractional, currency = Money.default_currency, bank = Money.default_bank)
+    @fractional = if fractional.is_a?(Rational)
+                    fractional.to_d(self.class.conversion_precision)
+                  elsif fractional.respond_to?(:to_d)
+                    fractional.to_d
+                  else
+                    BigDecimal.new(fractional.to_s)
+                  end
     @currency = Currency.wrap(currency)
-    @bank = bank
+    @bank     = bank
   end
 
+  # Assuming using a currency using dollars:
   # Returns the value of the money in dollars,
-  # instead of in cents.
+  # instead of in the fractional unit cents.
+  #
+  # Synonym of #amount
   #
   # @return [Float]
   #
@@ -205,10 +257,26 @@ class Money
   #   Money.new(100).dollars           # => 1.0
   #   Money.new_with_dollars(1).dollar # => 1.0
   #
+  # @see #amount
   # @see #to_f
   # @see #cents
   #
   def dollars
+    amount
+  end
+
+  # Returns the numerical value of the money
+  #
+  # @return [Float]
+  #
+  # @example
+  #   Money.new(100).amount            # => 1.0
+  #   Money.new_with_amount(1).amount  # => 1.0
+  #
+  # @see #to_f
+  # @see #fractional
+  #
+  def amount
     to_f
   end
 
@@ -234,7 +302,7 @@ class Money
     @currency = Currency.wrap(val)
   end
 
-  # Returns a Fixnum hash value based on the +cents+ and +currency+ attributes
+  # Returns a Fixnum hash value based on the +fractional+ and +currency+ attributes
   # in order to use functions like & (intersection), group_by, etc.
   #
   # @return [Fixnum]
@@ -242,7 +310,7 @@ class Money
   # @example
   #   Money.new(100).hash #=> 908351
   def hash
-    [cents.hash, currency.hash].hash
+    [fractional.hash, currency.hash].hash
   end
 
   # Uses +Currency#symbol+. If +nil+ is returned, defaults to "¤".
@@ -259,7 +327,7 @@ class Money
   #
   # @return [String]
   def inspect
-    "#<Money cents:#{cents} currency:#{currency}>"
+    "#<Money fractional:#{fractional} currency:#{currency}>"
   end
 
   # Returns the amount of money as a string.
@@ -269,14 +337,41 @@ class Money
   # @example
   #   Money.ca_dollar(100).to_s #=> "1.00"
   def to_s
-    unit, subunit  = cents.abs.divmod(currency.subunit_to_unit).map{|o| o.to_s}
-    if currency.decimal_places == 0
-      return "-#{unit}" if cents < 0
-      return unit
+    unit, subunit = fractional().abs.divmod(currency.subunit_to_unit)
+
+    unit_str       = ""
+    subunit_str    = ""
+    fraction_str   = ""
+
+    if self.class.infinite_precision
+      subunit, fraction = subunit.divmod(BigDecimal("1"))
+
+      unit_str       = unit.to_i.to_s
+      subunit_str    = subunit.to_i.to_s
+      fraction_str   = fraction.to_s("F")[2..-1] # want fractional part "0.xxx"
+
+      fraction_str = "" if fraction_str =~ /^0+$/
+    else
+      unit_str, subunit_str = unit.to_s, subunit.to_s
+    end
+
+    absolute_str = if currency.decimal_places == 0
+      if fraction_str == ""
+        unit_str
+      else
+        "#{unit_str}#{decimal_mark}#{fraction_str}"
+      end
+    else
+      # need to pad subunit to right position,
+      # for example 1 usd 3 cents should be 1.03 not 1.3
+      subunit_str.insert(0, '0') while subunit_str.length < currency.decimal_places
+
+      "#{unit_str}#{decimal_mark}#{subunit_str}#{fraction_str}"
+    end
+
+    absolute_str.tap do |str|
+      str.insert(0, "-") if fractional() < 0
     end
-    subunit = (("0" * currency.decimal_places) + subunit)[(-1*currency.decimal_places)..-1]
-    return "-#{unit}#{decimal_mark}#{subunit}" if cents < 0
-    "#{unit}#{decimal_mark}#{subunit}"
   end
 
   # Return the amount of money as a BigDecimal.
@@ -286,7 +381,7 @@ class Money
   # @example
   #   Money.us_dollar(100).to_d => BigDecimal.new("1.0")
   def to_d
-    BigDecimal.new(cents.to_s) / BigDecimal.new(currency.subunit_to_unit.to_s)
+    BigDecimal.new(fractional.to_s) / BigDecimal.new(currency.subunit_to_unit.to_s)
   end
 
   # Return the amount of money as a float. Floating points cannot guarantee
@@ -377,20 +472,32 @@ class Money
   #   Money.new(5, "USD").allocate([0.3,0.7)) #=> [Money.new(2), Money.new(3)]
   #   Money.new(100, "USD").allocate([0.33,0.33,0.33]) #=> [Money.new(34), Money.new(33), Money.new(33)]
   def allocate(splits)
-    allocations = splits.inject(0.0) {|sum, i| sum += i }
-    raise ArgumentError, "splits add to more then 100%" if (allocations - 1.0) > Float::EPSILON
+    allocations = splits.inject(BigDecimal("0")) do |sum, n|
+      n = BigDecimal(n.to_s) unless n.is_a?(BigDecimal)
+      sum + n
+    end
 
-    left_over = cents
+    if (allocations - BigDecimal("1")) > Float::EPSILON
+      raise ArgumentError, "splits add to more then 100%"
+    end
+
+    left_over = fractional
 
-    amounts = splits.collect do |ratio|
-      fraction = (cents * ratio / allocations).floor
-      left_over -= fraction
-      fraction
+    amounts = splits.map do |ratio|
+      if self.class.infinite_precision
+        fraction = fractional * ratio
+      else
+        fraction = (fractional * ratio / allocations).floor
+        left_over -= fraction
+        fraction
+      end
     end
 
-    left_over.times { |i| amounts[i % amounts.length] += 1 }
+    unless self.class.infinite_precision
+      left_over.to_i.times { |i| amounts[i % amounts.length] += 1 }
+    end
 
-    amounts.collect { |cents| Money.new(cents, currency) }
+    amounts.collect { |fractional| Money.new(fractional, currency) }
   end
 
   # Split money amongst parties evenly without loosing pennies.
@@ -403,10 +510,16 @@ class Money
   #   Money.new(100, "USD").split(3) #=> [Money.new(34), Money.new(33), Money.new(33)]
   def split(num)
     raise ArgumentError, "need at least one party" if num < 1
-    low = Money.new(cents / num)
-    high = Money.new(low.cents + 1)
 
-    remainder = cents % num
+    if self.class.infinite_precision
+      amt = self.div(BigDecimal(num.to_s))
+      return 1.upto(num).map{amt}
+    end
+
+    low = Money.new(fractional / num, self.currency)
+    high = Money.new(low.fractional + 1, self.currency)
+
+    remainder = fractional % num
     result = []
 
     num.times do |index|