money 6.7.0 → 6.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cffd9f173701f8599fae9244a9de6b4aef0a95f
-  data.tar.gz: 30080c0c9743507a615598ab80c8235d7313f769
+  metadata.gz: cf8496911c1ac6ef2fdb34ad3e0b9f458bf6e836
+  data.tar.gz: 70ed919de03069d7a92883d46b890d60194eae1a
 SHA512:
-  metadata.gz: 60307b13ad66a684ff833d58441093b58eb7730ccb108b6804a68f935a91dcc0921153e7c2ce0c8543af0851239b4c7289dcc23f71c60361e875d0e71f5f26fb
-  data.tar.gz: b435062afea1d2a798502354347b757dc5c4f84a835449d39d411c9ea6400e52fa99eeeded5322a92e00b0956d41d9d3003134b25f49c72b18b4fa1f195acf01
+  metadata.gz: dabd711f4ba2737ee735c8e29569b56d0650686802fd56e27d0df34afd26865bfd11630deacb64cb74d22c7b97a25fd8a4bfa49ed3dcfa5195b8bf324edd2a53
+  data.tar.gz: 03e66b3f5639b64baf44082e075e6c2e275ce8bd9911cb0e1152ccf4449d840043b9a233a81b51ef6cf66783986e600a3d7c57840287a398f5d52e45f56bbb4f

data/.travis.yml

@@ -7,6 +7,14 @@ rvm:
   - 2.2.4
   - 2.3.0
   - rbx-2
+  - jruby-9.0.4.0
+  - ruby-head
+  - jruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+  fast_finish: true
 script: bundle exec rspec spec
 notifications:
   email:

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 6.7.1
+- Changed DKK symbol from 'kr' to 'kr.'
+- Improved Money::Formatting#format docs
+- Updated VEF symbol from 'Bs F' to 'Bs'
+- `Currency#exponent` now returns Fixnum
+- Fixed coercion issues
+- Fixed edge case with explicit override of thousands separator and decimal mark
+- `Money#==` will now raise error for non-zero numeric values
+- Fixed divmod
+- Added disambiguation symbol to USD Dollar
+
 ## 6.7.0
  - Changed `Money#<=>` to return `nil` if the comparison is inappropriate. (#584)
  - Remove implicit conversion of values being compared. Only accept `Money` and

data/README.md

@@ -28,7 +28,7 @@ A Ruby Library for dealing with money and currency conversion.
   a monetary unit.
 - Represents monetary values as integers, in cents. This avoids floating point
   rounding errors.
-- Represents currency as `Money::Currency` instances providing an high level of
+- Represents currency as `Money::Currency` instances providing a high level of
   flexibility.
 - Provides APIs for exchanging money from one currency to another.
 
@@ -203,12 +203,12 @@ If you use Rails, then `environment.rb` is a very good place to put this.
 The exponent of a money value is the number of digits after the decimal
 separator (which separates the major unit from the minor unit). See e.g.
 [ISO 4217](http://www.currency-iso.org/en/shared/amendments/iso-4217-amendment.html) for more
-information.  You can find the exponent (as a `Float`) by
+information.  You can find the exponent (as an `Integer`) by
 
 ``` ruby
-Money::Currency.new("USD").exponent  # => 2.0
-Money::Currency.new("JPY").exponent  # => 0.0
-Money::Currency.new("MGA").exponent  # => 0.6989700043360189
+Money::Currency.new("USD").exponent  # => 2
+Money::Currency.new("JPY").exponent  # => 0
+Money::Currency.new("MGA").exponent  # => 1
 ```
 
 ### Currency Lookup
@@ -369,7 +369,7 @@ implementations.
 
 - [eu_central_bank](https://github.com/RubyMoney/eu_central_bank)
 - [google_currency](https://github.com/RubyMoney/google_currency)
-- [money-json-rates](https://github.com/askuratovsky/money-json-rates)
+- [currencylayer](https://github.com/askuratovsky/currencylayer)
 - [nordea](https://github.com/matiaskorhonen/nordea)
 - [nbrb_currency](https://github.com/slbug/nbrb_currency)
 - [money-currencylayer-bank](https://github.com/phlegx/money-currencylayer-bank)

data/config/currency_iso.json

@@ -604,7 +604,7 @@
     "priority": 100,
     "iso_code": "DKK",
     "name": "Danish Krone",
-    "symbol": "kr",
+    "symbol": "kr.",
     "disambiguate_symbol": "DKK",
     "alternate_symbols": [",-"],
     "subunit": "Øre",
@@ -2259,6 +2259,7 @@
     "iso_code": "USD",
     "name": "United States Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "US$",
     "alternate_symbols": ["US$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -2303,8 +2304,8 @@
     "priority": 100,
     "iso_code": "VEF",
     "name": "Venezuelan Bolívar",
-    "symbol": "Bs F",
-    "alternate_symbols": ["Bs.F", "Bs"],
+    "symbol": "Bs",
+    "alternate_symbols": ["Bs.F"],
     "subunit": "Céntimo",
     "subunit_to_unit": 100,
     "symbol_first": true,

data/lib/money/currency.rb

@@ -374,7 +374,7 @@ class Money
       id.to_s.upcase.to_sym
     end
 
-    # Conversation to +self+.
+    # Conversion to +self+.
     #
     # @return [self]
     def to_currency
@@ -392,14 +392,17 @@ class Money
       !!@symbol_first
     end
 
-    # Returns the number of digits after the decimal separator.
+    # Returns the relation between subunit and unit as a base 10 exponent.
     #
-    # @return [Float]
+    # Note that MGA and MRO are exceptions and are rounded to 1
+    # @see https://en.wikipedia.org/wiki/ISO_4217#Active_codes
+    #
+    # @return [Fixnum]
     def exponent
-      Math.log10(@subunit_to_unit)
+      Math.log10(@subunit_to_unit).round
     end
 
-    # Cache decimal places for subunit_to_unit values.  Common ones pre-cached.
+    # Cache decimal places for subunit_to_unit values. Common ones pre-cached.
     def self.decimal_places_cache
       @decimal_places_cache ||= {1 => 0, 10 => 1, 100 => 2, 1000 => 3}
     end

data/lib/money/money.rb

@@ -15,7 +15,9 @@ require "money/money/formatting"
 #
 # @see http://en.wikipedia.org/wiki/Money
 class Money
-  include Comparable, Money::Arithmetic, Money::Formatting
+  include Comparable
+  include Money::Arithmetic
+  include Money::Formatting
   extend Constructors
 
   # Raised when smallest denomination of a currency is not defined
@@ -34,17 +36,17 @@ class Money
   # The value of the monetary amount represented in the fractional or subunit
   # of the currency.
   #
-  # For example, in the US Dollar currency the fractional unit is cents, and
-  # there are 100 cents in one US Dollar. So given the Money representation of
+  # For example, in the US dollar currency the fractional unit is cents, and
+  # there are 100 cents in one US dollar. So given the Money representation of
   # one US dollar, the fractional interpretation is 100.
   #
-  # Another example is that of the Kuwaiti Dinar. In this case the fractional
-  # unit is the Fils and there 1000 Fils to one Kuwaiti Dinar. So given the
-  # Money representation of one Kuwaiti Dinar, the fractional interpretation is
+  # Another example is that of the Kuwaiti dinar. In this case the fractional
+  # unit is the fils and there 1000 fils to one Kuwaiti dinar. So given the
+  # Money representation of one Kuwaiti dinar, the fractional interpretation is
   # 1000.
   #
   # @return [Integer] when infinite_precision is false
-  # @return [BigDecimal] when infintie_precision is true
+  # @return [BigDecimal] when infinite_precision is true
   #
   # @see infinite_precision
   def fractional
@@ -56,7 +58,7 @@ class Money
   end
 
   # Round a given amount of money to the nearest possible amount in cash value. For
-  # example, in Swiss francs (CHF), the smallest possible amount of cash value is
+  # example, in Swiss franc (CHF), the smallest possible amount of cash value is
   # CHF 0.05. Therefore, this method rounds CHF 0.07 to CHF 0.05, and CHF 0.08 to
   # CHF 0.10.
   #
@@ -78,7 +80,7 @@ class Money
 
   # @!attribute [r] currency
   #   @return [Currency] The money's currency.
-  # @!attribute [r] bank 
+  # @!attribute [r] bank
   #   @return [Money::Bank::Base] The +Money::Bank+-based object which currency
   #     exchanges are performed with.
 
@@ -95,7 +97,7 @@ class Money
     #     one to specify custom exchange rates.
     #
     # @!attribute default_formatting_rules
-    #   @return [Hash] Use this to define a default hash of rules for everytime
+    #   @return [Hash] Use this to define a default hash of rules for every time
     #     +Money#format+ is called.  Rules provided on method call will be
     #     merged with the default ones.  To overwrite a rule, just provide the
     #     intended value while calling +format+.
@@ -166,7 +168,7 @@ class Money
   setup_defaults
 
   # Use this to return the rounding mode.  You may also pass a
-  # rounding mode and a block to temporatly change it.  It will
+  # rounding mode and a block to temporarily change it.  It will
   # then return the results of the block instead.
   #
   # @param [BigDecimal::ROUND_MODE] mode
@@ -436,7 +438,7 @@ class Money
   end
 
   # Receive a money object with the same amount as the current Money object
-  # in american dollars.
+  # in United States dollar.
   #
   # @return [Money]
   #
@@ -448,7 +450,7 @@ class Money
   end
 
   # Receive a money object with the same amount as the current Money object
-  # in canadian dollar.
+  # in Canadian dollar.
   #
   # @return [Money]
   #

data/lib/money/money/arithmetic.rb

@@ -1,18 +1,13 @@
 class Money
-  CoercedNumber = Struct.new(:value) do
-    include Comparable
-
-    def +(other) raise TypeError; end
-    def -(other) raise TypeError; end
-    def /(other) raise TypeError; end
-    def <=>(other) raise TypeError; end
-
-    def *(other)
-      other * value
-    end
-  end
-
   module Arithmetic
+    # Wrapper for coerced numeric values to distinguish
+    # when numeric was on the 1st place in operation.
+    CoercedNumeric = Struct.new(:value) do
+      # Proxy #zero? method to skip unnecessary typecasts. See #- and #+.
+      def zero?
+        value.zero?
+      end
+    end
 
     # Returns a money object with changed polarity.
     #
@@ -57,14 +52,23 @@ class Money
     #
     # @raise [TypeError] when other object is not Money
     #
-    def <=>(other_money)
-      return nil unless other_money.is_a?(Money)
-      if fractional != 0 && other_money.fractional != 0 && currency != other_money.currency
-        other_money = other_money.exchange_to(currency)
+    def <=>(other)
+      if other.respond_to?(:zero?) && other.zero?
+        return other.is_a?(CoercedNumeric) ? 0 <=> fractional : fractional <=> 0
       end
-      fractional <=> other_money.fractional
+      return unless other.is_a?(Money)
+      other = other.exchange_to(currency) if nonzero? && currency != other.currency
+      fractional <=> other.fractional
     rescue Money::Bank::UnknownRate
-      nil
+    end
+
+    # Uses Comparable's implementation but raises ArgumentError if non-zero
+    # numeric value is given.
+    def ==(other)
+      if other.is_a?(Numeric) && !other.zero?
+        raise ArgumentError, 'Money#== supports only zero numerics'
+      end
+      super
     end
 
     # Test if the amount is positive. Returns +true+ if the money amount is
@@ -137,16 +141,17 @@ class Money
     #
     # @return [Money] The resulting money.
     #
-    # @raise [ArgumentError] If +value+ is NOT a number.
+    # @raise [TypeError] If +value+ is NOT a number.
     #
     # @example
     #   Money.new(100) * 2 #=> #<Money @fractional=200>
     #
     def *(value)
+      value = value.value if value.is_a?(CoercedNumeric)
       if value.is_a? Numeric
         self.class.new(fractional * value, currency)
       else
-        raise ArgumentError, "Can't multiply a #{self.class.name} by a #{value.class.name}'s value"
+        raise TypeError, "Can't multiply a #{self.class.name} by a #{value.class.name}'s value"
       end
     end
 
@@ -169,6 +174,7 @@ class Money
       if value.is_a?(self.class)
         fractional / as_d(value.exchange_to(currency).fractional).to_f
       else
+        raise TypeError, 'Can not divide by Money' if value.is_a?(CoercedNumeric)
         self.class.new(fractional / as_d(value), currency)
       end
     end
@@ -212,12 +218,8 @@ class Money
     private :divmod_money
 
     def divmod_other(val)
-      if self.class.infinite_precision
-        quotient, remainder = fractional.divmod(as_d(val))
-        [self.class.new(quotient, currency), self.class.new(remainder, currency)]
-      else
-        [div(val), self.class.new(fractional.modulo(val), currency)]
-      end
+      quotient, remainder = fractional.divmod(as_d(val))
+      [self.class.new(quotient, currency), self.class.new(remainder, currency)]
     end
     private :divmod_other
 
@@ -304,7 +306,7 @@ class Money
     # @example
     #   2 * Money.new(10) #=> #<Money @fractional=20>
     def coerce(other)
-      [CoercedNumber.new(other), self]
+      [self, CoercedNumeric.new(other)]
     end
   end
 end

data/lib/money/money/formatting.rb

@@ -7,7 +7,7 @@ class Money
     #
     # @return [String]
     #
-    # @option *rules [Boolean, String] :display_free (false) Whether a zero
+    # @option rules [Boolean, String] :display_free (false) Whether a zero
     #  amount of money should be formatted of "free" or as the supplied string.
     #
     # @example
@@ -15,7 +15,7 @@ class Money
     #   Money.us_dollar(0).format(:display_free => "gratis") #=> "gratis"
     #   Money.us_dollar(0).format                            #=> "$0.00"
     #
-    # @option *rules [Boolean] :with_currency (false) Whether the currency name
+    # @option rules [Boolean] :with_currency (false) Whether the currency name
     #  should be appended to the result string.
     #
     # @example
@@ -23,28 +23,28 @@ class Money
     #   Money.ca_dollar(100).format(:with_currency => true) #=> "$1.00 CAD"
     #   Money.us_dollar(85).format(:with_currency => true)  #=> "$0.85 USD"
     #
-    # @option *rules [Boolean] :rounded_infinite_precision (false) Whether the
-    #  amount of money should be rounded when using infinite_precision
+    # @option rules [Boolean] :rounded_infinite_precision (false) Whether the
+    #  amount of money should be rounded when using {infinite_precision}
     #
     # @example
     #   Money.us_dollar(100.1).format #=> "$1.001"
     #   Money.us_dollar(100.1).format(:rounded_infinite_precision => true) #=> "$1"
     #   Money.us_dollar(100.9).format(:rounded_infinite_precision => true) #=> "$1.01"
     #
-    # @option *rules [Boolean] :no_cents (false) Whether cents should be omitted.
+    # @option rules [Boolean] :no_cents (false) Whether cents should be omitted.
     #
     # @example
     #   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
     #   Money.ca_dollar(10000).format(:no_cents_if_whole => true) #=> "$100"
     #   Money.ca_dollar(10034).format(:no_cents_if_whole => true) #=> "$100.34"
     #
-    # @option *rules [Boolean, String, nil] :symbol (true) Whether a money symbol
+    # @option rules [Boolean, String, nil] :symbol (true) Whether a money symbol
     #  should be prepended to the result string. The default is true. This method
     #  attempts to pick a symbol that's suitable for the given currency.
     #
@@ -75,10 +75,10 @@ class Money
     #   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, nil] :symbol_before_without_space (true) Whether
-    # a space between the money symbol and the amount should be inserted when
-    # +:symbol_position+ is +:before+. The default is true (meaning no space). Ignored
-    # if +:symbol+ is false or +:symbol_position+ is not +:before+.
+    # @option rules [Boolean, nil] :symbol_before_without_space (true) Whether
+    #   a space between the money symbol and the amount should be inserted when
+    #   +:symbol_position+ is +:before+. The default is true (meaning no space). Ignored
+    #   if +:symbol+ is false or +:symbol_position+ is not +:before+.
     #
     # @example
     #   # Default is to not insert a space.
@@ -90,10 +90,10 @@ class Money
     #   # If set to false, will insert a space.
     #   Money.new(100, "USD").format(:symbol_before_without_space => false) #=> "$ 1.00"
     #
-    # @option *rules [Boolean, nil] :symbol_after_without_space (false) Whether
-    # a space between the the amount and the money symbol should be inserted when
-    # +:symbol_position+ is +:after+. The default is false (meaning space). Ignored
-    # if +:symbol+ is false or +:symbol_position+ is not +:after+.
+    # @option rules [Boolean, nil] :symbol_after_without_space (false) Whether
+    #   a space between the amount and the money symbol should be inserted when
+    #   +:symbol_position+ is +:after+. The default is false (meaning space). Ignored
+    #   if +:symbol+ is false or +:symbol_position+ is not +:after+.
     #
     # @example
     #   # Default is to insert a space.
@@ -102,7 +102,7 @@ class Money
     #   # If set to true, will not insert a space.
     #   Money.new(100, "USD").format(:symbol_position => :after, :symbol_after_without_space => true) #=> "1.00$"
     #
-    # @option *rules [Boolean, String, nil] :decimal_mark (true) Whether the
+    # @option rules [Boolean, String, nil] :decimal_mark (true) Whether the
     #  currency should be separated by the specified character or '.'
     #
     # @example
@@ -113,7 +113,7 @@ class Money
     #   # to "." as decimal_mark.
     #   Money.new(100, "FOO").format #=> "$1.00"
     #
-    # @option *rules [Boolean, String, nil] :thousands_separator (true) Whether
+    # @option rules [Boolean, String, nil] :thousands_separator (true) Whether
     #  the currency should be delimited by the specified character or ','
     #
     # @example
@@ -129,14 +129,14 @@ class Money
     #   # default to "," as thousands_separator.
     #   Money.new(100000, "FOO").format #=> "$1,000.00"
     #
-    # @option *rules [Boolean] :html (false) Whether the currency should be
+    # @option rules [Boolean] :html (false) Whether the currency should be
     #  HTML-formatted. Only useful in combination with +:with_currency+.
     #
     # @example
-    #   s = Money.ca_dollar(570).format(:html => true, :with_currency => true)
-    #   s #=>  "$5.70 <span class=\"currency\">CAD</span>"
+    #   Money.ca_dollar(570).format(:html => true, :with_currency => true)
+    #   #=> "$5.70 <span class=\"currency\">CAD</span>"
     #
-    # @option *rules [Boolean] :sign_before_symbol (false) Whether the sign should be
+    # @option rules [Boolean] :sign_before_symbol (false) Whether the sign should be
     #  before the currency symbol.
     #
     # @example
@@ -145,7 +145,7 @@ class Money
     #   Money.new(-100, "GBP").format(:sign_before_symbol => false) #=> "£-1.00"
     #   Money.new(-100, "GBP").format                               #=> "£-1.00"
     #
-    # @option *rules [Boolean] :sign_positive (false) Whether positive numbers should be
+    # @option rules [Boolean] :sign_positive (false) Whether positive numbers should be
     #  signed, too.
     #
     # @example
@@ -156,7 +156,7 @@ class Money
     #   Money.new(100, "GBP").format(:sign_positive => false, :sign_before_symbol => false) #=> "£1.00"
     #   Money.new(100, "GBP").format                               #=> "£+1.00"
     #
-    # @option *rules [Boolean] :disambiguate (false) Prevents the result from being ambiguous
+    # @option rules [Boolean] :disambiguate (false) Prevents the result from being ambiguous
     #  due to equal symbols for different currencies. Uses the `disambiguate_symbol`.
     #
     # @example
@@ -165,21 +165,21 @@ class Money
     #   Money.new(10000, "USD").format(:disambiguate => true)    #=> "$100.00"
     #   Money.new(10000, "CAD").format(:disambiguate => true)    #=> "C$100.00"
     #
-    # @option *rules [Boolean] :html_wrap_symbol (false) Wraps the currency symbol
+    # @option rules [Boolean] :html_wrap_symbol (false) Wraps the currency symbol
     #  in a html <span> tag.
     #
     # @example
     #   Money.new(10000, "USD").format(:disambiguate => false)
     #   #=> "<span class=\"currency_symbol\">$100.00</span>
     #
-    # @option *rules [Symbol] :symbol_position (:before) `:before` if the currency
+    # @option rules [Symbol] :symbol_position (:before) `:before` if the currency
     #   symbol goes before the amount, `:after` if it goes after.
     #
     # @example
     #   Money.new(10000, "USD").format(:symbol_position => :before) #=> "$100.00"
     #   Money.new(10000, "USD").format(:symbol_position => :after)  #=> "100.00 $"
     #
-    # @option *rules [Boolean] :translate (true) `true` Checks for custom
+    # @option rules [Boolean] :translate (true) `true` Checks for custom
     #   symbol definitions using I18n.
     #
     # @example
@@ -195,9 +195,9 @@ class Money
     #   Money.new(89000, :btc).format(:drop_trailing_zeros => true) #=> B⃦0.00089
     #   Money.new(110, :usd).format(:drop_trailing_zeros => true)   #=> $1.1
     #
-    # Note that the default rules can be defined through +Money.default_formatting_rules+ hash.
+    # Note that the default rules can be defined through {Money.default_formatting_rules} hash.
     #
-    # @see +Money.default_formatting_rules+ for more information.
+    # @see Money.default_formatting_rules Money.default_formatting_rules for more information.
     def format(*rules)
       # support for old format parameters
       rules = normalize_formatting_rules(rules)
@@ -205,6 +205,7 @@ class Money
       rules = default_formatting_rules.merge(rules)
       rules = localize_formatting_rules(rules)
       rules = translate_formatting_rules(rules) if rules[:translate]
+      escaped_decimal_mark = Regexp.escape(decimal_mark)
 
       if fractional == 0
         if rules[:display_free].respond_to?(:to_str)
@@ -236,9 +237,9 @@ class Money
 
       # Inspiration: https://github.com/rails/rails/blob/16214d1108c31174c94503caced3855b0f6bad95/activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb#L72-L79
       if rules[:drop_trailing_zeros]
-        escaped_decimal_mark = Regexp.escape(decimal_mark)
         formatted = formatted.sub(/(#{escaped_decimal_mark})(\d*[1-9])?0+\z/, '\1\2').sub(/#{escaped_decimal_mark}\z/, '')
       end
+      has_decimal_value = !!(formatted =~ /#{escaped_decimal_mark}/)
 
       thousands_separator_value = thousands_separator
       # Determine thousands_separator
@@ -275,7 +276,7 @@ class Money
         formatted="#{sign_before}#{sign}#{formatted}"
       end
 
-      apply_decimal_mark_from_rules(formatted, rules)
+      apply_decimal_mark_from_rules(formatted, rules) if has_decimal_value
 
       if rules[:with_currency]
         formatted << " "

data/lib/money/version.rb

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

data/spec/currency_spec.rb

@@ -291,7 +291,7 @@ class Money
 
     describe "#inspect" do
       it "works as documented" do
-        expect(Currency.new(:usd).inspect).to eq %Q{#<Money::Currency id: usd, priority: 1, symbol_first: true, thousands_separator: ,, html_entity: $, decimal_mark: ., name: United States Dollar, symbol: $, subunit_to_unit: 100, exponent: 2.0, iso_code: USD, iso_numeric: 840, subunit: Cent, smallest_denomination: 1>}
+        expect(Currency.new(:usd).inspect).to eq %Q{#<Money::Currency id: usd, priority: 1, symbol_first: true, thousands_separator: ,, html_entity: $, decimal_mark: ., name: United States Dollar, symbol: $, subunit_to_unit: 100, exponent: 2, iso_code: USD, iso_numeric: 840, subunit: Cent, smallest_denomination: 1>}
       end
     end
 

data/spec/money/arithmetic_spec.rb

@@ -45,6 +45,19 @@ describe Money do
       expect(Money.new(2_50, "USD")).not_to eq klass.new(3_00, "USD")
       expect(Money.new(1_00, "GBP")).not_to eq klass.new(1_00, "USD")
     end
+
+    it 'allows comparison with zero' do
+      expect(Money.new(0, :usd)).to eq 0
+      expect(Money.new(0, :usd)).to eq 0.0
+      expect(Money.new(0, :usd)).to eq BigDecimal.new(0)
+      expect(Money.new(1, :usd)).to_not eq 0
+    end
+
+    it 'raises error for non-zero numerics' do
+      expect { Money.new(1_00, :usd) == 1 }.to raise_error ArgumentError
+      expect { Money.new(1_00, :usd) == -2.0 }.to raise_error ArgumentError
+      expect { Money.new(1_00, :usd) == Float::INFINITY }.to raise_error ArgumentError
+    end
   end
 
   describe "#eql?" do
@@ -108,17 +121,19 @@ describe Money do
       expect(Money.new(1_00) <=> klass.new(2_00)).to be < 0
     end
 
-    it "raises TypeError when used to compare with an object that doesn't inherit from Money" do
+    it "returns nill when comparing with an object that doesn't inherit from Money" do
       expect(Money.new(1_00) <=> 100).to be_nil
-
       expect(Money.new(1_00) <=> Object.new).to be_nil
-
       expect(Money.new(1_00) <=> Class).to be_nil
-
       expect(Money.new(1_00) <=> Kernel).to be_nil
-
       expect(Money.new(1_00) <=> /foo/).to be_nil
     end
+
+    it 'compares with numeric 0' do
+      expect(Money.usd(1) < 0).to eq false
+      expect(Money.usd(1) > 0.0).to eq true
+      expect(Money.usd(0) >= 0.0).to eq true
+    end
   end
 
   describe "#positive?" do
@@ -205,15 +220,15 @@ describe Money do
     end
 
     it "does not multiply Money by Money (same currency)" do
-      expect { Money.new( 10, :USD) * Money.new( 4, :USD) }.to raise_error(ArgumentError)
+      expect { Money.new(10, :USD) * Money.new(4, :USD) }.to raise_error(TypeError)
     end
 
     it "does not multiply Money by Money (different currency)" do
-      expect { Money.new( 10, :USD) * Money.new( 4, :EUR) }.to raise_error(ArgumentError)
+      expect { Money.new(10, :USD) * Money.new(4, :EUR) }.to raise_error(TypeError)
     end
 
     it "does not multiply Money by an object which is NOT a number" do
-      expect { Money.new( 10, :USD) *  'abc' }.to raise_error(ArgumentError)
+      expect { Money.new(10, :USD) *  'abc' }.to raise_error(TypeError)
     end
 
     it "preserves the class in the result when using a subclass of Money" do
@@ -375,8 +390,8 @@ describe Money do
     it "calculates division and modulo with Fixnum" 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(-3, :USD), Money.new(-3, :USD)]},
-          {:a => Money.new(-13, :USD), :b =>  4, :c => [Money.new(-3, :USD), Money.new( 3, :USD)]},
+          {:a => Money.new( 13, :USD), :b => -4, :c => [Money.new(-4, :USD), Money.new(-3, :USD)]},
+          {:a => Money.new(-13, :USD), :b =>  4, :c => [Money.new(-4, :USD), Money.new( 3, :USD)]},
           {:a => Money.new(-13, :USD), :b => -4, :c => [Money.new( 3, :USD), Money.new(-1, :USD)]},
       ]
       ts.each do |t|
@@ -607,23 +622,27 @@ describe Money do
     it "correctly handles <=>" do
       expect {
         2 < Money.new(2, 'USD')
-      }.to raise_exception(TypeError)
+      }.to raise_exception(ArgumentError)
 
       expect {
         2 > Money.new(2, 'USD')
-      }.to raise_exception(TypeError)
+      }.to raise_exception(ArgumentError)
 
       expect {
         2 <= Money.new(2, 'USD')
-      }.to raise_exception(TypeError)
+      }.to raise_exception(ArgumentError)
 
       expect {
         2 >= Money.new(2, 'USD')
-      }.to raise_exception(TypeError)
+      }.to raise_exception(ArgumentError)
 
-      expect {
-        2 <=> Money.new(2, 'USD')
-      }.to raise_exception(TypeError)
+      expect(2 <=> Money.new(2, 'USD')).to be_nil
+    end
+
+    it 'compares with numeric 0' do
+      expect(0 < Money.usd(1)).to eq true
+      expect(0.0 > Money.usd(1)).to eq false
+      expect(0.0 >= Money.usd(0)).to eq true
     end
 
     it "raises exceptions for all numeric types, not just Integer" do

data/spec/money/formatting_spec.rb

@@ -110,6 +110,16 @@ describe Money, "formatting" do
         expect(money.format(:translate => true)).to eq("CAD$0.00")
       end
     end
+
+    context "with overridden i18n settings" do
+      it "should respect explicit overriding of thousands_separator/delimiter when decimal_mark/separator collide and there’s no decimal component for currencies that have no subunit" do
+        expect(Money.new(300_000, 'ISK').format(:thousands_separator => ".", decimal_mark: ',')).to eq "kr300.000"
+      end
+
+      it "should respect explicit overriding of thousands_separator/delimiter when decimal_mark/separator collide and there’s no decimal component for currencies with subunits that drop_trailing_zeros" do
+        expect(Money.new(300_000, 'USD').format(:thousands_separator => ".", decimal_mark: ',', drop_trailing_zeros: true)).to eq "$3.000"
+      end
+    end
   end
 
   describe "#format" do
@@ -418,6 +428,20 @@ describe Money, "formatting" do
       it "defaults to ',' if currency isn't recognized" do
         expect(Money.new(100000, "ZWD").format).to eq "$1,000.00"
       end
+
+      context "without i18n" do
+        before { Money.use_i18n = false }
+
+        it "should respect explicit overriding of thousands_separator/delimiter when decimal_mark/separator collide and there’s no decimal component for currencies that have no subunit" do
+          expect(Money.new(300_000, 'ISK').format(:thousands_separator => ",", decimal_mark: '.')).to eq "kr300,000"
+        end
+
+        it "should respect explicit overriding of thousands_separator/delimiter when decimal_mark/separator collide and there’s no decimal component for currencies with subunits that drop_trailing_zeros" do
+          expect(Money.new(300_000, 'USD').format(:thousands_separator => ".", decimal_mark: ',', drop_trailing_zeros: true)).to eq "$3.000"
+        end
+
+        after { Money.use_i18n = true}
+      end
     end
 
     describe ":thousands_separator and :decimal_mark option" do
@@ -435,7 +459,7 @@ describe Money, "formatting" do
 
       specify "should fallback to symbol if entity is not available" do
         string = Money.new(570, 'DKK').format(:html => true)
-        expect(string).to eq "5,70 kr"
+        expect(string).to eq "5,70 kr."
       end
     end
 
@@ -662,7 +686,7 @@ describe Money, "formatting" do
     it "returns ambiguous signs when disambiguate is not set" do
       expect(Money.new(1999_98, "USD").format).to eq("$1,999.98")
       expect(Money.new(1999_98, "CAD").format).to eq("$1,999.98")
-      expect(Money.new(1999_98, "DKK").format).to eq("1.999,98 kr")
+      expect(Money.new(1999_98, "DKK").format).to eq("1.999,98 kr.")
       expect(Money.new(1999_98, "NOK").format).to eq("1.999,98 kr")
       expect(Money.new(1999_98, "SEK").format).to eq("1 999,98 kr")
     end
@@ -670,13 +694,13 @@ describe Money, "formatting" do
     it "returns ambiguous signs when disambiguate is false" do
       expect(Money.new(1999_98, "USD").format(disambiguate: false)).to eq("$1,999.98")
       expect(Money.new(1999_98, "CAD").format(disambiguate: false)).to eq("$1,999.98")
-      expect(Money.new(1999_98, "DKK").format(disambiguate: false)).to eq("1.999,98 kr")
+      expect(Money.new(1999_98, "DKK").format(disambiguate: false)).to eq("1.999,98 kr.")
       expect(Money.new(1999_98, "NOK").format(disambiguate: false)).to eq("1.999,98 kr")
       expect(Money.new(1999_98, "SEK").format(disambiguate: false)).to eq("1 999,98 kr")
     end
 
     it "returns disambiguate signs when disambiguate: true" do
-      expect(Money.new(1999_98, "USD").format(disambiguate: true)).to eq("$1,999.98")
+      expect(Money.new(1999_98, "USD").format(disambiguate: true)).to eq("US$1,999.98")
       expect(Money.new(1999_98, "CAD").format(disambiguate: true)).to eq("C$1,999.98")
       expect(Money.new(1999_98, "DKK").format(disambiguate: true)).to eq("1.999,98 DKK")
       expect(Money.new(1999_98, "NOK").format(disambiguate: true)).to eq("1.999,98 NOK")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.7.0
+  version: 6.7.1
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Ruby Library for dealing with money and currency conversion.
@@ -212,4 +212,3 @@ test_files:
 - spec/money_spec.rb
 - spec/rates_store/memory_spec.rb
 - spec/spec_helper.rb
-has_rdoc: