money 3.1.5 → 3.5.0

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+Money 3.5.0
+===========
+
+Features
+--------
+ - Updated to RSpec2.
+ - Use i18n to lookup separator and delimiter signs.
+ - Removed all deprecated methods up to v3.5.0, including the following:
+   - Using Money#format with params instead of a Hash.
+   - Using a Hash with Money#new.
+   - Using Bank#exchange, use Bank#exchange_with instead.
+
+Bugfixes
+--------
+ - Updated Money#to_s to respect :separator and :subunit_to_unit.
+ - Fixed Money#format for :subunit_to_unit != 100.
+   ([#issue/37](http://github.com/RubyMoney/money/issue/37))
+ - Fixed String#to_money for :subunit_to_unit != 100.
+   ([#issue/36](http://github.com/RubyMoney/money/issue/36))
+ - Removed duplicate currencies.
+   ([#issue/38](http://github.com/RubyMoney/money/issue/38))
+ - Fixed issue related to JRuby returning 2 for Math.log10(1000).floor instead
+   of correctly returning 3.
+
 Money 3.1.5
 ===========
 

data/README.md

@@ -177,15 +177,6 @@ There is nothing stopping you from creating bank objects which scrapes
 
     Money.default_bank = ExchangeBankWhichScrapesXeDotCom.new
 
-### Upcoming Changes
-
-Starting in v3.1.0 we will be making two changes to the exchange process. First
-a new `Bank::Base` class will be available. This will allow users to more
-easily create custom `Bank` classes. Secondly the default `#exchange` method
-will be depreciated and a new `#exchange_with` method will be used. Currently
-`#exchange` passes the `cents` attribute. `#exchange_with` will pass the
-actual `Money` object instead.
-
 ### Implementations
 
 The following is a list of Money.gem compatible currency exchange rate

data/lib/money.rb

@@ -21,8 +21,8 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'bigdecimal'
+require 'i18n' rescue LoadError
 require 'money/currency'
 require 'money/money'
 require 'money/defaults'
 require 'money/core_extensions'
-require 'money/deprecations'

data/lib/money/bank/base.rb

@@ -84,13 +84,6 @@ class Money
       def setup
       end
 
-      # @deprecated +#exchange+ will be removed in v3.2.0, use +#exchange_with+
-      # @see Money::Bank::Base#exchange_with
-      def exchange(cents, from_currency, to_currency, &block)
-        Money.deprecate "`Money::Bank::Base#exchange' will be removed in v3.2.0, use #exchange_with instead"
-        exchange_with(Money.new(cents, from_currency), to_currency, &block).cents
-      end
-
       # Exchanges the given +Money+ object to a new +Money+ object in
       # +to_currency+.
       #

data/lib/money/currency.rb

@@ -51,7 +51,6 @@ class Money
       :cad => { :priority =>   5, :iso_code => "CAD", :name => "Canadian Dollar",                           :symbol => "$",             :subunit => "Cent",          :subunit_to_unit => 100, :separator => ".", :delimiter => ","   },
       :cdf => { :priority => 100, :iso_code => "CDF", :name => "Congolese Franc",                           :symbol => "Fr",            :subunit => "Centime",       :subunit_to_unit => 100, :separator => ".", :delimiter => ","   },
       :chf => { :priority => 100, :iso_code => "CHF", :name => "Swiss Franc",                               :symbol => "Fr",            :subunit => "Rappen",        :subunit_to_unit => 100, :separator => ".", :delimiter => ","   },
-      :chf => { :priority => 100, :iso_code => "CHF", :name => "Swiss Franc",                               :symbol => "Fr",            :subunit => "Rappen",        :subunit_to_unit => 100, :separator => ".", :delimiter => ","   },
       :clp => { :priority => 100, :iso_code => "CLP", :name => "Chilean Peso",                              :symbol => "$",             :subunit => "Peso",       :subunit_to_unit => 1, :separator => ",", :delimiter => "."   },
       :cny => { :priority => 100, :iso_code => "CNY", :name => "Chinese Renminbi Yuan",                     :symbol => "¥",             :subunit => "Jiao",          :subunit_to_unit => 10, :separator => ".", :delimiter => ","    },
       :cop => { :priority => 100, :iso_code => "COP", :name => "Colombian Peso",                            :symbol => "$",             :subunit => "Centavo",       :subunit_to_unit => 100, :separator => ".", :delimiter => ","   },
@@ -142,7 +141,6 @@ class Money
       :ron => { :priority => 100, :iso_code => "RON", :name => "Romanian Leu",                              :symbol => "L",             :subunit => "Ban",           :subunit_to_unit => 100, :separator => ".", :delimiter => ","   },
       :rsd => { :priority => 100, :iso_code => "RSD", :name => "Serbian Dinar",                             :symbol => "din. or дин.",  :subunit => "Para",          :subunit_to_unit => 100, :separator => ".", :delimiter => ","   },
       :rub => { :priority => 100, :iso_code => "RUB", :name => "Russian Ruble",                             :symbol => "р.",            :subunit => "Kopek",         :subunit_to_unit => 100, :separator => ".", :delimiter => ","   },
-      :rub => { :priority => 100, :iso_code => "RUB", :name => "Russian Ruble",                             :symbol => "руб.",          :subunit => "Kopek",         :subunit_to_unit => 100, :separator => ".", :delimiter => ","   },
       :rwf => { :priority => 100, :iso_code => "RWF", :name => "Rwandan Franc",                             :symbol => "Fr",            :subunit => "Centime",       :subunit_to_unit => 100, :separator => ".", :delimiter => ","   },
       :sar => { :priority => 100, :iso_code => "SAR", :name => "Saudi Riyal",                               :symbol => "ر.س",           :subunit => "Hallallah",     :subunit_to_unit => 100, :separator => ".", :delimiter => ","   },
       :sbd => { :priority => 100, :iso_code => "SBD", :name => "Solomon Islands Dollar",                    :symbol => "$",             :subunit => "Cent",          :subunit_to_unit => 100, :separator => ".", :delimiter => ","   },
@@ -165,7 +163,6 @@ class Money
       :tnd => { :priority => 100, :iso_code => "TND", :name => "Tunisian Dinar",                            :symbol => "د.ت",           :subunit => "Millime",       :subunit_to_unit => 1000, :separator => ".", :delimiter => "," },
       :top => { :priority => 100, :iso_code => "TOP", :name => "Tongan Paʻanga",                            :symbol => "T$",            :subunit => "Seniti",        :subunit_to_unit => 100, :separator => ".", :delimiter => ","   },
       :try => { :priority => 100, :iso_code => "TRY", :name => "Turkish New Lira",                          :symbol => "YTL",           :subunit => "New kuruş",     :subunit_to_unit => 100, :separator => ".", :delimiter => ","   },
-      :try => { :priority => 100, :iso_code => "TRY", :name => "Turkish New Lira",                          :symbol => "₤",             :subunit => "New kuruş",     :subunit_to_unit => 100, :separator => ".", :delimiter => ","   },
       :ttd => { :priority => 100, :iso_code => "TTD", :name => "Trinidad and Tobago Dollar",                :symbol => "$",             :subunit => "Cent",          :subunit_to_unit => 100, :separator => ".", :delimiter => ","   },
       :twd => { :priority => 100, :iso_code => "TWD", :name => "New Taiwan Dollar",                         :symbol => "$",             :subunit => "Cent",          :subunit_to_unit => 100, :separator => ".", :delimiter => ","   },
       :tzs => { :priority => 100, :iso_code => "TZS", :name => "Tanzanian Shilling",                        :symbol => "Sh",            :subunit => "Cent",          :subunit_to_unit => 100, :separator => ".", :delimiter => ","   },
@@ -343,12 +340,6 @@ class Money
       "#<#{self.class.name} id: #{id} #{ATTRIBUTES.map { |a| "#{a}: #{send(a)}" }.join(", ")}>"
     end
 
-    # Catches deprecated uses of currency.
-    def method_missing(method, *args, &block)
-      Money.deprecate "`currency` is now a `Currency` instance. Call `currency.to_s.#{method}' instead."
-      iso_code.send(method, *args, &block)
-    end
-
     # Class Methods
     class << self
 

data/lib/money/money.rb

@@ -387,19 +387,7 @@ class Money
   #
   def initialize(cents, currency = Money.default_currency, bank = Money.default_bank)
     @cents = cents.round
-    if currency.is_a?(Hash)
-      # Earlier versions of Money wrongly documented the constructor as being able
-      # to accept something like this:
-      #
-      #   Money.new(50, :currency => "USD")
-      #
-      # We retain compatibility here.
-      Money.deprecate "Passing :currency as option is deprecated and will be removed in v3.5.0. " +
-                      "Please use `Money.new('#{cents}'#{currency[:currency].nil? ? "" : ", '#{currency[:currency]}'"})'"
-      @currency = Currency.wrap(currency[:currency] || Money.default_currency)
-    else
-      @currency = Currency.wrap(currency)
-    end
+    @currency = Currency.wrap(currency)
     @bank = bank
   end
 
@@ -724,24 +712,40 @@ class Money
     currency.symbol || "¤"
   end
 
-  # Uses +Currency#delimiter+. If +nil+ is returned, default to ",".
+  # If I18n is loaded, looks up key +:number.format.delimiter+.
+  # Otherwise and as fallback it uses +Currency#delimiter+.
+  # If +nil+ is returned, default to ",".
   #
   # @return [String]
   #
   # @example
   #   Money.new(100, "USD").delimiter #=> ","
-  def delimiter
-    currency.delimiter || ","
+  if Object.const_defined?("I18n")
+    def delimiter
+      I18n.t(:"number.format.delimiter", :default => currency.delimiter || ",")
+    end
+  else
+    def delimiter
+      currency.delimiter || ","
+    end
   end
 
-  # Uses +Currency#separator+. If +nil+ is returned, default to ".".
+  # If I18n is loaded, looks up key +:number.format.seperator+.
+  # Otherwise and as fallback it uses +Currency#seperator+.
+  # If +nil+ is returned, default to ",".
   #
   # @return [String]
   #
   # @example
   #   Money.new(100, "USD").separator #=> "."
-  def separator
-    currency.separator || "."
+  if Object.const_defined?("I18n")
+    def separator
+      I18n.t(:"number.format.separator", :default => currency.separator || ".")
+    end
+  else
+    def separator
+      currency.separator || "."
+    end
   end
 
   # Creates a formatted price string according to several rules.
@@ -856,10 +860,15 @@ class Money
       symbol_value = symbol
     end
 
-    if rules[:no_cents] or currency.subunit_to_unit == 1
-      formatted = sprintf("#{symbol_value}%d", self.to_f)
-    else
-      formatted = sprintf("#{symbol_value}%.2f", self.to_f)
+    formatted = case rules[:no_cents]
+                when true
+                  "#{symbol_value}#{self.to_s.to_i}"
+                else
+                  "#{symbol_value}#{self.to_s}"
+                end
+    if rules.has_key?(:separator) and rules[:separator] and
+      rules[:separator] != separator
+      formatted.sub!(separator, rules[:separator])
     end
 
     delimiter_value = delimiter
@@ -873,16 +882,7 @@ class Money
     end
 
     # Apply delimiter
-    formatted.gsub!(/(\d)(?=(?:\d{3})+(?:\.|$))(\d{3}\..*)?/, "\\1#{delimiter_value}\\2")
-
-    separator_value = separator
-    # Determine separator
-    if rules.has_key?(:separator) and rules[:separator]
-      separator_value = rules[:separator]
-    end
-
-    # Apply separator
-    formatted.sub!(/\.(\d{2})$/, "#{separator_value}\\1")
+    formatted.gsub!(/(\d)(?=(?:\d{3})+(?:\.|,|$))(\d{3}\..*)?/, "\\1#{delimiter_value}\\2")
 
     if rules[:with_currency]
       formatted << " "
@@ -900,8 +900,11 @@ class Money
   # @example
   #   Money.ca_dollar(100).to_s #=> "1.00"
   def to_s
-    return sprintf("%d", cents) if currency.subunit_to_unit == 1
-    sprintf("%.2f", self.to_f)
+    decimal_places = Math.log10(currency.subunit_to_unit).ceil
+    unit, subunit  = cents.divmod(currency.subunit_to_unit).map{|o| o.to_s}
+    return unit if decimal_places == 0
+    subunit = (subunit + ("0" * decimal_places))[0, decimal_places]
+    "#{unit}#{separator}#{subunit}"
   end
 
   # Return the amount of money as a float. Floating points cannot guarantee
@@ -987,13 +990,6 @@ class Money
     elsif rules.size == 1
       rules = rules.pop
       rules = { rules => true } if rules.is_a?(Symbol)
-    else
-      Money.deprecate "Passing options as parameters is deprecated and will be removed in v3.5.0. " +
-                      "Please use `#format(#{rules.map { |r| ":#{r} => true" }.join(", ") })'"
-      rules = rules.inject({}) do |h,s|
-        h[s] = true
-        h
-      end
     end
     rules
   end
@@ -1095,17 +1091,21 @@ class Money
     # build the string based on major/minor since separator/delimiters have been removed
     # avoiding floating point arithmetic here to ensure accuracy
     cents = (major.to_i * currency.subunit_to_unit)
-    # add the minor number as well. this may have any number of digits,
-    # so we treat minor as a string and truncate or right-fill it with zeroes
-    # until it becomes a two-digit number string, which we add to cents.
+    # 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
-    truncated_minor = minor[0..1]
-    truncated_minor << "0" * (2 - truncated_minor.size) if truncated_minor.size < 2
-    cents += truncated_minor.to_i
-    # respect rounding rules
-    if minor.size >= 3 && minor[2..2].to_i >= 5
-      cents += 1
-    end
+    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
+              else
+                minor[0,decimal_places].to_i
+              end
+            else
+              minor.to_i
+            end
+    cents += minor
 
     # if negative, multiply by -1; otherwise, return positive cents
     negative ? cents * -1 : cents

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: money
 version: !ruby/object:Gem::Version 
-  hash: 9
   prerelease: false
   segments: 
   - 3
-  - 1
   - 5
-  version: 3.1.5
+  - 0
+  version: 3.5.0
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -19,51 +18,64 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 -04:00
+date: 2010-12-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: i18n
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
-        version: "0"
-  type: :development
+        - 4
+        version: "0.4"
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
+        - 2
         - 0
-        version: "0"
+        - 0
+        version: 2.0.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: yard
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: This library aids one in handling money and different currencies.
 email: 
 - hongli@phusion.nl
@@ -79,8 +91,6 @@ files:
 - lib/money/bank/variable_exchange.rb
 - lib/money/core_extensions.rb
 - lib/money/currency.rb
-- lib/money/defaults.rb
-- lib/money/deprecations.rb
 - lib/money/money.rb
 - lib/money.rb
 - CHANGELOG.md
@@ -100,7 +110,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -109,7 +118,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3

data/lib/money/defaults.rb

@@ -1,57 +0,0 @@
-# encoding: utf-8
-
-class Money
-  # Used to notify users about the deprecated constants.
-  # @see Money::SYMBOLS, Money::SEPARATOR and Money::DELIMITERS
-  class DeprecatedHash < Hash
-
-    # Creates a new +DeprecatedHash+ with message that will be displayed when
-    # accessing +#[]+ and +#[]=+.
-    def initialize(hash, message)
-      @message = message
-      replace(hash)
-    end
-
-    # Displays @message then calls +super+.
-    def [](key)
-      Money.deprecate(@message)
-      super
-    end
-
-    # Displays @message then calls +super+.
-    def []=(value)
-      Money.deprecate(@message)
-      super
-    end
-
-  end
-
-  # @deprecated See Money::Currency#symbol
-  SYMBOLS = DeprecatedHash.new({
-    "GBP" => "£",
-    "JPY" => "¥",
-    "EUR" => "€",
-    "ZWD" => "Z$",
-    "CNY" => "¥",
-    "INR" => "₨",
-    "NPR" => "₨",
-    "SCR" => "₨",
-    "LKR" => "₨",
-    "SEK" => "kr",
-    "GHC" => "¢",
-    "BRL" => "R$ ",
-    # Everything else defaults to '¤'
-  }, "Money::SYMBOLS has no longer effect and will be removed in v3.2.0. See Money::Currency#symbol.")
-
-  # @deprecated See Money::Currency#separator
-  SEPARATORS = DeprecatedHash.new({
-    "BRL" => ",",
-    # Everything else defaults to '.'
-  }, "Money::SEPARATORS is deprecated and will be removed in v3.2.0. See Money::Currency#separator.")
-
-  # @deprecated See Money::Currency#delimiter
-  DELIMITERS = DeprecatedHash.new({
-    "BRL" => ".",
-    # Everything else defaults to ","
-  }, "Money::DELIMITERS is deprecated and will be removed in Money v3.2.0. See Money::Currency#delimiter.")
-end

data/lib/money/deprecations.rb

@@ -1,24 +0,0 @@
-class Money
-  # Displays a deprecation warning message.
-  #
-  # @param [String] message The message to display.
-  #
-  # @return [nil]
-  def self.deprecate(message)
-    warn "DEPRECATION WARNING: #{message}"
-  end
-
-
-  # Money::VariableExchangeBank is the legacy default bank
-  # shipped with Money. The class has been superseded by
-  # Money::Bank::VariableExchange.
-  #
-  # @deprecated Use Money::Bank::VariableExchange instead.
-  class VariableExchangeBank < Bank::VariableExchange # :nodoc:
-    # Calls +Money#deprecate+ the super.
-    def initialize(*args)
-      Money.deprecate "Money::VariableExchangeBank is deprecated and will be removed in v3.2.0. Use Money::Bank::VariableExchange instead."
-      super
-    end
-  end
-end