money-rails 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f19bdc8ef198214c817707194397d89dcd4a4582839c3665fa44a5058eaf33bd
-  data.tar.gz: 04e6523eb3ed34e9ab2c2596c35fea84a415b38c7e0a57fbc9412f4aa71c0877
+  metadata.gz: cb63337354249ecd15c15695c269080edb51883d30b78f833256dbc1222a86b9
+  data.tar.gz: 809dcf758b84ae3a66edf286691f031dfc5fb68706cc604742fc5230e7a27c3b
 SHA512:
-  metadata.gz: 6007152fd6ec545f080eb112e35a53e531bbaca69f635e630934c4f0662fa6f071fa62dabc42af779b6d1e68a5e419a4084f3da0006729768418e2a8f6637df8
-  data.tar.gz: 3450cf3305d2c5facc50e919ead251cacf95da4f414f35a924d96dee7c6970a23d197b411f18f4f839ac1e6583b2eee4c5409b7337ba443373c4b7c2808977c3
+  metadata.gz: f52ce4f9d92e1352a962147882337fb17c04961b0b935760e0011d3d1d3a433250fe0d0cc3d9837943c912b48dda94b0dcdb82919f9fd98334ef894601e4f82b
+  data.tar.gz: 0d0fb9c5ef2adb1db3d1de67b7799059cedb5fb52610dc5eb44f605a31e398e37852f51bb583b039fec7ffd05b17a89abf1f9cb8889969078fdcf3c9d34b745a

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## Unreleased
 
+## 3.0.0
+
+- **Breaking change**: Drop support for Rails < 7.0
+- Allow `super` when overriding methods
+- Fix `MoneyRails::ActionViewExtension` not available during eager loading (#614)
+- Fix deprecation warning on the ActiveJob serializer to support future Rails 8.2 (#729)
+- Support Mongoid 8.x and 9.x
+- `MoneyRails::TestHelpers` can be used in Minitest
+
 ## 2.0.0
 
 - **Breaking change**: Requires `money` gem version ~> 7.0.

data/README.md

@@ -1,15 +1,15 @@
 # RubyMoney - Money-Rails
 
-[![Gem Version](https://badge.fury.io/rb/money-rails.svg)](http://badge.fury.io/rb/money-rails)
+[![Gem Version](https://badge.fury.io/rb/money-rails.svg)](https://rubygems.org/gems/money-rails)
 [![Ruby](https://github.com/RubyMoney/money-rails/actions/workflows/ruby.yml/badge.svg)](https://github.com/RubyMoney/money-rails/actions/workflows/ruby.yml)
-[![License](http://img.shields.io/:license-mit-green.svg?style=flat)](http://opensource.org/licenses/MIT)
+[![License](https://img.shields.io/:license-mit-green.svg?style=flat)](https://opensource.org/licenses/MIT)
 
 ## Introduction
 
-This library provides integration of the [money](http://github.com/Rubymoney/money) gem with Rails.
+This library provides integration of the [money](https://github.com/Rubymoney/money) gem with Rails.
 
 Use `monetize` to specify which fields you want to be backed by
-Money objects and helpers provided by the [money](http://github.com/Rubymoney/money)
+Money objects and helpers provided by the [money](https://github.com/Rubymoney/money)
 gem.
 
 Currently, this library is in active development mode, so if you would
@@ -130,9 +130,9 @@ monetize :optional_price_cents, allow_nil: true
 # in Migration
 def change
   add_monetize :products,
-               :optional_price,
-               amount: { null: true, default: nil },
-               currency: { null: true, default: nil }
+    :optional_price,
+    amount: { null: true, default: nil },
+    currency: { null: true, default: nil }
 end
 
 # now blank assignments are permitted
@@ -156,7 +156,7 @@ end
 #### Numericality validation options
 
 You can also pass along
-[numericality validation options](http://guides.rubyonrails.org/active_record_validations.html#numericality)
+[numericality validation options](https://guides.rubyonrails.org/active_record_validations.html#numericality)
 such as this:
 
 ```ruby
@@ -187,14 +187,14 @@ And you can also use `subunit_numericality` for subunit:
 
 ```ruby
 monetize :price_in_a_range_cents,
-         allow_nil: true,
-         subunit_numericality: {
-           greater_than_or_equal_to: 0,
-           less_than_or_equal_to: 100_00
-         }
+  allow_nil: true,
+  subunit_numericality: {
+    greater_than_or_equal_to: 0,
+    less_than_or_equal_to: 100_00
+  }
 ```
 
-### Mongoid 2.x and 3.x
+### Mongoid
 
 `Money` is available as a field type to supply during a field definition:
 
@@ -274,18 +274,14 @@ from a field in a configuration model called `Tenant` in this example:
 
 ```ruby
 # config/initializers/money.rb
-MoneyRails.configure do |config|
-  # set the default currency based on client configuration
-  config.default_currency = -> { Tenant.current.default_currency }
+ActiveSupport::Reloader.to_prepare do
+  MoneyRails.configure do |config|
+    # set the default currency based on client configuration
+    config.default_currency = -> { Tenant.current.default_currency }
+  end
 end
 ```
 
-Be aware that this **does not work in Rails 7+**, as the lambda is evaluated
-immediately, and therefore requires your model to be already loaded.
-Workarounds include wrapping the initialization in
-`ActiveSupport::Reloader.to_prepare`, or creating a function that rescues
-unloaded constants with an initialization-time default, and running that in your lambda.
-
 In many cases this is not enough, so there are some other options to
 meet your needs.
 
@@ -308,7 +304,7 @@ end
 Now `product.discount` and `product.bonus` will return a `Money` object using
 EUR as their currency, instead of the default USD.
 
-(This is not available in  Mongoid).
+(This is not available in Mongoid).
 
 #### Attribute Currency (`:with_currency`)
 
@@ -377,9 +373,6 @@ currency values, so they have the highest precedence.
 
 ```ruby
 class Transaction < ActiveRecord::Base
-  # This model has a separate currency column
-  attr_accessible :amount_cents, :currency, :tax_cents
-
   # Use model level currency
   register_currency :gbp
 
@@ -422,37 +415,39 @@ MoneyRails.configure do |config|
 
   # Default ActiveRecord migration configuration values for columns:
   #
-  # config.amount_column = { prefix: '',           # column name prefix
-  #                          postfix: '_cents',    # column name  postfix
-  #                          column_name: nil,     # full column name (overrides prefix, postfix and accessor name)
-  #                          type: :integer,       # column type
-  #                          present: true,        # column will be created
-  #                          null: false,          # other options will be treated as column options
-  #                          default: 0
-  #                        }
+  # config.amount_column = {
+  #   prefix: '',           # column name prefix
+  #   postfix: '_cents',    # column name  postfix
+  #   column_name: nil,     # full column name (overrides prefix, postfix and accessor name)
+  #   type: :integer,       # column type
+  #   present: true,        # column will be created
+  #   null: false,          # other options will be treated as column options
+  #   default: 0
+  # }
   #
-  # config.currency_column = { prefix: '',
-  #                            postfix: '_currency',
-  #                            column_name: nil,
-  #                            type: :string,
-  #                            present: true,
-  #                            null: false,
-  #                            default: 'USD'
-  #                          }
+  # config.currency_column = {
+  #   prefix: '',
+  #   postfix: '_currency',
+  #   column_name: nil,
+  #   type: :string,
+  #   present: true,
+  #   null: false,
+  #   default: 'USD'
+  # }
 
   # Register a custom currency
   #
   # Example:
   # config.register_currency = {
-  #   priority:            1,
-  #   iso_code:            "EU4",
-  #   name:                "Euro with subunit of 4 digits",
-  #   symbol:              "€",
-  #   symbol_first:        true,
-  #   subunit:             "Subcent",
-  #   subunit_to_unit:     10000,
+  #   priority: 1,
+  #   iso_code: "EU4",
+  #   name: "Euro with subunit of 4 digits",
+  #   symbol: "€",
+  #   symbol_first: true,
+  #   subunit: "Subcent",
+  #   subunit_to_unit: 10000,
   #   thousands_separator: ".",
-  #   decimal_mark:        ","
+  #   decimal_mark: ","
   # }
 
   # Specify a rounding mode
@@ -527,8 +522,34 @@ So `humanized_money` will ignore `config.default_format = { no_cents_if_whole: f
 
 ### Testing
 
-If you use Rspec there is a test helper implementation.
-Just write `require "money-rails/test_helpers"` in `spec_helper.rb`.
+The test helpers work with both RSpec and Minitest.
+
+#### RSpec
+
+If you use RSpec, just require the test helpers in `spec_helper.rb`:
+
+```ruby
+require "money-rails/test_helpers"
+```
+
+The helpers will automatically be included in your RSpec tests.
+
+#### Minitest
+
+If you use Minitest, require the test helpers and include them in your test class:
+
+```ruby
+require "money-rails/test_helpers"
+
+class ProductTest < Minitest::Test
+  include MoneyRails::TestHelpers
+
+  def test_monetizes_price
+    matcher = monetize(:price_cents)
+    assert matcher.matches?(Product)
+  end
+end
+```
 
 #### The `monetize` matcher
 
@@ -570,12 +591,12 @@ For examples on using the test_helpers look at
 
 ## Supported ORMs/ODMs
 
-* ActiveRecord (>= 6.1)
-* Mongoid (>= 2.x)
+* ActiveRecord (>= 7.0)
+* Mongoid (>= 7.x)
 
 ## Supported Ruby interpreters
 
-* MRI Ruby >= 3.0
+* MRI Ruby >= 3.1
 
 You can see a full list of the currently supported interpreters in
 [ruby.yml](https://github.com/RubyMoney/money-rails/blob/main/.github/workflows/ruby.yml)
@@ -592,18 +613,8 @@ You can see a full list of the currently supported interpreters in
 
 ### How to run the tests
 
-Our tests are executed with several ORMs - see `Rakefile` for details. To install all required gems run `rake spec:all` That command will take care of installing all required gems for all the different Gemfiles and then running the test suite with the installed bundle.
+Our tests are executed with several ORMs - see `Rakefile` for details. To install all required gems run `rake spec:all`. That command will take care of installing all required gems for all the different Gemfiles and then running the test suite with the installed bundle.
 
 You can also run the test suite against a specific ORM or Rails version, `rake -T` will give you an idea of the possible task (take a look at the tasks under the spec: namespace).
 
-If you are testing against mongoid, make sure to have the mongod process running before executing the suite,  (E.g. `sudo mongod --quiet`)
-
-## Maintainers
-
-* Andreas Loupasakis (https://github.com/alup)
-* Shane Emmons (https://github.com/semmons99)
-* Simone Carletti (https://github.com/weppos)
-
-## License
-
-[MIT License](https://github.com/RubyMoney/money-rails/blob/main/LICENSE). Copyright 2023 RubyMoney.
+If you are testing against mongoid, make sure to have the mongod process running before executing the suite. (E.g. `sudo mongod --quiet`)

data/lib/money-rails/active_job/money_serializer.rb

@@ -14,6 +14,10 @@ module MoneyRails
       def deserialize(hash)
         Money.new(hash["cents"], hash["currency"])
       end
+
+      def klass
+        Money
+      end
     end
   end
 end

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

@@ -9,6 +9,8 @@ module MoneyRails
       extend ActiveSupport::Concern
 
       module ClassMethods
+        MODULE_NAME = :DynamicMoneyAttributes
+
         def monetized_attributes
           monetized_attributes = @monetized_attributes || {}.with_indifferent_access
 
@@ -116,23 +118,31 @@ module MoneyRails
               end
             end
 
-
-            # Getter for monetized attribute
-            define_method name do |*args, **kwargs|
-              read_monetized name, subunit_name, options, *args, **kwargs
+            if const_defined?(MODULE_NAME, false)
+              mod = const_get(MODULE_NAME)
+            else
+              mod = const_set(MODULE_NAME, Module.new)
+              include mod
             end
 
-            # Setter for monetized attribute
-            define_method "#{name}=" do |value|
-              write_monetized name, subunit_name, value, validation_enabled, instance_currency_name, options
-            end
+            mod.module_eval do
+              # Getter for monetized attribute
+              define_method name do |*args, **kwargs|
+                read_monetized name, subunit_name, options, *args, **kwargs
+              end
+
+              # Setter for monetized attribute
+              define_method "#{name}=" do |value|
+                write_monetized name, subunit_name, value, validation_enabled, instance_currency_name, options
+              end
 
-            if validation_enabled
-              # Ensure that the before_type_cast value is cleared when setting
-              # the subunit value directly
-              define_method "#{subunit_name}=" do |value|
-                instance_variable_set "@#{name}_money_before_type_cast", nil
-                write_attribute(subunit_name, value)
+              if validation_enabled
+                # Ensure that the before_type_cast value is cleared when setting
+                # the subunit value directly
+                define_method "#{subunit_name}=" do |value|
+                  instance_variable_set "@#{name}_money_before_type_cast", nil
+                  write_attribute(subunit_name, value)
+                end
               end
             end
 

data/lib/money-rails/hooks.rb

@@ -8,30 +8,13 @@ module MoneyRails
         require 'money-rails/active_model/validator'
         require 'money-rails/active_record/monetizable'
         ::ActiveRecord::Base.send :include, MoneyRails::ActiveRecord::Monetizable
-        if defined?(::ActiveRecord) && defined?(::ActiveRecord::VERSION)
-          if ::ActiveRecord::VERSION::MAJOR >= 4
-            rails42               = case
-                                    when ::ActiveRecord::VERSION::MAJOR < 5 && ::ActiveRecord::VERSION::MINOR >= 2
-                                      true
-                                    when ::ActiveRecord::VERSION::MAJOR >= 5
-                                      true
-                                    else
-                                      false
-                                    end
 
-            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
+        current_adapter = ::ActiveRecord::Base.connection_db_config.configuration_hash[:adapter]
+        postgresql_with_money = PG_ADAPTERS.include?(current_adapter)
 
         require "money-rails/active_record/migration_extensions/options_extractor"
         %w{schema_statements table}.each do |file|
-          require "money-rails/active_record/migration_extensions/#{file}_pg_rails4"
+          require "money-rails/active_record/migration_extensions/#{file}_pg"
           if !postgresql_with_money
             require "money-rails/active_record/migration_extensions/#{file}"
           end
@@ -44,17 +27,12 @@ module MoneyRails
       # For Mongoid
       begin; require 'mongoid'; require 'mongoid/version'; rescue LoadError; end
       if defined? ::Mongoid
-        if ::Mongoid::VERSION =~ /^2(.*)/
-          require 'money-rails/mongoid/two' # Loading the file is enough
-        else
-          require 'money-rails/mongoid/money'
-        end
+        require 'money-rails/mongoid/money'
       end
 
       # For ActionView
       ActiveSupport.on_load(:action_view) do
-        require 'money-rails/helpers/action_view_extension'
-        ::ActionView::Base.send :include, MoneyRails::ActionViewExtension
+        ::ActionView::Base.include MoneyRails::ActionViewExtension
       end
 
       # For ActiveSupport

data/lib/money-rails/mongoid/money.rb

@@ -3,8 +3,8 @@ class Money
   # Converts an object of this instance into a database friendly value.
   def mongoize
     {
-      cents:        cents.mongoize.to_f,
-      currency_iso: currency.iso_code.mongoize
+      cents:        cents.to_f,
+      currency_iso: currency.iso_code
     }
   end
 
@@ -14,14 +14,8 @@ class Money
     # this custom class from it.
     def demongoize(object)
       if object.is_a?(Hash)
-        if object.respond_to?(:deep_symbolize_keys)
-          object = object.deep_symbolize_keys
-        else
-          object = object.symbolize_keys
-        end
+        object = object.symbolize_keys
         object.has_key?(:cents) ? ::Money.new(object[:cents], object[:currency_iso]) : nil
-      else
-        nil
       end
     end
 
@@ -48,11 +42,7 @@ class Money
     private
 
     def mongoize_hash(hash)
-      if hash.respond_to?(:deep_symbolize_keys!)
-        hash.deep_symbolize_keys!
-      elsif hash.respond_to?(:symbolize_keys!)
-        hash.symbolize_keys!
-      end
+      hash = hash.symbolize_keys
 
       # Guard for a blank form
       return nil if hash[:cents] == '' && hash[:currency_iso] == ''

data/lib/money-rails/test_helpers.rb

@@ -1,5 +1,3 @@
-require 'rspec/expectations'
-
 module MoneyRails
   module TestHelpers
     def monetize(attribute)
@@ -113,6 +111,8 @@ module MoneyRails
   end
 end
 
-RSpec.configure do |config|
-  config.include MoneyRails::TestHelpers
+if defined?(RSpec)
+  RSpec.configure do |config|
+    config.include MoneyRails::TestHelpers
+  end
 end

data/lib/money-rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MoneyRails
-  VERSION = "2.0.0"
+  VERSION = "3.0.0"
 end

data/lib/money-rails.rb

@@ -8,6 +8,8 @@ require 'money-rails/hooks'
 require 'money-rails/errors'
 
 module MoneyRails
+  autoload :ActionViewExtension, 'money-rails/helpers/action_view_extension'
+
   extend Configuration
 end
 

data/money-rails.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency "money",         "~> 7.0"
   s.add_dependency "monetize",      "~> 2.0"
-  s.add_dependency "activesupport", ">= 6.1"
-  s.add_dependency "railties",      ">= 6.1"
+  s.add_dependency "activesupport", ">= 7.0"
+  s.add_dependency "railties",      ">= 7.0"
 
   if s.respond_to?(:metadata)
     s.metadata["changelog_uri"] = "https://github.com/RubyMoney/money-rails/blob/master/CHANGELOG.md"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Andreas Loupasakis
@@ -9,7 +9,7 @@ authors:
 - Simone Carletti
 bindir: bin
 cert_chain: []
-date: 2025-12-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -45,28 +45,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 description: This library provides integration of RubyMoney - Money gem with Rails
 email:
 - alup.rubymoney@gmail.com
@@ -88,9 +88,9 @@ files:
 - lib/money-rails/active_model/validator.rb
 - lib/money-rails/active_record/migration_extensions/options_extractor.rb
 - lib/money-rails/active_record/migration_extensions/schema_statements.rb
-- lib/money-rails/active_record/migration_extensions/schema_statements_pg_rails4.rb
+- lib/money-rails/active_record/migration_extensions/schema_statements_pg.rb
 - lib/money-rails/active_record/migration_extensions/table.rb
-- lib/money-rails/active_record/migration_extensions/table_pg_rails4.rb
+- lib/money-rails/active_record/migration_extensions/table_pg.rb
 - lib/money-rails/active_record/monetizable.rb
 - lib/money-rails/configuration.rb
 - lib/money-rails/engine.rb
@@ -99,7 +99,6 @@ files:
 - lib/money-rails/hooks.rb
 - lib/money-rails/money.rb
 - lib/money-rails/mongoid/money.rb
-- lib/money-rails/mongoid/two.rb
 - lib/money-rails/rails_admin.rb
 - lib/money-rails/railtie.rb
 - lib/money-rails/test_helpers.rb
@@ -127,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Money gem integration with Rails
 test_files: []

data/lib/money-rails/mongoid/two.rb

@@ -1,35 +0,0 @@
-# Class name does not really matches the folder hierarchy, because
-# in order for (de)serialization to work, the class must be re-opened.
-# But this file brings mongoid 2.X compat., so...
-
-class Money
-  include ::Mongoid::Fields::Serializable
-
-  # Mongo friendly -> Money
-  def deserialize(object)
-    return nil if object.nil?
-
-    object = object.with_indifferent_access
-    ::Money.new object[:cents], object[:currency_iso]
-  end
-
-  # Money -> Mongo friendly
-  def serialize(object)
-    case
-    when object.is_a?(Money)
-      {
-        cents:        object.cents.is_a?(BigDecimal) ? object.cents.to_s : object.cents,
-        currency_iso: object.currency.iso_code
-      }
-    when object.nil? then nil
-    when object.respond_to?(:to_money)
-      begin
-        serialize(object.to_money)
-      rescue Monetize::ParseError => e
-        raise MoneyRails::Error, e.message if MoneyRails.raise_error_on_money_parsing
-        nil
-      end
-    else nil
-    end
-  end
-end