money-rails 1.13.1 → 1.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4aaf2a0c37bb46472539f30ec9c60f868ffd3ec
-  data.tar.gz: cdc46c11f65bf4d28afe78dee2de672e66246c2b
+  metadata.gz: afde9881744906b6e1095808941f25c35882a6cf
+  data.tar.gz: 8124dc1db10118638c59fbd573d5169a10c856a7
 SHA512:
-  metadata.gz: e79213ea0c3c9aab5563ae75984e6639045ae87fc6c9a63728482a93f8de6988a1f349a06dc36c71dcd5559dea9a718ba3ac579fd790a429991aca9b49bd4007
-  data.tar.gz: 92021999f49f2e24efa5cfba40ed18b0d9714dc2c2bb0c8df171aeec295b4cb31a5f94668de55a4a504fac88707aff31155e239c562ccda420177d552628a886
+  metadata.gz: db46b687d7785a6003671c6303256b67a7e97f8eba7ae56ef80839a3b0bd09ec8b01b12131e1cf959066b3b59c31d9812fcd3ab31a551a926f83335909c0458b
+  data.tar.gz: d40ce1a07d6a8af402c61336b999d8bb41460ec1802df4016fe915613be1e41c6ede7fef65ec8bc711e15b0983dd8a661466a8401e29b15ee581f6734fffb0fe

data/CHANGELOG.md

@@ -1,11 +1,15 @@
 # Changelog
 
+## 1.13.2
+
+- Make validation compatible with Money.locale_backend
+
 ## 1.13.1
 
-Add a guard clause for "blank form" input (Mongoid)
-Do not add extra errors in case attribute is not a number
-Use Money.locale_backend instead of Money.use_i18n
-Add money_only_cents helper method
+- Add a guard clause for "blank form" input (Mongoid)
+- Do not add extra errors in case attribute is not a number
+- Use Money.locale_backend instead of Money.use_i18n
+- Add money_only_cents helper method
 
 ## 1.13.0
 

data/lib/money-rails/active_model/validator.rb

@@ -43,6 +43,11 @@ module MoneyRails
 
       private
 
+      DEFAULTS = {
+        decimal_mark: '.',
+        thousands_separator: ','
+      }.freeze
+
       def record_does_not_have_error?
         !@record.errors.added?(@attr, :not_a_number, value: @raw_value)
       end
@@ -60,21 +65,17 @@ module MoneyRails
       end
 
       def decimal_mark
-        character = currency.decimal_mark || '.'
-        @_decimal_mark ||= use_backend_locale? ? I18n.t('number.currency.format.separator', default: character) : character
+        @_decimal_mark ||= lookup(:decimal_mark)
       end
 
       def thousands_separator
-        character = currency.thousands_separator || ','
-        @_thousands_separator ||= use_backend_locale? ? I18n.t('number.currency.format.delimiter', default: character) : character
+        @_thousands_separator ||= lookup(:thousands_separator)
       end
 
+      # TODO: This is supporting legacy behaviour where a symbol can come from a i18n locale,
+      #       however practical implications of that are most likely non-existent
       def symbol
-        @_symbol ||= use_backend_locale? ? I18n.t('number.currency.format.unit', default: currency.symbol) : currency.symbol
-      end
-
-      def use_backend_locale?
-        Money.locale_backend.present? || Money.use_i18n
+        @_symbol ||= lookup(:symbol) || currency.symbol
       end
 
       def abs_raw_value
@@ -128,6 +129,18 @@ module MoneyRails
           .gsub(decimal_mark, '.')
           .gsub(/[\s_]/, '')
       end
+
+      def lookup(key)
+        if locale_backend
+          locale_backend.lookup(key, currency) || DEFAULTS[key]
+        else
+          DEFAULTS[key]
+        end
+      end
+
+      def locale_backend
+        Money.locale_backend
+      end
     end
   end
 end

data/lib/money-rails/configuration.rb

@@ -7,7 +7,6 @@ module MoneyRails
   # MoneyRails configuration module.
   # This is extended by MoneyRails to provide configuration settings.
   module Configuration
-
     # Start a MoneyRails configuration block in an initializer.
     #
     # example: Provide a default currency for the application
@@ -59,7 +58,7 @@ module MoneyRails
     #   MoneyRails.configure do |config|
     #     config.default_bank = EuCentralBank.new
     #   end
-    delegate :default_bank=, :default_bank, to: :Money
+    delegate :default_bank=, :default_bank, :locale_backend, :locale_backend=, to: :Money
 
     # Provide exchange rates
     delegate :add_rate, to: :Money

data/lib/money-rails/money.rb

@@ -2,7 +2,7 @@ require "active_support/core_ext/module/aliasing.rb"
 require "active_support/core_ext/hash/reverse_merge.rb"
 
 class Money
-  class <<self
+  class << self
     alias_method :orig_default_formatting_rules, :default_formatting_rules
 
     def default_formatting_rules

data/lib/money-rails/version.rb

@@ -1,3 +1,3 @@
 module MoneyRails
-  VERSION = '1.13.1'
+  VERSION = '1.13.2'
 end

data/money-rails.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
 
   s.require_path = "lib"
 
-  s.add_dependency "money",         "~> 6.13.0"
+  s.add_dependency "money",         "~> 6.13.2"
   s.add_dependency "monetize",      "~> 1.9.0"
   s.add_dependency "activesupport", ">= 3.0"
   s.add_dependency "railties",      ">= 3.0"

data/spec/active_record/monetizable_spec.rb

@@ -738,6 +738,8 @@ if defined? ActiveRecord
           end
         end
 
+        # TODO: these specs should mock locale_backend with expected values
+        #       instead of manipulating it directly
         context "and an Italian locale" do
           around(:each) do |example|
             I18n.with_locale(:it) do
@@ -745,7 +747,7 @@ if defined? ActiveRecord
             end
           end
 
-          context "when use_i18n is true" do
+          context "when using :i18n locale backend" do
             it "validates with the locale's decimal mark" do
               transaction.amount = "123,45"
               expect(transaction.valid?).to be_truthy
@@ -767,46 +769,13 @@ if defined? ActiveRecord
             end
           end
 
-          context "when locale_backend is true" do
+          context "when using :currency locale backend" do
             around(:each) do |example|
               begin
-                Money.locale_backend = :i18n
-                Money.use_i18n = false
+                Money.locale_backend = :currency
                 example.run
               ensure
-                Money.locale_backend = nil
-                Money.use_i18n = true
-              end
-            end
-            it "validates with the locale's decimal mark" do
-              transaction.amount = "123,45"
-              expect(transaction.valid?).to be_truthy
-            end
-
-            it "does not validate with the currency's decimal mark" do
-              transaction.amount = "123.45"
-              expect(transaction.valid?).to be_falsey
-            end
-
-            it "validates with the locale's currency symbol" do
-              transaction.amount = "€123"
-              expect(transaction.valid?).to be_truthy
-            end
-
-            it "does not validate with the transaction's currency symbol" do
-              transaction.amount = "$123.45"
-              expect(transaction.valid?).to be_falsey
-            end
-          end
-
-          context "when use_i18n is false" do
-            around(:each) do |example|
-              begin
-                Money.locale_backend = nil
-                Money.use_i18n = false
-                example.run
-              ensure
-                Money.use_i18n = true
+                Money.locale_backend = :i18n
               end
             end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money-rails
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.13.2
 platform: ruby
 authors:
 - Andreas Loupasakis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-09 00:00:00.000000000 Z
+date: 2019-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.13.0
+        version: 6.13.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.13.0
+        version: 6.13.2
 - !ruby/object:Gem::Dependency
   name: monetize
   requirement: !ruby/object:Gem::Requirement