money-rails 1.13.3 → 1.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94253df4c6ac9ec75bfc1b569d6d05a96082846df1c7e2ab61d65cc56cf10183
-  data.tar.gz: 8fbcf7e06595b836c03d12d77bba6db42fbf40abc5b1de44e7c6311ffca4f01f
+  metadata.gz: 618663a78af12610ff9901dd5ed3b3e5e5bf74d6d24b65141a52b2811179a0d8
+  data.tar.gz: 0724c64933122f73af34f1ad606c309e40c224a8b8636053ca437145527a8490
 SHA512:
-  metadata.gz: a3f73a3833288cc529da04343d58ce82dabaa3563c61281712a8e5d975f3c60cacce5ff37b9b5422bacbf6f6c0606468643145376521925b9db26281748150fb
-  data.tar.gz: 035af0f28d1aae1e28a970938f402a32c5de2eb1abd62bc2d36808f366dfe60f92f06aa4c5dddf9f940f85b20776deb9707def03b65544aedb6c9883dd8c67ac
+  metadata.gz: d0b87a85f4fe133e3fc75d75722c42dbb445c05cc98ebe7d242d8b63a27d8b879d324d37a8ca9b1ee24fddc8c0381152cd04e449dc8f8c041ec1598371760551
+  data.tar.gz: c984f12a0162f918b6d5c67b009da28d37a96a63ee0db664a8778e03503d60064ad9e8227d2e1d4fd37f61098f235445f0b959b7612aa503a1b90416f70b69c0

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 1.13.4
+
+- Fix validator race condition
+- Add Danish translation for errors
+- Change Money fields to Decimal in Rails Admin
+- Run hooks after active_record.initialize_database
+- Add optional currency argument to "#currency_symbol" helper
+- Rails 6.1 support
+
 ## 1.13.3
 
 - Add Money#to_hash for JSON serialization

data/README.md

@@ -116,7 +116,7 @@ end
 
 Notice. Default value of currency field, generated by migration's helper, is USD. To override these defaults, you need change default_currency in money initializer and run migrations.
 
-The ```add_money``` helper is reversible, so you an use it inside ```change```
+The ```add_money``` helper is reversible, so you can use it inside ```change```
 migrations.  If you're writing separate ```up``` and ```down``` methods, you
 can use the ```remove_money``` helper.
 
@@ -306,7 +306,7 @@ object using EUR as their currency, instead of the default USD.
 
 By passing the option ```:with_currency``` to the ```monetize``` macro call,
 with a currency code (symbol or string) or a callable object (object that responds to the method ```call```) that returns a currency code, as its value, you can define a currency in a more granular
-way. This will you attach the given currency only to the specified monetized model
+way. This will let you attach the given currency only to the specified monetized model
 attribute (allowing you to, for example, monetize different attributes of the same model with different currencies.).
 
 This allows you to override both the model level and the global

data/config/locales/money.da.yml

@@ -0,0 +1,4 @@
+da:
+  errors:
+    messages:
+      invalid_currency: skal være en gyldig valuta  (f.eks. '100', '5%{decimal}24', eller '123%{thousands}456%{decimal}78'). Fik %{currency}

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

@@ -1,44 +1,60 @@
 module MoneyRails
   module ActiveModel
     class MoneyValidator < ::ActiveModel::Validations::NumericalityValidator
-      def validate_each(record, attr, _value)
-        reset_memoized_variables!
-        @record = record
-        @attr = attr
+      class Details < Struct.new(:raw_value, :thousands_separator, :decimal_mark)
+        def abs_raw_value
+          @abs_raw_value ||= raw_value.to_s.sub(/^\s*-/, "").strip
+        end
 
-        subunit_attr = @record.class.monetized_attributes[@attr.to_s]
+        def decimal_pieces
+          @decimal_pieces ||= abs_raw_value.split(decimal_mark)
+        end
+      end
+
+      def validate_each(record, attr, _value)
+        subunit_attr = record.class.monetized_attributes[attr.to_s]
+        currency = record.public_send("currency_for_#{attr}")
 
         # WARNING: Currently this is only defined in ActiveRecord extension!
-        before_type_cast = :"#{@attr}_money_before_type_cast"
-        @raw_value = @record.try(before_type_cast)
+        before_type_cast = :"#{attr}_money_before_type_cast"
+        raw_value = record.try(before_type_cast)
 
         # If raw value is nil and changed subunit is nil, then
         # nil is a assigned value, else we should treat the
         # subunit value as the one assigned.
-        if @raw_value.nil? && @record.public_send(subunit_attr)
-          subunit_value = @record.public_send(subunit_attr)
-          @raw_value = subunit_value.to_f / currency.subunit_to_unit
+        if raw_value.nil? && record.public_send(subunit_attr)
+          subunit_value = record.public_send(subunit_attr)
+          raw_value = subunit_value.to_f / currency.subunit_to_unit
         end
 
-        return if options[:allow_nil] && @raw_value.nil?
+        return if options[:allow_nil] && raw_value.nil?
 
-        # Set this before we modify @raw_value below.
-        stringy = @raw_value.present? && !@raw_value.is_a?(Numeric) && !@raw_value.is_a?(Money)
+        # Set this before we modify raw_value below.
+        stringy = raw_value.present? && !raw_value.is_a?(Numeric) && !raw_value.is_a?(Money)
 
         if stringy
+          # 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
+          symbol = lookup(:symbol, currency) || currency.symbol
+
           # remove currency symbol
-          @raw_value = @raw_value.to_s.gsub(symbol, "")
+          raw_value = raw_value.to_s.gsub(symbol, "")
         end
 
-        normalize_raw_value!
-        super(@record, @attr, @raw_value)
+        # Cache abs_raw_value before normalizing because it's used in
+        # many places and relies on the original raw_value.
+        details = generate_details(raw_value, currency)
+        normalized_raw_value = normalize(details)
 
-        if stringy && record_does_not_have_error?
-          add_error if
-            value_has_too_many_decimal_points ||
-            thousand_separator_after_decimal_mark ||
-            invalid_thousands_separation
-        end
+        super(record, attr, normalized_raw_value)
+
+        return unless stringy
+        return if record_already_has_error?(record, attr, normalized_raw_value)
+
+        add_error!(record, attr, details) if
+          value_has_too_many_decimal_points(details) ||
+          thousand_separator_after_decimal_mark(details) ||
+          invalid_thousands_separation(details)
       end
 
       private
@@ -48,70 +64,45 @@ module MoneyRails
         thousands_separator: ','
       }.freeze
 
-      def record_does_not_have_error?
-        !@record.errors.added?(@attr, :not_a_number, value: @raw_value)
-      end
+      def generate_details(raw_value, currency)
+        thousands_separator = lookup(:thousands_separator, currency)
+        decimal_mark = lookup(:decimal_mark, currency)
 
-      def reset_memoized_variables!
-        [:currency, :decimal_mark, :thousands_separator, :symbol,
-          :abs_raw_value, :decimal_pieces, :pieces_array].each do |var_name|
-          ivar_name = :"@_#{var_name}"
-          remove_instance_variable(ivar_name) if instance_variable_defined?(ivar_name)
-        end
+        Details.new(raw_value, thousands_separator, decimal_mark)
       end
 
-      def currency
-        @_currency ||= @record.public_send("currency_for_#{@attr}")
+      def record_already_has_error?(record, attr, raw_value)
+        record.errors.added?(attr, :not_a_number, value: raw_value)
       end
 
-      def decimal_mark
-        @_decimal_mark ||= lookup(:decimal_mark)
-      end
+      def add_error!(record, attr, details)
+        attr_name = attr.to_s.tr('.', '_').humanize
+        attr_name = record.class.human_attribute_name(attr, default: attr_name)
 
-      def thousands_separator
-        @_thousands_separator ||= lookup(:thousands_separator)
+        record.errors.add(attr, :invalid_currency, {
+          thousands: details.thousands_separator,
+          decimal: details.decimal_mark,
+          currency: details.abs_raw_value,
+          attribute: attr_name
+        })
       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 ||= lookup(:symbol) || currency.symbol
+      def value_has_too_many_decimal_points(details)
+        ![1, 2].include?(details.decimal_pieces.length)
       end
 
-      def abs_raw_value
-        @_abs_raw_value ||= @raw_value.to_s.sub(/^\s*-/, "").strip
+      def thousand_separator_after_decimal_mark(details)
+        details.thousands_separator.present? &&
+          details.decimal_pieces.length == 2 &&
+          details.decimal_pieces[1].include?(details.thousands_separator)
       end
 
-      def add_error
-        attr_name = @attr.to_s.tr('.', '_').humanize
-        attr_name = @record.class.human_attribute_name(@attr, default: attr_name)
+      def invalid_thousands_separation(details)
+        pieces_array = details.decimal_pieces[0].split(details.thousands_separator.presence)
 
-        @record.errors.add(@attr, :invalid_currency,
-                           { thousands: thousands_separator,
-                             decimal: decimal_mark,
-                             currency: abs_raw_value,
-                             attribute: attr_name })
-      end
-
-      def decimal_pieces
-        @_decimal_pieces ||= abs_raw_value.split(decimal_mark)
-      end
-
-      def value_has_too_many_decimal_points
-        ![1, 2].include?(decimal_pieces.length)
-      end
-
-      def pieces_array
-        @_pieces_array ||= decimal_pieces[0].split(thousands_separator.presence)
-      end
-
-      def thousand_separator_after_decimal_mark
-        thousands_separator.present? && decimal_pieces.length == 2 && decimal_pieces[1].include?(thousands_separator)
-      end
-
-      def invalid_thousands_separation
         return false if pieces_array.length <= 1
         return true  if pieces_array[0].length > 3
+
         pieces_array[1..-1].any? do |thousands_group|
           thousands_group.length != 3
         end
@@ -119,18 +110,15 @@ module MoneyRails
 
       # Remove thousands separators, normalize decimal mark,
       # remove whitespaces and _ (E.g. 99 999 999 or 12_300_200.20)
-      def normalize_raw_value!
-        # Cache abs_raw_value before normalizing because it's used in
-        # many places and relies on the original @raw_value.
-        abs_raw_value
-
-        @raw_value = @raw_value.to_s
-          .gsub(thousands_separator, '')
-          .gsub(decimal_mark, '.')
+      def normalize(details)
+        details.raw_value
+          .to_s
+          .gsub(details.thousands_separator, '')
+          .gsub(details.decimal_mark, '.')
           .gsub(/[\s_]/, '')
       end
 
-      def lookup(key)
+      def lookup(key, currency)
         if locale_backend
           locale_backend.lookup(key, currency) || DEFAULTS[key]
         else

data/lib/money-rails/active_record/monetizable.rb

@@ -209,7 +209,7 @@ module MoneyRails
 
         if MoneyRails::Configuration.preserve_user_input
           value_before_type_cast = instance_variable_get "@#{name}_money_before_type_cast"
-          if errors[name.to_sym].present?
+          if errors.has_key?(name.to_sym)
             result.define_singleton_method(:to_s) { value_before_type_cast }
             result.define_singleton_method(:format) { |_| value_before_type_cast }
           end

data/lib/money-rails/helpers/action_view_extension.rb

@@ -1,8 +1,7 @@
 module MoneyRails
   module ActionViewExtension
-
-    def currency_symbol
-      content_tag(:span, Money.default_currency.symbol, class: "currency_symbol")
+    def currency_symbol(currency = Money.default_currency)
+      content_tag(:span, Money::Currency.find(currency).symbol, class: "currency_symbol")
     end
 
     def humanized_money(value, options={})

data/lib/money-rails/hooks.rb

@@ -18,7 +18,13 @@ module MoneyRails
                                     else
                                       false
                                     end
-            current_adapter = ::ActiveRecord::Base.connection_config[:adapter]
+
+            current_adapter = if ::ActiveRecord::Base.respond_to?(:connection_db_config)
+                                ::ActiveRecord::Base.connection_db_config.configuration_hash[:adapter]
+                              else
+                                ::ActiveRecord::Base.connection_config[:adapter]
+                              end
+
             postgresql_with_money = rails42 && PG_ADAPTERS.include?(current_adapter)
           end
         end

data/lib/money-rails/rails_admin.rb

@@ -8,7 +8,7 @@ module RailsAdmin
   module Config
     module Fields
       module Types
-        class Money < RailsAdmin::Config::Fields::Types::Integer
+        class Money < RailsAdmin::Config::Fields::Types::Decimal
           RailsAdmin::Config::Fields::Types::register(self)
 
           register_instance_option :pretty_value do

data/lib/money-rails/railtie.rb

@@ -1,6 +1,6 @@
 module MoneyRails
   class Railtie < ::Rails::Railtie
-    initializer 'moneyrails.initialize' do
+    initializer 'moneyrails.initialize', after: 'active_record.initialize_database' do
       MoneyRails::Hooks.init
     end
   end

data/lib/money-rails/version.rb

@@ -1,3 +1,3 @@
 module MoneyRails
-  VERSION = '1.13.3'
+  VERSION = '1.13.4'
 end

data/spec/active_record/monetizable_spec.rb

@@ -20,6 +20,14 @@ if defined? ActiveRecord
         Service.create(charge_cents: 2000, discount_cents: 120)
       end
 
+      def update_product(*attributes)
+        if defined?(::ActiveRecord::VERSION) && ::ActiveRecord::VERSION::MAJOR >= 5
+          product.update(*attributes)
+        else
+          product.update_attributes(*attributes)
+        end
+      end
+
       context ".monetized_attributes" do
 
         class InheritedMonetizeProduct < Product
@@ -73,7 +81,7 @@ if defined? ActiveRecord
       end
 
       it "correctly updates from a Money object using update_attributes" do
-        expect(product.update_attributes(price: Money.new(215, "USD"))).to be_truthy
+        expect(update_product(price: Money.new(215, "USD"))).to be_truthy
         expect(product.price_cents).to eq(215)
       end
 
@@ -187,8 +195,8 @@ if defined? ActiveRecord
       end
 
       it "respects numericality validation when using update_attributes" do
-        expect(product.update_attributes(price_cents: "some text")).to be_falsey
-        expect(product.update_attributes(price_cents: 2000)).to be_truthy
+        expect(update_product(price_cents: "some text")).to be_falsey
+        expect(update_product(price_cents: 2000)).to be_truthy
       end
 
       it "uses numericality validation on money attribute" do
@@ -415,8 +423,8 @@ if defined? ActiveRecord
       end
 
       it "respects numericality validation when using update_attributes on money attribute" do
-        expect(product.update_attributes(price: "some text")).to be_falsey
-        expect(product.update_attributes(price: Money.new(320, 'USD'))).to be_truthy
+        expect(update_product(price: "some text")).to be_falsey
+        expect(update_product(price: Money.new(320, 'USD'))).to be_truthy
       end
 
       it "uses i18n currency format when validating" do

data/spec/helpers/action_view_extension_spec.rb

@@ -5,6 +5,18 @@ describe 'MoneyRails::ActionViewExtension', type: :helper do
     subject { helper.currency_symbol }
     it { is_expected.to be_a String }
     it { is_expected.to include Money.default_currency.symbol }
+
+    context 'with given currency' do
+      subject { helper.currency_symbol(Money::Currency.find(:brl)) }
+      it { is_expected.to include Money::Currency.find(:brl).symbol }
+      it { is_expected.to include Money::Currency.find(:brl).symbol }
+    end
+
+    context 'with given currency symbol' do
+      subject { helper.currency_symbol(:brl) }
+      it { is_expected.to include Money::Currency.find(:brl).symbol }
+      it { is_expected.to include Money::Currency.find(:brl).symbol }
+    end
   end
 
   describe '#humanized_money' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money-rails
 version: !ruby/object:Gem::Version
-  version: 1.13.3
+  version: 1.13.4
 platform: ruby
 authors:
 - Andreas Loupasakis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -135,6 +135,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- config/locales/money.da.yml
 - config/locales/money.en.yml
 - lib/generators/money_rails/initializer_generator.rb
 - lib/generators/templates/money.rb
@@ -250,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Money gem integration with Rails