money 6.6.1 → 6.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3285f9f76aec95f56d6f73d260330c3bc0f6984
-  data.tar.gz: 956b5acb84b6b2100d31e49b4a4c79bfbc71e612
+  metadata.gz: 9cffd9f173701f8599fae9244a9de6b4aef0a95f
+  data.tar.gz: 30080c0c9743507a615598ab80c8235d7313f769
 SHA512:
-  metadata.gz: 2892ac7ef0eb825da0e0d2d37c1c794703f781d3667bf265f72f032d2de0f132fe061965561dbbbf5d70f6de57a6658c4a11608e83462bee46a263a27c49b320
-  data.tar.gz: ee6ac428822ff9c7783b684d50374fb6bb2e9b41722c4e20d57f57328c972dcb0055d62efb0684c4fc29dace6bc6340b5e36bbcfa2c58a75e19f63179b6ae49a
+  metadata.gz: 60307b13ad66a684ff833d58441093b58eb7730ccb108b6804a68f935a91dcc0921153e7c2ce0c8543af0851239b4c7289dcc23f71c60361e875d0e71f5f26fb
+  data.tar.gz: b435062afea1d2a798502354347b757dc5c4f84a835449d39d411c9ea6400e52fa99eeeded5322a92e00b0956d41d9d3003134b25f49c72b18b4fa1f195acf01

data/.gitignore

@@ -17,6 +17,7 @@ doc/
 .rbx
 .rvmrc
 .ruby-version
+.ruby-gemset
 
 # Spec artifacts
 /coverage

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/.travis.yml

@@ -3,8 +3,9 @@ sudo: false
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.6
-  - 2.2.2
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
   - rbx-2
 script: bundle exec rspec spec
 notifications:

data/AUTHORS

@@ -1,7 +1,7 @@
 Abhay Kumar
 Adrian Longley
-Alex Speller
 Alexander Ross
+Alex Speller
 Andreas Loupasakis
 Andrei
 Andrew White
@@ -23,18 +23,19 @@ Choongmin Lee
 Chris Kampmeier
 Christian Billen
 Clarke Brunsdon
-Dave Kroondyk
 Daniel Sherson
+Dave Kroondyk
 Doug Droper
+Douglas Miller
 Ed Saunders
 Edwin Vlieg
 Eloy
 Evan Alter
 Exoth
 Filipe Goncalves
+Francisco Trindade
 François Beausoleil
 François Klingler
-Francisco Trindade
 Gabriel Gilder
 Gee-Hsien Chuang
 George Millo
@@ -46,17 +47,18 @@ Jacob Atzen
 James Cotterill
 James Hunt
 Jean-Louis Giordano
+Jean-Philippe Doyle
 Jell
-Jeremy McNevin
 Jérémy Lecour
+Jeremy McNevin
 Jesse Cooke
 Jim Kingdon
 John Duff
 John Gakos
 Jonathon M. Abbott
 Josh Delsman
-Joshua Clayton
 Josh Hepworth
+Joshua Clayton
 Julien Boyer
 Kaleem Ullah
 Kenichi Kamiya
@@ -68,11 +70,11 @@ Marco Otte-Witte
 Mateus Gomes
 Mateusz Wolsza
 Matias Korhonen
-Matt Jankowski
 Matthew McEachen
+Matt Jankowski
 Max Melentiev
-Michael J. Cohen
 Michael Irwin
+Michael J. Cohen
 Michael Reinsch
 Michael Rodrigues
 Mikael Wikman
@@ -85,11 +87,12 @@ Olek Janiszewski
 Orien Madgwick
 Paul McMahon
 Paulo Diniz
-Pavel Gabriel
 Pavan Sudarshan
+Pavel Gabriel
 pconnor
 Pedro Nascimento
 Pelle Braendgaard
+Peter Rhoades
 Phil Cohen
 pivotal-cloudplanner
 Prathan Thananart
@@ -97,15 +100,12 @@ Robert Starsi
 Romain Gérard
 Ryan Bigg
 sankaranarayanan
-Semyon Perepelitsa
 Scott Pierce
+Semyon Perepelitsa
 Shane Emmons
 Simone Carletti
 Spencer Rinehart
 Steve Morris
-Yok
-Yuri Sidorov
-Yuusuke Takizawa
 Thomas E Enebo
 Thomas Weymuth
 Ticean Bennett
@@ -117,7 +117,10 @@ Tom Lianza
 tommeier
 Troels Knak-Nielsen
 Tsyren Ochirov
+Victor Shcherbakov
 Wei Zhu
+Yok
+Yuri Sidorov
+Yuusuke Takizawa
 Zubin Henner
 Бродяной Александр
-Douglas Miller

data/CHANGELOG.md

@@ -1,8 +1,17 @@
 # Changelog
 
-## Next release
-
-TBD
+## 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
+   subclasses of `Money` for comparisons and raise TypeError otherwise.
+ - When comparing fails due to `Money::Bank::UnknownRate` `Money#<=>` will now
+   return `nil` as `Comparable#==` will not rescue exceptions in the next release.
+ - Fix `Currency` specs for `#exponent` and `#decimal_places` not making assertions.
+ - Fix a couple of Ruby warnings found in specs.
+ - Fix `Money#-`,`Money#+` arithmetics for Ruby 2.3+ : check for zero value without using eql? with a Fixnum. (#577)
+ - Use `Money#decimal_mark` when formatting with `rounded_infinite_precision` rule
+   set to `true`.
+ - Replaced meta-defined `thousands_separator` and `decimal_mark` methods with regular methods. (#579)
 
 ## 6.6.0
  - Fixed VariableExchange#exchange_with for big numbers.

data/Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 gem "coveralls", :require => false
-gem "json", :platform => [:jruby, :mri_18]
+gem "json", :platform => :jruby
 gem "pry", :require => false
 
 gemspec

data/README.md

@@ -34,9 +34,9 @@ A Ruby Library for dealing with money and currency conversion.
 
 ### Resources
 
-- [Website](http://rubymoney.github.com/money)
-- [API Documentation](http://rubydoc.info/gems/money/frames)
-- [Git Repository](http://github.com/RubyMoney/money)
+- [Website](http://rubymoney.github.io/money/)
+- [API Documentation](http://www.rubydoc.info/gems/money/frames)
+- [Git Repository](https://github.com/RubyMoney/money)
 
 ### Notes
 
@@ -101,8 +101,8 @@ The most part of `Money` APIs allows you to supply either a `String` or a
 `Money::Currency`.
 
 ``` ruby
-Money.new(1000, "USD") == Money.new(1000, Currency.new("USD"))
-Money.new(1000, "EUR").currency == Currency.new("EUR")
+Money.new(1000, "USD") == Money.new(1000, Money::Currency.new("USD"))
+Money.new(1000, "EUR").currency == Money::Currency.new("EUR")
 ```
 
 A `Money::Currency` instance holds all the information about the currency,
@@ -181,10 +181,10 @@ def all_currencies(hash)
 end
 
 major_currencies(Money::Currency.table)
-# => [ :usd, :eur, :bgp, :cad ]
+# => [:usd, :eur, :gbp, :aud, :cad, :jpy]
 
 all_currencies(Money::Currency.table)
-# => [ :aed, :afn, all, ... ]
+# => [:aed, :afn, :all, ...]
 ```
 
 ### Default Currency
@@ -202,7 +202,7 @@ 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.
-[Wikipedia on ISO 4217](http://en.wikipedia.org/wiki/ISO_4217) for more
+[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
 
 ``` ruby
@@ -367,18 +367,19 @@ Money.disallow_currency_conversion!
 The following is a list of Money.gem compatible currency exchange rate
 implementations.
 
-- [eu_central_bank](http://github.com/RubyMoney/eu_central_bank)
-- [google_currency](http://github.com/RubyMoney/google_currency)
+- [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)
-- [nordea](https://github.com/k33l0r/nordea)
+- [nordea](https://github.com/matiaskorhonen/nordea)
 - [nbrb_currency](https://github.com/slbug/nbrb_currency)
+- [money-currencylayer-bank](https://github.com/phlegx/money-currencylayer-bank)
 - [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)
 
 ## Ruby on Rails
 
-To integrate money in a Rails application use [money-rails](http://github.com/RubyMoney/money-rails).
+To integrate money in a Rails application use [money-rails](https://github.com/RubyMoney/money-rails).
 
 For deprecated methods of integrating with Rails, check [the wiki](https://github.com/RubyMoney/money/wiki).
 
@@ -412,9 +413,26 @@ If you wish to disable this feature:
 Money.use_i18n = false
 ```
 
+### Troubleshooting
+
+If you get a runtime error such as:
+
+    I18n::InvalidLocale: :en is not a valid locale
+
+Set the following:
+``` ruby
+I18n.enforce_available_locales = false
+```
+
 ## Formatting
 
-There are several formatting rules for when `Money#format` is called. For more information, check out the [formatting module](https://github.com/RubyMoney/money/blob/master/lib/money/money/formatting.rb).*
+There are several formatting rules for when `Money#format` is called. For more information, check out the [formatting module source](https://github.com/RubyMoney/money/blob/master/lib/money/money/formatting.rb), or read the latest release's [rdoc version](http://www.rubydoc.info/gems/money/Money/Formatting).
+
+If you wish to format money according to the EU's [Rules for expressing monetary units](http://publications.europa.eu/code/en/en-370303.htm#position) in either English, Irish, Latvian or Maltese:
+```ruby
+m = Money.new('123', :gbp) # => #<Money fractional:123 currency:GBP>
+m.format( symbol: m.currency.to_s + ' ') # => "GBP 1.23"
+```
 
 ## Migration Notes
 

data/Rakefile

@@ -14,3 +14,4 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.fail_on_error = false
 end
 
+task default: :spec

data/config/currency_iso.json

@@ -7,7 +7,7 @@
     "alternate_symbols": ["DH", "Dhs"],
     "subunit": "Fils",
     "subunit_to_unit": 100,
-    "symbol_first": true,
+    "symbol_first": false,
     "html_entity": "",
     "decimal_mark": ".",
     "thousands_separator": ",",
@@ -202,7 +202,7 @@
     "priority": 100,
     "iso_code": "BGN",
     "name": "Bulgarian Lev",
-    "symbol": "лв",
+    "symbol": "лв.",
     "alternate_symbols": ["lev", "leva", "лев", "лева"],
     "subunit": "Stotinka",
     "subunit_to_unit": 100,
@@ -351,8 +351,24 @@
     "iso_numeric": "072",
     "smallest_denomination": 5
   },
-  "byr": {
+  "byn": {
     "priority": 100,
+    "iso_code": "BYN",
+    "name": "Belarusian Ruble",
+    "symbol": "Br",
+    "disambiguate_symbol": "BYN",
+    "alternate_symbols": ["бел. руб.", "б.р.", "руб.", "р."],
+    "subunit": "Kapeyka",
+    "subunit_to_unit": 100,
+    "symbol_first": false,
+    "html_entity": "",
+    "decimal_mark": ",",
+    "thousands_separator": " ",
+    "iso_numeric": "933",
+    "smallest_denomination": 1
+  },
+  "byr": {
+    "priority": 50,
     "iso_code": "BYR",
     "name": "Belarusian Ruble",
     "symbol": "Br",
@@ -365,7 +381,7 @@
     "decimal_mark": ",",
     "thousands_separator": " ",
     "iso_numeric": "974",
-    "smallest_denomination": 50
+    "smallest_denomination": 100
   },
   "bzd": {
     "priority": 100,
@@ -887,7 +903,7 @@
     "alternate_symbols": [],
     "subunit": "Lipa",
     "subunit_to_unit": 100,
-    "symbol_first": true,
+    "symbol_first": false,
     "html_entity": "",
     "decimal_mark": ",",
     "thousands_separator": ".",
@@ -990,8 +1006,8 @@
     "name": "Iranian Rial",
     "symbol": "﷼",
     "alternate_symbols": [],
-    "subunit": "Dinar",
-    "subunit_to_unit": 100,
+    "subunit": null,
+    "subunit_to_unit": 1,
     "symbol_first": true,
     "html_entity": "﷼",
     "decimal_mark": ".",

data/config/currency_non_iso.json

@@ -11,7 +11,8 @@
     "html_entity": "",
     "decimal_mark": ".",
     "thousands_separator": ",",
-    "iso_numeric": ""
+    "iso_numeric": "",
+    "smallest_denomination": 1
   },
   "jep": {
     "priority": 100,
@@ -28,5 +29,37 @@
     "thousands_separator": ",",
     "iso_numeric": "",
     "smallest_denomination": 1
+  },
+  "ggp": {
+    "priority": 100,
+    "iso_code": "GGP",
+    "name": "Guernsey Pound",
+    "symbol": "£",
+    "disambiguate_symbol": "GGP",
+    "alternate_symbols": [],
+    "subunit": "Penny",
+    "subunit_to_unit": 100,
+    "symbol_first": true,
+    "html_entity": "£",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": "",
+    "smallest_denomination": 1
+  },
+  "imp": {
+    "priority": 100,
+    "iso_code": "IMP",
+    "name": "Isle of Man Pound",
+    "symbol": "£",
+    "disambiguate_symbol": "IMP",
+    "alternate_symbols": ["M£"],
+    "subunit": "Penny",
+    "subunit_to_unit": 100,
+    "symbol_first": true,
+    "html_entity": "£",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": "",
+    "smallest_denomination": 1
   }
 }

data/lib/money.rb

@@ -2,5 +2,18 @@ require "bigdecimal"
 require "bigdecimal/util"
 require "set"
 require "i18n"
+require "sixarm_ruby_unaccent"
 require "money/currency"
 require "money/money"
+
+# Overwrites unaccent method of sixarm_ruby_unaccent.
+class String
+  def unaccent
+    accentmap = ACCENTMAP
+    accentmap.delete("\u{0142}") # Delete ł symbol from ACCENTMAP used in PLN currency
+    accentmap.delete("\u{010D}") # Delete č symbol from ACCENTMAP used in CZK currency
+    accentmap.delete("\u{FDFC}") # Delete ﷼ symbol from ACCENTMAP used in IRR, SAR and YER currencies
+    accentmap.delete("\u{20A8}") # Delete ₨ symbol from ACCENTMAP used in INR, LKR, MUR, NPR, PKR and SCR currencies
+    split(//u).map {|c| accentmap[c] || c }.join("")
+  end
+end

data/lib/money/bank/base.rb

@@ -118,7 +118,7 @@ class Money
       # @example
       #   same_currency?("usd", "USD")                #=> true
       #   same_currency?("usd", "EUR")                #=> false
-      #   same_currency?("usd", Currency.new("USD")   #=> true
+      #   same_currency?("usd", Currency.new("USD"))   #=> true
       #   same_currency?("usd", "USD")                #=> true
       def same_currency?(currency1, currency2)
         Currency.wrap(currency1) == Currency.wrap(currency2)

data/lib/money/currency.rb

@@ -188,7 +188,7 @@ class Money
           key = curr.downcase.to_sym
         end
         existed = @table.delete(key)
-        @stringified_keys = stringify_keys
+        @stringified_keys = stringify_keys if existed
         existed ? true : false
       end
 
@@ -232,9 +232,9 @@ class Money
     # @!attribute [r] decimal_mark
     #   @return [String] The decimal mark, or character used to separate the
     #     whole unit from the subunit.
-    # @!attribute [r] The
-    #   @return [String] character used to separate thousands grouping of the
-    #     whole unit.
+    # @!attribute [r] thousands_separator
+    #   @return [String] The character used to separate thousands grouping of
+    #     the whole unit.
     # @!attribute [r] symbol_first
     #   @return [Boolean] Should the currency symbol precede the amount, or
     #     should it come after?