money 6.7.1 → 6.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf8496911c1ac6ef2fdb34ad3e0b9f458bf6e836
-  data.tar.gz: 70ed919de03069d7a92883d46b890d60194eae1a
+  metadata.gz: f9d58da811f0d0d652d931abc3e027c4ac29f194
+  data.tar.gz: eb6e25dcd90e03488b99913bcbedfed44b9370f3
 SHA512:
-  metadata.gz: dabd711f4ba2737ee735c8e29569b56d0650686802fd56e27d0df34afd26865bfd11630deacb64cb74d22c7b97a25fd8a4bfa49ed3dcfa5195b8bf324edd2a53
-  data.tar.gz: 03e66b3f5639b64baf44082e075e6c2e275ce8bd9911cb0e1152ccf4449d840043b9a233a81b51ef6cf66783986e600a3d7c57840287a398f5d52e45f56bbb4f
+  metadata.gz: 672f61e940c74f7818db5dcfb0b98cf23976a91e4cd7b40aeb20cfdb365f0ce4b591b94829c913fed9235e653bb3e9b454e9412a183e35df9ad5ff7ffa798197
+  data.tar.gz: d3987957ca8e363e66dd909bc2489f94d47be3ba92e8aa2411470d5541390068ccc40d4df3d3cfda89359d5848ff83dbaaa31260a469e679260852a2584d6119

data/.travis.yml

@@ -3,17 +3,20 @@ sudo: false
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
+  - 2.4.0
   - rbx-2
-  - jruby-9.0.4.0
+  - jruby-9.0.5.0
+  - jruby-9.1.2.0
   - ruby-head
   - jruby-head
 matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+    - rvm: rbx-2
   fast_finish: true
 script: bundle exec rspec spec
 notifications:

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 6.8.0
+- Ruby 2.4.0 support
+- Fixed UZS syntax
+- Fixed HUF smallest denomination
+- Fixed ruby 1.9 issues
+- Fixed html entity for COP
+- Updated all currency decimals to ISO-4217
+- Fixed money allocation for negative amounts
+- Fixed symbol_first for RON
+- Fixed disambiguate option when symbol is set to true
+- Fixed thousands separator for CZK
+- Improved formatter performance by precaching I18n calls
+
 ## 6.7.1
 - Changed DKK symbol from 'kr' to 'kr.'
 - Improved Money::Formatting#format docs
@@ -10,6 +23,7 @@
 - `Money#==` will now raise error for non-zero numeric values
 - Fixed divmod
 - Added disambiguation symbol to USD Dollar
+- Use disambiguation symbol when both disambiguate and symbol are true in `format` method
 
 ## 6.7.0
  - Changed `Money#<=>` to return `nil` if the comparison is inappropriate. (#584)

data/Gemfile

@@ -1,7 +1,16 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "coveralls", :require => false
-gem "json", :platform => :jruby
-gem "pry", :require => false
+gem 'coveralls', '>= 0.8.17', :require => false
+gem 'pry', :require => false
+
+# JSON gem no longer supports ruby < 2.0.0
+if defined?(JRUBY_VERSION)
+  gem 'json'
+elsif RUBY_VERSION =~ /^1/
+  # Legacy gem locks for ruby 1.9.x
+  gem 'json',           '~> 1.8.3'
+  gem 'tins',           '~> 1.6.0'
+  gem 'term-ansicolor', '< 1.4'
+end
 
 gemspec

data/LICENSE

@@ -1,3 +1,5 @@
+The MIT License (MIT)
+
 Copyright (c) 2005 Tobias Lutke
 Copyright (c) 2008 Phusion
 

data/README.md

@@ -316,12 +316,12 @@ The following example implements an `ActiveRecord` store to save exchange rates
 
 class ExchangeRate < ActiveRecord::Base
   def self.get_rate(from_iso_code, to_iso_code)
-    rate = find_by_from_and_to(from_iso_code, to_iso_code)
+    rate = find_by(:from => from_iso_code, :to => to_iso_code)
     rate.present? ? rate.rate : nil
   end
 
   def self.add_rate(from_iso_code, to_iso_code, rate)
-    exrate = find_or_initialize_by_from_and_to(from_iso_code, to_iso_code)
+    exrate = find_or_initialize_by(:from => from_iso_code, :to => to_iso_code)
     exrate.rate = rate
     exrate.save!
   end
@@ -376,6 +376,7 @@ implementations.
 - [money-open-exchange-rates](https://github.com/spk/money-open-exchange-rates)
 - [money-historical-bank](https://github.com/atwam/money-historical-bank)
 - [russian_central_bank](https://github.com/rmustafin/russian_central_bank)
+- [money-uphold-bank](https://github.com/subvisual/money-uphold-bank)
 
 ## Ruby on Rails
 

data/config/currency_iso.json

@@ -236,7 +236,7 @@
     "disambiguate_symbol": "FBu",
     "alternate_symbols": ["FBu"],
     "subunit": "Centime",
-    "subunit_to_unit": 100,
+    "subunit_to_unit": 1,
     "symbol_first": false,
     "html_entity": "",
     "decimal_mark": ".",
@@ -501,7 +501,7 @@
     "subunit": "Centavo",
     "subunit_to_unit": 100,
     "symbol_first": true,
-    "html_entity": "₱",
+    "html_entity": "$",
     "decimal_mark": ",",
     "thousands_separator": ".",
     "iso_numeric": "170",
@@ -581,7 +581,7 @@
     "symbol_first": false,
     "html_entity": "",
     "decimal_mark": ",",
-    "thousands_separator": ".",
+    "thousands_separator": " ",
     "iso_numeric": "203",
     "smallest_denomination": 100
   },
@@ -592,7 +592,7 @@
     "symbol": "Fdj",
     "alternate_symbols": [],
     "subunit": "Centime",
-    "subunit_to_unit": 100,
+    "subunit_to_unit": 1,
     "symbol_first": false,
     "html_entity": "",
     "decimal_mark": ".",
@@ -824,7 +824,7 @@
     "disambiguate_symbol": "FG",
     "alternate_symbols": ["FG", "GFr"],
     "subunit": "Centime",
-    "subunit_to_unit": 100,
+    "subunit_to_unit": 1,
     "symbol_first": false,
     "html_entity": "",
     "decimal_mark": ".",
@@ -938,7 +938,7 @@
     "decimal_mark": ",",
     "thousands_separator": ".",
     "iso_numeric": "348",
-    "smallest_denomination": 500
+    "smallest_denomination": 5
   },
   "idr": {
     "priority": 100,
@@ -1007,7 +1007,7 @@
     "symbol": "﷼",
     "alternate_symbols": [],
     "subunit": null,
-    "subunit_to_unit": 1,
+    "subunit_to_unit": 100,
     "symbol_first": true,
     "html_entity": "﷼",
     "decimal_mark": ".",
@@ -1129,7 +1129,7 @@
     "disambiguate_symbol": "CF",
     "alternate_symbols": ["CF"],
     "subunit": "Centime",
-    "subunit_to_unit": 100,
+    "subunit_to_unit": 1,
     "symbol_first": false,
     "html_entity": "",
     "decimal_mark": ".",
@@ -1756,7 +1756,7 @@
     "symbol": "₲",
     "alternate_symbols": [],
     "subunit": "Céntimo",
-    "subunit_to_unit": 100,
+    "subunit_to_unit": 1,
     "symbol_first": true,
     "html_entity": "₲",
     "decimal_mark": ".",
@@ -1787,7 +1787,7 @@
     "alternate_symbols": [],
     "subunit": "Bani",
     "subunit_to_unit": 100,
-    "symbol_first": true,
+    "symbol_first": false,
     "html_entity": "",
     "decimal_mark": ",",
     "thousands_separator": ".",
@@ -1831,7 +1831,7 @@
     "symbol": "FRw",
     "alternate_symbols": ["RF", "R₣"],
     "subunit": "Centime",
-    "subunit_to_unit": 100,
+    "subunit_to_unit": 1,
     "symbol_first": false,
     "html_entity": "",
     "decimal_mark": ".",
@@ -2246,7 +2246,7 @@
     "symbol": "USh",
     "alternate_symbols": [],
     "subunit": "Cent",
-    "subunit_to_unit": 100,
+    "subunit_to_unit": 1,
     "symbol_first": false,
     "html_entity": "",
     "decimal_mark": ".",
@@ -2288,9 +2288,9 @@
   "uzs": {
     "priority": 100,
     "iso_code": "UZS",
-    "name": "Uzbekistani Som",
+    "name": "Uzbekistan Som",
     "symbol": null,
-    "alternate_symbols": [],
+    "alternate_symbols": ["so‘m", "сўм", "сум", "s", "с"],
     "subunit": "Tiyin",
     "subunit_to_unit": 100,
     "symbol_first": false,
@@ -2369,7 +2369,7 @@
     "disambiguate_symbol": "FCFA",
     "alternate_symbols": ["FCFA"],
     "subunit": "Centime",
-    "subunit_to_unit": 100,
+    "subunit_to_unit": 1,
     "symbol_first": false,
     "html_entity": "",
     "decimal_mark": ".",
@@ -2407,6 +2407,66 @@
     "thousands_separator": ",",
     "iso_numeric": "959"
   },
+  "xba": {
+    "priority": 100,
+    "iso_code": "XBA",
+    "name": "European Composite Unit",
+    "symbol": "",
+    "disambiguate_symbol": "XBA",
+    "alternate_symbols": [],
+    "subunit": "",
+    "subunit_to_unit": 1,
+    "symbol_first": false,
+    "html_entity": "",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": "955"
+  },
+  "xbb": {
+    "priority": 100,
+    "iso_code": "XBB",
+    "name": "European Monetary Unit",
+    "symbol": "",
+    "disambiguate_symbol": "XBB",
+    "alternate_symbols": [],
+    "subunit": "",
+    "subunit_to_unit": 1,
+    "symbol_first": false,
+    "html_entity": "",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": "956"
+  },
+  "xbc": {
+    "priority": 100,
+    "iso_code": "XBC",
+    "name": "European Unit of Account 9",
+    "symbol": "",
+    "disambiguate_symbol": "XBC",
+    "alternate_symbols": [],
+    "subunit": "",
+    "subunit_to_unit": 1,
+    "symbol_first": false,
+    "html_entity": "",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": "957"
+  },
+  "xbd": {
+    "priority": 100,
+    "iso_code": "XBD",
+    "name": "European Unit of Account 17",
+    "symbol": "",
+    "disambiguate_symbol": "XBD",
+    "alternate_symbols": [],
+    "subunit": "",
+    "subunit_to_unit": 1,
+    "symbol_first": false,
+    "html_entity": "",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": "958"
+  },
   "xcd": {
     "priority": 100,
     "iso_code": "XCD",
@@ -2445,7 +2505,7 @@
     "disambiguate_symbol": "CFA",
     "alternate_symbols": ["CFA"],
     "subunit": "Centime",
-    "subunit_to_unit": 100,
+    "subunit_to_unit": 1,
     "symbol_first": false,
     "html_entity": "",
     "decimal_mark": ".",
@@ -2453,6 +2513,21 @@
     "iso_numeric": "952",
     "smallest_denomination": 100
   },
+  "xpd": {
+    "priority": 100,
+    "iso_code": "XPD",
+    "name": "Palladium",
+    "symbol": "oz t",
+    "disambiguate_symbol": "XPD",
+    "alternate_symbols": [],
+    "subunit": "oz",
+    "subunit_to_unit": 1,
+    "symbol_first": false,
+    "html_entity": "",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": "964"
+  },
   "xpf": {
     "priority": 100,
     "iso_code": "XPF",
@@ -2460,7 +2535,7 @@
     "symbol": "Fr",
     "alternate_symbols": ["F"],
     "subunit": "Centime",
-    "subunit_to_unit": 100,
+    "subunit_to_unit": 1,
     "symbol_first": false,
     "html_entity": "",
     "decimal_mark": ".",
@@ -2468,6 +2543,36 @@
     "iso_numeric": "953",
     "smallest_denomination": 100
   },
+  "xpt": {
+    "priority": 100,
+    "iso_code": "XPT",
+    "name": "Platinum",
+    "symbol": "oz t",
+    "alternate_symbols": [],
+    "subunit": "",
+    "subunit_to_unit": 1,
+    "symbol_first": false,
+    "html_entity": "",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": "962",
+    "smallest_denomination": ""
+  },
+  "xts": {
+    "priority": 100,
+    "iso_code": "xts",
+    "name": "Codes specifically reserved for testing purposes",
+    "symbol": "",
+    "alternate_symbols": [],
+    "subunit": "",
+    "subunit_to_unit": 1,
+    "symbol_first": false,
+    "html_entity": "",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": "963",
+    "smallest_denomination": ""
+  },
   "yer": {
     "priority": 100,
     "iso_code": "YER",

data/config/currency_non_iso.json

@@ -61,5 +61,21 @@
     "thousands_separator": ",",
     "iso_numeric": "",
     "smallest_denomination": 1
+  },
+  "xfu": {
+    "priority": 100,
+    "iso_code": "XFU",
+    "name": "UIC Franc",
+    "symbol": "",
+    "disambiguate_symbol": "",
+    "alternate_symbols": [],
+    "subunit": "",
+    "subunit_to_unit": 100,
+    "symbol_first": true,
+    "html_entity": "",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": "",
+    "smallest_denomination": ""
   }
 }

data/lib/money/bank/variable_exchange.rb

@@ -45,8 +45,9 @@ class Money
       attr_reader :mutex, :store
 
       # Available formats for importing/exporting rates.
-      RATE_FORMATS = [:json, :ruby, :yaml]
+      RATE_FORMATS = [:json, :ruby, :yaml].freeze
       SERIALIZER_SEPARATOR = '_TO_'.freeze
+      FORMAT_SERIALIZERS = {:json => JSON, :ruby => Marshal, :yaml => YAML}.freeze
 
       # Initializes a new +Money::Bank::VariableExchange+ object.
       # It defaults to using an in-memory, thread safe store instance for
@@ -125,13 +126,13 @@ class Money
       end
 
       def exchange(fractional, rate, &block)
-        ex = (fractional * BigDecimal.new(rate.to_s)).to_f
+        ex = fractional * BigDecimal.new(rate.to_s)
         if block_given?
           yield ex
         elsif @rounding_method
           @rounding_method.call(ex)
         else
-          ex.to_s.to_d
+          ex
         end
       end
 
@@ -216,14 +217,7 @@ class Money
           RATE_FORMATS.include? format
 
         store.transaction do
-          s = case format
-          when :json
-            JSON.dump(rates)
-          when :ruby
-            Marshal.dump(rates)
-          when :yaml
-            YAML.dump(rates)
-          end
+          s = FORMAT_SERIALIZERS[format].dump(rates)
 
           unless file.nil?
             File.open(file, "w") {|f| f.write(s) }
@@ -264,14 +258,7 @@ class Money
           RATE_FORMATS.include? format
 
         store.transaction do
-          data = case format
-           when :json
-             JSON.load(s)
-           when :ruby
-             Marshal.load(s)
-           when :yaml
-             YAML.load(s)
-           end
+          data = FORMAT_SERIALIZERS[format].load(s)
 
           data.each do |key, rate|
             from, to = key.split(SERIALIZER_SEPARATOR)

data/lib/money/currency.rb

@@ -314,10 +314,10 @@ class Money
     end
     private :compare_ids
 
-    # Returns a Fixnum hash value based on the +id+ attribute in order to use
+    # Returns a Integer hash value based on the +id+ attribute in order to use
     # functions like & (intersection), group_by, etc.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     #
     # @example
     #   Money::Currency.new(:usd).hash #=> 428936
@@ -397,7 +397,7 @@ class Money
     # Note that MGA and MRO are exceptions and are rounded to 1
     # @see https://en.wikipedia.org/wiki/ISO_4217#Active_codes
     #
-    # @return [Fixnum]
+    # @return [Integer]
     def exponent
       Math.log10(@subunit_to_unit).round
     end

data/lib/money/money.rb

@@ -117,7 +117,7 @@ class Money
     #   @return [Boolean] Use this to enable infinite precision cents
     #
     # @!attribute [rw] conversion_precision
-    #   @return [Fixnum] Use this to specify precision for converting Rational
+    #   @return [Integer] Use this to specify precision for converting Rational
     #     to BigDecimal
     attr_accessor :default_bank, :default_formatting_rules,
       :use_i18n, :infinite_precision, :conversion_precision
@@ -317,10 +317,10 @@ class Money
     @currency = Currency.wrap(val)
   end
 
-  # Returns a Fixnum hash value based on the +fractional+ and +currency+ attributes
+  # Returns a Integer hash value based on the +fractional+ and +currency+ attributes
   # in order to use functions like & (intersection), group_by, etc.
   #
-  # @return [Fixnum]
+  # @return [Integer]
   #
   # @example
   #   Money.new(100).hash #=> 908351
@@ -496,7 +496,9 @@ class Money
     amounts, left_over = amounts_from_splits(allocations, splits)
 
     unless self.class.infinite_precision
-      left_over.to_i.times { |i| amounts[i % amounts.length] += 1 }
+      delta = left_over > 0 ? 1 : -1
+      # Distribute left over pennies amongst allocations
+      left_over.to_i.abs.times { |i| amounts[i % amounts.length] += delta }
     end
 
     amounts.collect { |fractional| self.class.new(fractional, currency) }
@@ -549,7 +551,7 @@ class Money
     if num.respond_to?(:to_d)
       num.is_a?(Rational) ? num.to_d(self.class.conversion_precision) : num.to_d
     else
-      BigDecimal.new(num.to_s)
+      BigDecimal.new(num.to_s.empty? ? 0 : num.to_s)
     end
   end
 
@@ -592,7 +594,7 @@ class Money
       if self.class.infinite_precision
         fractional * ratio
       else
-        (fractional * ratio / allocations).floor.tap do |frac|
+        (fractional * ratio / allocations).truncate.tap do |frac|
           left_over -= frac
         end
       end

data/lib/money/money/arithmetic.rb

@@ -48,16 +48,16 @@ class Money
     #
     # @param [Money] other_money Value to compare with.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     #
     # @raise [TypeError] when other object is not Money
     #
     def <=>(other)
-      if other.respond_to?(:zero?) && other.zero?
+      unless other.is_a?(Money)
+        return unless other.respond_to?(:zero?) && other.zero?
         return other.is_a?(CoercedNumeric) ? 0 <=> fractional : fractional <=> 0
       end
-      return unless other.is_a?(Money)
-      other = other.exchange_to(currency) if nonzero? && currency != other.currency
+      other = other.exchange_to(currency)
       fractional <=> other.fractional
     rescue Money::Bank::UnknownRate
     end
@@ -97,6 +97,7 @@ class Money
       fractional < 0
     end
 
+    # @method +(other)
     # Returns a new Money object containing the sum of the two operands' monetary
     # values. If +other_money+ has a different currency then its monetary value
     # is automatically exchanged to this object's currency using +exchange_to+.
@@ -107,13 +108,8 @@ class Money
     #
     # @example
     #   Money.new(100) + Money.new(100) #=> #<Money @fractional=200>
-    def +(other_money)
-      return self if other_money.zero?
-      raise TypeError unless other_money.is_a?(Money)
-      other_money = other_money.exchange_to(currency)
-      self.class.new(fractional + other_money.fractional, currency)
-    end
-
+    #
+    # @method -(other)
     # Returns a new Money object containing the difference between the two
     # operands' monetary values. If +other_money+ has a different currency then
     # its monetary value is automatically exchanged to this object's currency
@@ -125,11 +121,15 @@ class Money
     #
     # @example
     #   Money.new(100) - Money.new(99) #=> #<Money @fractional=1>
-    def -(other_money)
-      return self if other_money.zero?
-      raise TypeError unless other_money.is_a?(Money)
-      other_money = other_money.exchange_to(currency)
-      self.class.new(fractional - other_money.fractional, currency)
+    [:+, :-].each do |op|
+      define_method(op) do |other|
+        unless other.is_a?(Money)
+          return self if other.zero?
+          raise TypeError
+        end
+        other = other.exchange_to(currency)
+        self.class.new(fractional.public_send(op, other.fractional), currency)
+      end
     end
 
     # Multiplies the monetary value with the given number and returns a new
@@ -195,9 +195,9 @@ class Money
     # Divide money by money or fixnum and return array containing quotient and
     # modulus.
     #
-    # @param [Money, Fixnum] val Number to divmod by.
+    # @param [Money, Integer] val Number to divmod by.
     #
-    # @return [Array<Money,Money>,Array<Fixnum,Money>]
+    # @return [Array<Money,Money>,Array<Integer,Money>]
     #
     # @example
     #   Money.new(100).divmod(9)            #=> [#<Money @fractional=11>, #<Money @fractional=1>]
@@ -225,7 +225,7 @@ class Money
 
     # Equivalent to +self.divmod(val)[1]+
     #
-    # @param [Money, Fixnum] val Number take modulo with.
+    # @param [Money, Integer] val Number take modulo with.
     #
     # @return [Money]
     #
@@ -238,7 +238,7 @@ class Money
 
     # Synonym for +#modulo+.
     #
-    # @param [Money, Fixnum] val Number take modulo with.
+    # @param [Money, Integer] val Number take modulo with.
     #
     # @return [Money]
     #
@@ -249,7 +249,7 @@ class Money
 
     # If different signs +self.modulo(val) - val+ otherwise +self.modulo(val)+
     #
-    # @param [Money, Fixnum] val Number to rake remainder with.
+    # @param [Money, Integer] val Number to rake remainder with.
     #
     # @return [Money]
     #

data/lib/money/money/constructors.rb

@@ -10,8 +10,7 @@ class Money
     # @example
     #   Money.empty #=> #<Money @fractional=0>
     def empty(currency = default_currency)
-      @empty ||= {}
-      @empty[currency] ||= new(0, currency).freeze
+      new(0, currency)
     end
     alias_method :zero, :empty
 

data/lib/money/money/formatting.rb

@@ -288,11 +288,11 @@ class Money
     end
 
     def thousands_separator
-      i18n_format_for(:thousands_separator, :delimiter, ",")
+      @thousands_separator ||= i18n_format_for(:thousands_separator, :delimiter, ",")
     end
 
     def decimal_mark
-      i18n_format_for(:decimal_mark, :separator, ".")
+      @decimal_mark ||= i18n_format_for(:decimal_mark, :separator, ".")
     end
 
     alias_method :delimiter, :thousands_separator
@@ -387,7 +387,11 @@ class Money
   def symbol_value_from(rules)
     if rules.has_key?(:symbol)
       if rules[:symbol] === true
-        symbol
+        if rules[:disambiguate] && currency.disambiguate_symbol
+          currency.disambiguate_symbol
+        else
+          symbol
+        end
       elsif rules[:symbol]
         rules[:symbol]
       else
@@ -395,7 +399,7 @@ class Money
       end
     elsif rules[:html]
       currency.html_entity == '' ? currency.symbol : currency.html_entity
-    elsif rules[:disambiguate] and currency.disambiguate_symbol
+    elsif rules[:disambiguate] && currency.disambiguate_symbol
       currency.disambiguate_symbol
     else
       symbol

data/lib/money/version.rb

@@ -1,3 +1,3 @@
 class Money
-  VERSION = "6.7.1"
+  VERSION = "6.8.0"
 end

data/money.gemspec

@@ -14,17 +14,6 @@ Gem::Specification.new do |s|
   s.description = "A Ruby Library for dealing with money and currency conversion."
   s.license     = "MIT"
 
-  s.post_install_message = <<MSG
-Please note the following API changes in Money version 6
-
- - Money#amount, Money#dollars methods now return instances of BigDecimal (rather than Float).
-
-Please read the migration notes at https://github.com/RubyMoney/money#migration-notes
-and choose the migration that best suits your application.
-
-Test responsibly :-)
-MSG
-
   s.add_dependency 'i18n', ['>= 0.6.4', '<= 0.7.0']
   s.add_dependency 'sixarm_ruby_unaccent', ['>= 1.1.1', '< 2']
 

data/spec/bank/variable_exchange_spec.rb

@@ -75,6 +75,10 @@ class Money
               special_money_class = Class.new(Money)
               expect(bank.exchange_with(special_money_class.new(100, 'USD'), 'EUR')).to be_a special_money_class
             end
+
+            it "doesn't loose precision when handling larger amounts" do
+              expect(bank.exchange_with(Money.new(100_000_000_000_000_01, 'USD'), 'EUR')).to eq Money.new(133_000_000_000_000_01, 'EUR')
+            end
           end
         end
 

data/spec/money/arithmetic_spec.rb

@@ -23,6 +23,7 @@ describe Money do
     end
 
     it "returns true if both amounts are zero, even if currency differs" do
+      allow_any_instance_of(Money).to receive(:exchange_to) { Money.usd(0) }
       expect(Money.new(0, "USD")).to eq Money.new(0, "USD")
       expect(Money.new(0, "USD")).to eq Money.new(0, "EUR")
       expect(Money.new(0, "USD")).to eq Money.new(0, "AUD")
@@ -175,7 +176,7 @@ describe Money do
       expect(Money.new(10_00, "USD") + other).to eq Money.new(19_00, "USD")
     end
 
-    it "adds Fixnum 0 to money and returns the same ammount" do
+    it "adds Integer 0 to money and returns the same ammount" do
       expect(Money.new(10_00) + 0).to eq Money.new(10_00)
     end
 
@@ -196,7 +197,7 @@ describe Money do
       expect(Money.new(10_00, "USD") - other).to eq Money.new(1_00, "USD")
     end
 
-    it "subtract Fixnum 0 to money and returns the same ammount" do
+    it "subtract Integer 0 to money and returns the same ammount" do
       expect(Money.new(10_00) - 0).to eq Money.new(10_00)
     end
 
@@ -207,7 +208,7 @@ describe Money do
   end
 
   describe "#*" do
-    it "multiplies Money by Fixnum and returns Money" do
+    it "multiplies Money by Integer and returns Money" do
       ts = [
         {:a => Money.new( 10, :USD), :b =>  4, :c => Money.new( 40, :USD)},
         {:a => Money.new( 10, :USD), :b => -4, :c => Money.new(-40, :USD)},
@@ -238,7 +239,7 @@ describe Money do
   end
 
   describe "#/" do
-    it "divides Money by Fixnum and returns Money" do
+    it "divides Money by Integer and returns Money" do
       ts = [
         {:a => Money.new( 13, :USD), :b =>  4, :c => Money.new( 3, :USD)},
         {:a => Money.new( 13, :USD), :b => -4, :c => Money.new(-3, :USD)},
@@ -334,7 +335,7 @@ describe Money do
   end
 
   describe "#div" do
-    it "divides Money by Fixnum and returns Money" do
+    it "divides Money by Integer and returns Money" do
       ts = [
           {:a => Money.new( 13, :USD), :b =>  4, :c => Money.new( 3, :USD)},
           {:a => Money.new( 13, :USD), :b => -4, :c => Money.new(-3, :USD)},
@@ -387,7 +388,7 @@ describe Money do
   end
 
   describe "#divmod" do
-    it "calculates division and modulo with Fixnum" do
+    it "calculates division and modulo with Integer" do
       ts = [
           {:a => Money.new( 13, :USD), :b =>  4, :c => [Money.new( 3, :USD), Money.new( 1, :USD)]},
           {:a => Money.new( 13, :USD), :b => -4, :c => [Money.new(-4, :USD), Money.new(-3, :USD)]},
@@ -450,7 +451,7 @@ describe Money do
   end
 
   describe "#modulo" do
-    it "calculates modulo with Fixnum" do
+    it "calculates modulo with Integer" do
       ts = [
           {:a => Money.new( 13, :USD), :b =>  4, :c => Money.new( 1, :USD)},
           {:a => Money.new( 13, :USD), :b => -4, :c => Money.new(-3, :USD)},
@@ -489,7 +490,7 @@ describe Money do
   end
 
   describe "#%" do
-    it "calculates modulo with Fixnum" do
+    it "calculates modulo with Integer" do
       ts = [
           {:a => Money.new( 13, :USD), :b =>  4, :c => Money.new( 1, :USD)},
           {:a => Money.new( 13, :USD), :b => -4, :c => Money.new(-3, :USD)},
@@ -528,7 +529,7 @@ describe Money do
   end
 
   describe "#remainder" do
-    it "calculates remainder with Fixnum" do
+    it "calculates remainder with Integer" do
       ts = [
           {:a => Money.new( 13, :USD), :b =>  4, :c => Money.new( 1, :USD)},
           {:a => Money.new( 13, :USD), :b => -4, :c => Money.new( 1, :USD)},
@@ -659,4 +660,34 @@ describe Money do
       }.to raise_exception(TypeError)
     end
   end
+
+  %w(+ - / <=> divmod remainder).each do |op|
+    describe "##{op}" do
+      subject { ->(other = self.other) { instance.send(op, other) } }
+      let(:instance) { Money.usd(1) }
+
+      context 'when conversions disallowed' do
+        around do |ex|
+          begin
+            old = Money.default_bank
+            Money.disallow_currency_conversion!
+            ex.run
+          ensure
+            Money.default_bank = old
+          end
+        end
+
+        context 'and other is money with different currency' do
+          let(:other) { Money.gbp(1) }
+          it { should raise_error Money::Bank::DifferentCurrencyError }
+
+          context 'even for zero' do
+            let(:instance) { Money.usd(0) }
+            let(:other) { Money.gbp(0) }
+            it { should raise_error Money::Bank::DifferentCurrencyError }
+          end
+        end
+      end
+    end
+  end
 end

data/spec/money/constructors_spec.rb

@@ -7,18 +7,6 @@ describe Money::Constructors do
       expect(Money.empty).to eq Money.new(0)
     end
 
-    it "memoizes the result" do
-      expect(Money.empty.object_id).to eq Money.empty.object_id
-    end
-
-    it "memoizes a result for each currency" do
-      expect(Money.empty(:cad).object_id).to eq Money.empty(:cad).object_id
-    end
-
-    it "doesn't allow money to be modified for a currency" do
-      expect(Money.empty).to be_frozen
-    end
-
     it "instantiates a subclass when inheritance is used" do
       special_money_class = Class.new(Money)
       expect(special_money_class.empty).to be_a special_money_class

data/spec/money/formatting_spec.rb

@@ -707,6 +707,22 @@ describe Money, "formatting" do
       expect(Money.new(1999_98, "SEK").format(disambiguate: true)).to eq("1 999,98 SEK")
     end
 
+    it "returns disambiguate signs when disambiguate: true and symbol: true" do
+      expect(Money.new(1999_98, "USD").format(disambiguate: true, symbol: true)).to eq("US$1,999.98")
+      expect(Money.new(1999_98, "CAD").format(disambiguate: true, symbol: true)).to eq("C$1,999.98")
+      expect(Money.new(1999_98, "DKK").format(disambiguate: true, symbol: true)).to eq("1.999,98 DKK")
+      expect(Money.new(1999_98, "NOK").format(disambiguate: true, symbol: true)).to eq("1.999,98 NOK")
+      expect(Money.new(1999_98, "SEK").format(disambiguate: true, symbol: true)).to eq("1 999,98 SEK")
+    end
+
+    it "returns no signs when disambiguate: true and symbol: false" do
+      expect(Money.new(1999_98, "USD").format(disambiguate: true, symbol: false)).to eq("1,999.98")
+      expect(Money.new(1999_98, "CAD").format(disambiguate: true, symbol: false)).to eq("1,999.98")
+      expect(Money.new(1999_98, "DKK").format(disambiguate: true, symbol: false)).to eq("1.999,98")
+      expect(Money.new(1999_98, "NOK").format(disambiguate: true, symbol: false)).to eq("1.999,98")
+      expect(Money.new(1999_98, "SEK").format(disambiguate: true, symbol: false)).to eq("1 999,98")
+    end
+
     it "should never return an ambiguous format with disambiguate: true" do
       formatted_results = {}
 

data/spec/money_spec.rb

@@ -191,7 +191,7 @@ describe Money do
     it "stores fractional as an integer regardless of what is passed into the constructor" do
       m = Money.new(100)
       expect(m.fractional).to eq 100
-      expect(m.fractional).to be_a(Fixnum)
+      expect(m.fractional).to be_a(Integer)
     end
 
     context "loading a serialized Money via YAML" do
@@ -349,9 +349,9 @@ YAML
       expect {money.round_to_nearest_cash_value}.to raise_error(Money::UndefinedSmallestDenomination)
     end
 
-    it "returns a Fixnum when infinite_precision is not set" do
+    it "returns a Integer when infinite_precision is not set" do
       money = Money.new(100, "USD")
-      expect(money.round_to_nearest_cash_value).to be_a Fixnum
+      expect(money.round_to_nearest_cash_value).to be_a Integer
     end
 
     it "returns a BigDecimal when infinite_precision is set", :infinite_precision do
@@ -408,12 +408,16 @@ YAML
   end
 
   describe "#currency_as_string=" do
-    it "sets the currency object using the provided string" do
+    it "sets the currency object using the provided string leaving cents intact" do
       money = Money.new(100_00, "USD")
+
       money.currency_as_string = "EUR"
       expect(money.currency).to eq Money::Currency.new("EUR")
+      expect(money.cents).to eq 100_00
+
       money.currency_as_string = "YEN"
       expect(money.currency).to eq Money::Currency.new("YEN")
+      expect(money.cents).to eq 100_00
     end
   end
 
@@ -584,6 +588,23 @@ YAML
       expect(moneys[2].cents).to eq 33
     end
 
+    context "negative amount" do
+      it "does not lose pennies" do
+        moneys = Money.us_dollar(-100).allocate([0.333, 0.333, 0.333])
+
+        expect(moneys[0].cents).to eq -34
+        expect(moneys[1].cents).to eq -33
+        expect(moneys[2].cents).to eq -33
+      end
+
+      it "allocates the same way as positive amounts" do
+        ratios = [0.6667, 0.3333]
+
+        expect(Money.us_dollar(10_00).allocate(ratios).map(&:fractional)).to eq([6_67, 3_33])
+        expect(Money.us_dollar(-10_00).allocate(ratios).map(&:fractional)).to eq([-6_67, -3_33])
+      end
+    end
+
     it "requires total to be less then 1" do
       expect { Money.us_dollar(0.05).allocate([0.5, 0.6]) }.to raise_error(ArgumentError)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.7.1
+  version: 6.8.0
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-08 00:00:00.000000000 Z
+date: 2017-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -171,15 +171,7 @@ homepage: http://rubymoney.github.io/money
 licenses:
 - MIT
 metadata: {}
-post_install_message: |
-  Please note the following API changes in Money version 6
-
-   - Money#amount, Money#dollars methods now return instances of BigDecimal (rather than Float).
-
-  Please read the migration notes at https://github.com/RubyMoney/money#migration-notes
-  and choose the migration that best suits your application.
-
-  Test responsibly :-)
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib