money-rails 1.13.2 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: afde9881744906b6e1095808941f25c35882a6cf
-  data.tar.gz: 8124dc1db10118638c59fbd573d5169a10c856a7
+SHA256:
+  metadata.gz: 5bb5642fbc3d57d55b592911898fc1c0beeb8bb42bb21aeea89c89d1d3dc5464
+  data.tar.gz: 8a5100169dea70dd4bbb8770a2273e59c6b99c555173025bfcc18fb4170fd7d0
 SHA512:
-  metadata.gz: db46b687d7785a6003671c6303256b67a7e97f8eba7ae56ef80839a3b0bd09ec8b01b12131e1cf959066b3b59c31d9812fcd3ab31a551a926f83335909c0458b
-  data.tar.gz: d40ce1a07d6a8af402c61336b999d8bb41460ec1802df4016fe915613be1e41c6ede7fef65ec8bc711e15b0983dd8a661466a8401e29b15ee581f6734fffb0fe
+  metadata.gz: eb7961c60fab97af3a1e867ebcc192fcdc6468bb4239a18f60fb269014f898836051319db22b14c6b7c69b47287f6772be68d29db4e3be6a5d0366b895cea6b4
+  data.tar.gz: 193580effbe3f55093e418f8ca6a0eea54bbfd6a46f07d0f8641a57d450564739716f69d18e743b839f785cc5d75513c234445a9378430f9bc943220598c51ae

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## 1.14.1
+
+- Fix invalid_currency error definition
+- Add Russian translation for errors
+- Loosen money version to ~> 6.13
+- Loosen monetize version to ~> 1.9
+
+## 1.14.0
+
+- Tweaks to support Ruby 3.0
+
+## 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
+- Update initializer template with #locale_backend config
+- Rollback support for remove_monetize / remove_money DB helpers
+- Rails 6 support
+
 ## 1.13.2
 
 - Make validation compatible with Money.locale_backend
@@ -19,6 +46,7 @@
 
 - Bump money version to ~> 6.12.0
 - Bump monetize version to ~> 1.9.0
+- BREAKING CHANGE: Fix to rounding logic in this version from 1.11.0 can cause breaking changes for those relying on the incorrect behavior. Eee [the issue](https://github.com/RubyMoney/money-rails/issues/608) for details.
 
 ## 1.11.0
 

data/LICENSE

@@ -1,22 +1,22 @@
-Copyright (c) 2012 Andreas Loupasakis
-
 MIT License
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Copyright (c) 2012 Andreas Loupasakis
+Copyright (c) 2021 Shane Emmons
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

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
@@ -587,4 +587,4 @@ If you are testing against mongoid, make sure to have the mongod process running
 
 ## License
 
-MIT License. Copyright 2012-2014 RubyMoney.
+MIT License. Copyright 2021 RubyMoney.

data/Rakefile

@@ -55,6 +55,13 @@ namespace :spec do
     framework, version = file_name.split(/(\d+)/)
     major, minor = version.split(//)
 
+    # Ruby 3 exclusions
+    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0')
+      # Rails 5 does not support ruby-3.0.0 https://github.com/rails/rails/issues/40938#issuecomment-751569171
+      # Mongoid gem does not yet support ruby-3.0.0 https://github.com/mongodb/mongoid#compatibility
+      next if framework == 'mongoid' || (framework == 'rails' && version == "5")
+    end
+
     frameworks_versions[framework] ||= []
     frameworks_versions[framework] << file_name
 

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/config/locales/money.en.yml

@@ -1,5 +1,4 @@
 en:
   errors:
     messages:
-      invalid_currency: must be a valid currency (eg. '100', '5%{decimal}24', or '123%{thousands}456%{decimal}78'). Got %{currency}
-
+      invalid_currency: has invalid format (must be '100', '5%{decimal}24', or '123%{thousands}456%{decimal}78'). Got %{currency}

data/config/locales/money.ru.yml

@@ -0,0 +1,4 @@
+ru:
+  errors:
+    messages:
+      invalid_currency: имеет неверный формат (должно быть '100', '5%{decimal}24', или '123%{thousands}456%{decimal}78'). Получено %{currency}

data/lib/generators/templates/money.rb

@@ -83,6 +83,29 @@ MoneyRails.configure do |config|
   #   sign_before_symbol: nil
   # }
 
+  # If you would like to use I18n localization (formatting depends on the
+  # locale):
+  # config.locale_backend = :i18n
+  #
+  # Example (using default localization from rails-i18n):
+  #
+  # I18n.locale = :en
+  # Money.new(10_000_00, 'USD').format # => $10,000.00
+  # I18n.locale = :es
+  # Money.new(10_000_00, 'USD').format # => $10.000,00
+  #
+  # For the legacy behaviour of "per currency" localization (formatting depends
+  # only on currency):
+  # config.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 config.default_format):
+  # config.locale_backend = nil
+
   # Set default raise_error_on_money_parsing option
   # It will be raise error if assigned different currency
   # The default value is false

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/migration_extensions/schema_statements_pg_rails4.rb

@@ -5,14 +5,15 @@ module MoneyRails
         def add_monetize(table_name, accessor, options={})
           [:amount, :currency].each do |attribute|
             column_present, *opts = OptionsExtractor.extract attribute, table_name, accessor, options
-            add_column(*opts) if column_present
+            constraints = opts.pop
+            add_column(*opts, **constraints) if column_present
           end
         end
 
         def remove_monetize(table_name, accessor, options={})
           [:amount, :currency].each do |attribute|
-            column_present, table_name, column_name, _, _ =  OptionsExtractor.extract attribute, table_name, accessor, options
-            remove_column table_name, column_name if column_present
+            column_present, table_name, column_name, type, _ =  OptionsExtractor.extract attribute, table_name, accessor, options
+            remove_column table_name, column_name, type if column_present
           end
         end
       end

data/lib/money-rails/active_record/migration_extensions/table_pg_rails4.rb

@@ -5,7 +5,8 @@ module MoneyRails
         def monetize(accessor, options={})
           [:amount, :currency].each do |attribute|
             column_present, _, *opts = OptionsExtractor.extract attribute, :no_table, accessor, options
-            column(*opts) if column_present
+            constraints = opts.pop
+            column(*opts, **constraints) if column_present
           end
         end
 

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/money.rb

@@ -21,4 +21,9 @@ class Money
       rules
     end
   end
+
+  # This is expected to be called by ActiveSupport when calling as_json an Money object
+  def to_hash
+    { cents: cents, currency_iso: currency.iso_code.to_s }
+  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.2'
+  VERSION = '1.15.0'
 end

data/money-rails.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |s|
 
   s.require_path = "lib"
 
-  s.add_dependency "money",         "~> 6.13.2"
-  s.add_dependency "monetize",      "~> 1.9.0"
+  s.add_dependency "money",         "~> 6.13"
+  s.add_dependency "monetize",      "~> 1.9"
   s.add_dependency "activesupport", ">= 3.0"
   s.add_dependency "railties",      ">= 3.0"
   s.add_dependency "mime-types",    "< 3" if RUBY_VERSION < '2.0' # mime-types > 3 depends on mime-types-data, which doesn't support ruby 1.9
@@ -36,4 +36,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-rails", "~> 3.0"
   s.add_development_dependency 'database_cleaner', '~> 1.6.1'
   s.add_development_dependency 'test-unit', '~> 3.0' if RUBY_VERSION >= '2.2'
+  s.add_development_dependency 'bundler'
+
+  if s.respond_to?(:metadata)
+    s.metadata['changelog_uri'] = 'https://github.com/RubyMoney/money-rails/blob/master/CHANGELOG.md'
+    s.metadata['source_code_uri'] = 'https://github.com/RubyMoney/money-rails/'
+    s.metadata['bug_tracker_uri'] = 'https://github.com/RubyMoney/money-rails/issues'
+  end
 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
@@ -237,7 +245,7 @@ if defined? ActiveRecord
         product.price = "12,23.24"
         expect(product.save).to be_falsey
         expect(product.errors[:price].size).to eq(1)
-        expect(product.errors[:price].first).to match(/must be a valid/)
+        expect(product.errors[:price].first).to match(/has invalid format/)
         expect(product.errors[:price].first).to match(/Got 12,23.24/)
       end
 
@@ -245,7 +253,7 @@ if defined? ActiveRecord
         product.price = "1.234,56"
         expect(product.save).to be_falsey
         expect(product.errors[:price].size).to eq(1)
-        expect(product.errors[:price].first).to match(/must be a valid/)
+        expect(product.errors[:price].first).to match(/has invalid format/)
         expect(product.errors[:price].first).to match(/Got 1.234,56/)
       end
 
@@ -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/dummy/db/schema.rb

@@ -1,60 +1,59 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151026220420) do
+ActiveRecord::Schema.define(version: 2015_10_26_220420) do
 
   create_table "dummy_products", force: :cascade do |t|
-    t.string   "currency"
-    t.integer  "price_cents"
+    t.string "currency"
+    t.integer "price_cents"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "products", force: :cascade do |t|
-    t.integer  "price_cents"
-    t.integer  "discount"
+    t.integer "price_cents"
+    t.integer "discount"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "bonus_cents"
-    t.integer  "optional_price_cents"
-    t.integer  "sale_price_amount",             default: 0, null: false
-    t.string   "sale_price_currency_code"
-    t.integer  "price_in_a_range_cents"
-    t.integer  "validates_method_amount_cents"
-    t.integer  "aliased_cents"
-    t.integer  "delivery_fee_cents"
-    t.integer  "restock_fee_cents"
-    t.integer  "reduced_price_cents"
-    t.string   "reduced_price_currency"
-    t.integer  "special_price_cents"
-    t.integer  "lambda_price_cents"
-    t.string   "skip_validation_price_cents"
+    t.integer "bonus_cents"
+    t.integer "optional_price_cents"
+    t.integer "sale_price_amount", default: 0, null: false
+    t.string "sale_price_currency_code"
+    t.integer "price_in_a_range_cents"
+    t.integer "validates_method_amount_cents"
+    t.integer "aliased_cents"
+    t.integer "delivery_fee_cents"
+    t.integer "restock_fee_cents"
+    t.integer "reduced_price_cents"
+    t.string "reduced_price_currency"
+    t.integer "special_price_cents"
+    t.integer "lambda_price_cents"
+    t.string "skip_validation_price_cents"
   end
 
   create_table "services", force: :cascade do |t|
-    t.integer  "charge_cents"
-    t.integer  "discount_cents"
+    t.integer "charge_cents"
+    t.integer "discount_cents"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "transactions", force: :cascade do |t|
-    t.integer  "amount_cents"
-    t.integer  "tax_cents"
-    t.string   "currency"
+    t.integer "amount_cents"
+    t.integer "tax_cents"
+    t.string "currency"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "optional_amount_cents"
+    t.integer "optional_amount_cents"
   end
 
 end

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

data/spec/money_spec.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe 'Money overrides' do
+  describe '.default_formatting_rules' do
+    it 'uses defauts set as individual options' do
+      allow(MoneyRails::Configuration).to receive(:symbol).and_return('£')
+
+      expect(Money.default_formatting_rules).to include(symbol: '£')
+    end
+
+    it 'ignores individual options that are nil' do
+      allow(MoneyRails::Configuration).to receive(:symbol).and_return(nil)
+
+      expect(Money.default_formatting_rules.keys).not_to include(:symbol)
+    end
+
+    it 'includes default_format options' do
+      allow(MoneyRails::Configuration).to receive(:default_format).and_return(symbol: '£')
+
+      expect(Money.default_formatting_rules).to include(symbol: '£')
+    end
+
+    it 'gives priority to original defaults' do
+      allow(Money).to receive(:orig_default_formatting_rules).and_return(symbol: '£')
+      allow(MoneyRails::Configuration).to receive(:symbol).and_return('€')
+      allow(MoneyRails::Configuration).to receive(:default_format).and_return(symbol: '€')
+
+      expect(Money.default_formatting_rules).to include(symbol: '£')
+    end
+  end
+
+  describe '#to_hash' do
+    it 'returns a hash with JSON representation' do
+      expect(Money.new(9_99, 'EUR').to_hash).to eq(cents: 9_99, currency_iso: 'EUR')
+      expect(Money.zero('USD').to_hash).to eq(cents: 0, currency_iso: 'USD')
+    end
+  end
+end

data/spec/mongoid/mongoid_spec.rb

@@ -16,7 +16,7 @@ if defined?(Mongoid) && ::Mongoid::VERSION.split('.').first.to_i > 2
     }
     let(:priceable_from_string_with_hyphen) { Priceable.create(price: '1-2 EUR' )}
     let(:priceable_from_string_with_unknown_currency) { Priceable.create(price: '1 TLDR') }
-    let(:priceable_with_infinite_precision) { Priceable.create(price: Money.new(BigDecimal.new('100.1'), 'EUR')) }
+    let(:priceable_with_infinite_precision) { Priceable.create(price: Money.new(BigDecimal('100.1'), 'EUR')) }
     let(:priceable_with_hash_field) {
       Priceable.create(price_hash: {
         key1: Money.new(100, "EUR"),
@@ -91,7 +91,7 @@ if defined?(Mongoid) && ::Mongoid::VERSION.split('.').first.to_i > 2
         end
 
         it "correctly mongoizes a Money object to a hash of cents and currency" do
-          expect(priceable_with_infinite_precision.price.cents).to eq(BigDecimal.new('100.1'))
+          expect(priceable_with_infinite_precision.price.cents).to eq(BigDecimal('100.1'))
           expect(priceable_with_infinite_precision.price.currency).to eq(Money::Currency.find('EUR'))
         end
       end

data/spec/mongoid/two_spec.rb

@@ -7,7 +7,7 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^2(.*)/
     let(:priceable_from_nil) { Priceable.create(price: nil) }
     let(:priceable_from_num) { Priceable.create(price: 1) }
     let(:priceable_from_string) { Priceable.create(price: '1 EUR' )}
-    let(:priceable_with_infinite_precision) { Priceable.create(price: Money.new(BigDecimal.new('100.1'), 'EUR')) }
+    let(:priceable_with_infinite_precision) { Priceable.create(price: Money.new(BigDecimal('100.1'), 'EUR')) }
     let(:priceable_from_string_with_hyphen) { Priceable.create(price: '1-2 EUR' )}
 
     context "serialize" do
@@ -40,7 +40,7 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^2(.*)/
         end
 
         it "mongoizes correctly a Money object to a hash of cents and currency" do
-          expect(priceable_with_infinite_precision.price.cents).to eq(BigDecimal.new('100.1'))
+          expect(priceable_with_infinite_precision.price.cents).to eq(BigDecimal('100.1'))
           expect(priceable_with_infinite_precision.price.currency).to eq(Money::Currency.find('EUR'))
         end
       end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: money-rails
 version: !ruby/object:Gem::Version
-  version: 1.13.2
+  version: 1.15.0
 platform: ruby
 authors:
 - Andreas Loupasakis
 - Shane Emmons
 - Simone Carletti
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-14 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.13.2
+        version: '6.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.13.2
+        version: '6.13'
 - !ruby/object:Gem::Dependency
   name: monetize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -124,6 +124,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This library provides integration of RubyMoney - Money gem with Rails
 email:
 - alup.rubymoney@gmail.com
@@ -135,7 +149,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- config/locales/money.da.yml
 - config/locales/money.en.yml
+- config/locales/money.ru.yml
 - lib/generators/money_rails/initializer_generator.rb
 - lib/generators/templates/money.rb
 - lib/money-rails.rb
@@ -165,6 +181,7 @@ files:
 - spec/configuration_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -221,6 +238,7 @@ files:
 - spec/dummy/script/rails
 - spec/helpers/action_view_extension_spec.rb
 - spec/helpers/form_helper_spec.rb
+- spec/money_spec.rb
 - spec/mongoid/mongoid_spec.rb
 - spec/mongoid/two_spec.rb
 - spec/spec_helper.rb
@@ -229,8 +247,11 @@ files:
 homepage: https://github.com/RubyMoney/money-rails
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  changelog_uri: https://github.com/RubyMoney/money-rails/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/RubyMoney/money-rails/
+  bug_tracker_uri: https://github.com/RubyMoney/money-rails/issues
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -245,9 +266,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Money gem integration with Rails
 test_files:
@@ -257,6 +277,7 @@ test_files:
 - spec/configuration_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -313,6 +334,7 @@ test_files:
 - spec/dummy/script/rails
 - spec/helpers/action_view_extension_spec.rb
 - spec/helpers/form_helper_spec.rb
+- spec/money_spec.rb
 - spec/mongoid/mongoid_spec.rb
 - spec/mongoid/two_spec.rb
 - spec/spec_helper.rb