money 6.13.0 → 6.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7929d62cf482b5ad0876b0ff4950440cec3051ff
-  data.tar.gz: 8b40765349b517c8182f20de9378ad14b76eb863
+  metadata.gz: 4981b9f6d6c9b7162e5df6692e81cac6440edcca
+  data.tar.gz: 96d7be00c3f275c0b8731807f4fa8955fade71bb
 SHA512:
-  metadata.gz: 1bc3a9c7fc84b6c4cd7e78d2dbe7bd666ab25f0715523953751984405f0ae858396e20e7bf0d8199b50c1d94d5947a1d3b0308094f3f2b347f07c93b655b28f1
-  data.tar.gz: 1a1dae32b195ccb6a93125fd2526e1c60e24c794cdd26fc08eb6254a1e6f8f4c0aef270ac215d1606b5163f7a1690443230161a75a5e522f72aa824b1f6f2efd
+  metadata.gz: 4943cebf00d5abf48ca73b52ffd18cc2324287ffada6513357a1d4146b52fc7f4742dd95937efe499f96989c853939543ba857e8af32346f65852cbb71e0c3dd
+  data.tar.gz: 7b87dfa829e29eb266083e1b8d7df418c519273fb5fcab0095d6426b54cee22319303aa122825aa6f23ff635d32a28eb1644efa4f608c697c869c7b37405af0f

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 6.13.1
+- Add bolívar soberano (VES)
+- Deprecate bolívar fuerte (VEF)
+- Deprecate old `#format` rules passed as a symbol
+- Clarify `use_i18n` deprecation
+- Add `:currency` locale_backend for explicit per-currency localization
+
 ## 6.13.0
 - Add :format option to the Formatter
 - Add ruby 2.6.0 support

data/README.md

@@ -434,6 +434,48 @@ If you wish to disable this feature and use defaults instead:
 Money.locale_backend = nil
 ```
 
+### Deprecation
+
+The current default behaviour always checks the I18n locale first, falling back to "per currency"
+localization. This is now deprecated and will be removed in favour of explicitly defined behaviour
+in the next major release.
+
+If you would like to use I18n localization (formatting depends on the locale):
+
+```ruby
+Money.locale_backend = :i18n
+
+# example (using default localization from rails-i18n):
+I18n.locale = :en
+Money.new(10_000_00, 'USD').format # => $10,000.00
+Money.new(10_000_00, 'EUR').format # => €10,000.00
+
+I18n.locale = :es
+Money.new(10_000_00, 'USD').format # => $10.000,00
+Money.new(10_000_00, 'EUR').format # => €10.000,00
+```
+
+For the legacy behaviour of "per currency" localization (formatting depends only on currency):
+
+```ruby
+Money.locale_backend = :currency
+
+# example:
+Money.new(10_000_00, 'USD').format # => $10,000.00
+Money.new(10_000_00, 'EUR').format # => €10.000,00
+```
+
+In case you don't need localization and would like to use default values (can be redefined using
+`Money.default_formatting_rules`):
+
+```ruby
+Money.locale_backend = nil
+
+# example:
+Money.new(10_000_00, 'USD').format # => $10000.00
+Money.new(10_000_00, 'EUR').format # => €10000.00
+```
+
 ## Collection
 
 In case you're working with collections of `Money` instances, have a look at [money-collection](https://github.com/RubyMoney/money-collection)

data/config/currency_backwards_compatible.json

@@ -169,5 +169,20 @@
     "thousands_separator": ",",
     "iso_numeric": "935",
     "smallest_denomination": 100
+  },
+  "vef": {
+    "priority": 100,
+    "iso_code": "VEF",
+    "name": "Venezuelan Bolívar",
+    "symbol": "Bs.F",
+    "alternate_symbols": ["Bs"],
+    "subunit": "Céntimo",
+    "subunit_to_unit": 100,
+    "symbol_first": true,
+    "html_entity": "",
+    "decimal_mark": ",",
+    "thousands_separator": ".",
+    "iso_numeric": "937",
+    "smallest_denomination": 1
   }
 }

data/config/currency_iso.json

@@ -2271,19 +2271,19 @@
     "iso_numeric": "860",
     "smallest_denomination": 100
   },
-  "vef": {
+  "ves": {
     "priority": 100,
-    "iso_code": "VEF",
-    "name": "Venezuelan Bolívar",
+    "iso_code": "VES",
+    "name": "Venezuelan Bolívar Soberano",
     "symbol": "Bs",
-    "alternate_symbols": ["Bs.F"],
+    "alternate_symbols": ["Bs.S"],
     "subunit": "Céntimo",
     "subunit_to_unit": 100,
     "symbol_first": true,
     "html_entity": "",
     "decimal_mark": ",",
     "thousands_separator": ".",
-    "iso_numeric": "937",
+    "iso_numeric": "928",
     "smallest_denomination": 1
   },
   "vnd": {

data/lib/money/locale_backend/currency.rb

@@ -0,0 +1,11 @@
+require 'money/locale_backend/base'
+
+class Money
+  module LocaleBackend
+    class Currency < Base
+      def lookup(key, currency)
+        currency.public_send(key) if currency.respond_to?(key)
+      end
+    end
+  end
+end

data/lib/money/locale_backend/legacy.rb

@@ -9,9 +9,9 @@ class Money
       end
 
       def lookup(key, currency)
-        if Money.use_i18n
-          warn '[DEPRECATION] `use_i18n` is deprecated - use `Money.locale_backend = :i18n` instead'
+        warn '[DEPRECATION] You are using the default localization behaviour that will change in the next major release. Find out more - https://github.com/RubyMoney/money#deprecation'
 
+        if Money.use_i18n
           i18n_backend.lookup(key, nil) || currency.public_send(key)
         else
           currency.public_send(key)

data/lib/money/money.rb

@@ -149,7 +149,9 @@ class Money
 
   def self.use_i18n=(value)
     if value
-      warn '[DEPRECATION] `use_i18n` is deprecated - use `Money.locale_backend = :i18n` instead'
+      warn '[DEPRECATION] `use_i18n` is deprecated - use `Money.locale_backend = :i18n` instead for locale based formatting'
+    else
+      warn '[DEPRECATION] `use_i18n` is deprecated - use `Money.locale_backend = :currency` instead for currency based formatting'
     end
 
     @use_i18n = value

data/lib/money/money/formatter.rb

@@ -204,6 +204,9 @@ class Money
     #   #         CAD: "CAD$"
     #   Money.new(10000, "CAD").format(translate: true) #=> "CAD$100.00"
     #
+    # @option rules [Boolean] :drop_trailing_zeros (false) Ignore trailing zeros after
+    #   the decimal mark
+    #
     # @example
     #   Money.new(89000, :btc).format(drop_trailing_zeros: true) #=> B⃦0.00089
     #   Money.new(110, :usd).format(drop_trailing_zeros: true)   #=> $1.1

data/lib/money/money/formatting_rules.rb

@@ -38,14 +38,21 @@ class Money
         rules = {}
       elsif rules.size == 1
         rules = rules.pop
-        rules = { rules => true } if rules.is_a?(Symbol)
+
+        if rules.is_a?(Symbol)
+          warn '[DEPRECATION] Use Hash when passing rules to Money#format.'
+          rules = { rules => true }
+        end
       end
+
       if !rules.include?(:decimal_mark) && rules.include?(:separator)
         rules[:decimal_mark] = rules[:separator]
       end
+
       if !rules.include?(:thousands_separator) && rules.include?(:delimiter)
         rules[:thousands_separator] = rules[:delimiter]
       end
+
       rules
     end
 

data/lib/money/money/locale_backend.rb

@@ -3,12 +3,14 @@
 require 'money/locale_backend/errors'
 require 'money/locale_backend/legacy'
 require 'money/locale_backend/i18n'
+require 'money/locale_backend/currency'
 
 class Money
   module LocaleBackend
     BACKENDS = {
       legacy: Money::LocaleBackend::Legacy,
-      i18n: Money::LocaleBackend::I18n
+      i18n: Money::LocaleBackend::I18n,
+      currency: Money::LocaleBackend::Currency
     }.freeze
 
     def self.find(name)

data/lib/money/version.rb

@@ -1,3 +1,3 @@
 class Money
-  VERSION = '6.13.0'
+  VERSION = '6.13.1'
 end

data/spec/locale_backend/currency_spec.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+
+describe Money::LocaleBackend::Currency do
+  describe '#lookup' do
+    let(:currency) { Money::Currency.new('EUR') }
+
+    it 'returns thousands_separator as defined in currency' do
+      expect(subject.lookup(:thousands_separator, currency)).to eq('.')
+    end
+
+    it 'returns decimal_mark based as defined in currency' do
+      expect(subject.lookup(:decimal_mark, currency)).to eq(',')
+    end
+  end
+end

data/spec/money/formatting_spec.rb

@@ -136,6 +136,10 @@ describe Money, "formatting" do
   end
 
   describe "#format" do
+    it 'supports the old formatting options' do
+      expect(Money.zero.format(:display_free)).to eq('free')
+    end
+
     context "Locale :ja" do
       before { @_locale = I18n.locale; I18n.locale = :ja }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.13.0
+  version: 6.13.1
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2018-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -129,6 +129,7 @@ files:
 - lib/money/currency/heuristics.rb
 - lib/money/currency/loader.rb
 - lib/money/locale_backend/base.rb
+- lib/money/locale_backend/currency.rb
 - lib/money/locale_backend/errors.rb
 - lib/money/locale_backend/i18n.rb
 - lib/money/locale_backend/legacy.rb
@@ -148,6 +149,7 @@ files:
 - spec/currency/heuristics_spec.rb
 - spec/currency/loader_spec.rb
 - spec/currency_spec.rb
+- spec/locale_backend/currency_spec.rb
 - spec/locale_backend/i18n_spec.rb
 - spec/locale_backend/legacy_spec.rb
 - spec/money/allocation_spec.rb
@@ -193,6 +195,7 @@ test_files:
 - spec/currency/heuristics_spec.rb
 - spec/currency/loader_spec.rb
 - spec/currency_spec.rb
+- spec/locale_backend/currency_spec.rb
 - spec/locale_backend/i18n_spec.rb
 - spec/locale_backend/legacy_spec.rb
 - spec/money/allocation_spec.rb