money-rails 1.14.0 → 2.0.0

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

@@ -10,7 +10,7 @@ module MoneyRails
 
       module ClassMethods
         def monetized_attributes
-          monetized_attributes = @monetized_attributes || {}
+          monetized_attributes = @monetized_attributes || {}.with_indifferent_access
 
           if superclass.respond_to?(:monetized_attributes)
             monetized_attributes.merge(superclass.monetized_attributes)
@@ -118,8 +118,8 @@ module MoneyRails
 
 
             # Getter for monetized attribute
-            define_method name do |*args|
-              read_monetized name, subunit_name, options, *args
+            define_method name do |*args, **kwargs|
+              read_monetized name, subunit_name, options, *args, **kwargs
             end
 
             # Setter for monetized attribute
@@ -178,9 +178,19 @@ module MoneyRails
         end
       end
 
-      def read_monetized(name, subunit_name, options = {}, *args)
-        # Get the cents
-        amount = public_send(subunit_name, *args)
+      def read_monetized(name, subunit_name, options = nil, *args, **kwargs)
+        # Ruby 2.x compatibility
+        if options.nil?
+          options = kwargs
+          kwargs = {}
+        end
+
+        if kwargs.any?
+          amount = public_send(subunit_name, *args, **kwargs)
+        else
+          # Ruby 2.x does not allow empty kwargs
+          amount = public_send(subunit_name, *args)
+        end
 
         return if amount.nil? && options[:allow_nil]
         # Get the currency object
@@ -195,7 +205,7 @@ module MoneyRails
             result = memoized
           else
             memoized_amount = memoized.amount.to_money(attr_currency)
-            write_attribute subunit_name, memoized_amount.cents
+            write_attribute subunit_name, memoized_amount.cents if has_attribute? subunit_name
             # Cache the value (it may be nil)
             result = instance_variable_set("@#{name}", memoized_amount)
           end

data/lib/money-rails/configuration.rb

@@ -20,7 +20,7 @@ module MoneyRails
     # Configuration parameters
 
     def default_currency
-      Money::Currency.new(Money.default_currency)
+      Money::Currency.new(Money.default_currency) if Money.default_currency
     end
 
     # Set default currency of money library
@@ -35,7 +35,7 @@ module MoneyRails
     end
 
     def set_currency_column_for_default_currency!
-      iso_code = default_currency.iso_code
+      iso_code = default_currency && default_currency.iso_code
       currency_column.merge! default: iso_code
     end
 

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

@@ -53,7 +53,7 @@ module MoneyRails
 
       value = value.to_money
 
-      format "%0#{value.currency.exponent}d", (value % value.currency.subunit_to_unit).cents
+      format "%0#{value.currency.exponent}d", (value.abs % value.currency.subunit_to_unit).cents
     end
   end
 end

data/lib/money-rails/hooks.rb

@@ -56,6 +56,17 @@ module MoneyRails
         require 'money-rails/helpers/action_view_extension'
         ::ActionView::Base.send :include, MoneyRails::ActionViewExtension
       end
+
+      # For ActiveSupport
+      ActiveSupport.on_load(:active_job) do |v|
+        if defined?(::ActiveJob::Serializers)
+          require 'money-rails/active_job/money_serializer'
+          Rails.application.config.active_job.tap do |config|
+            config.custom_serializers ||= []
+            config.custom_serializers << MoneyRails::ActiveJob::MoneySerializer
+          end
+        end
+      end
     end
   end
 end

data/lib/money-rails/version.rb

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

data/money-rails.gemspec

@@ -1,5 +1,6 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/money-rails/version', __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path("lib/money-rails/version", __dir__)
 
 Gem::Specification.new do |s|
   s.name          = "money-rails"
@@ -12,35 +13,21 @@ Gem::Specification.new do |s|
   s.summary       = "Money gem integration with Rails"
   s.homepage      = "https://github.com/RubyMoney/money-rails"
 
-  s.files         =  Dir.glob("{lib,spec,config}/**/*")
-  s.files         += %w(CHANGELOG.md LICENSE README.md)
-  s.files         += %w(Rakefile money-rails.gemspec)
-
-  s.files.delete("spec/dummy/log")
-  s.files.delete("spec/dummy/log/development.log")
-  s.files.delete("spec/dummy/log/test.log")
-  s.files.delete("spec/dummy/db/development.sqlite3")
-  s.files.delete("spec/dummy/db/test.sqlite3")
-
-  s.test_files    = s.files.grep(/^spec\//)
+  s.files = `git ls-files -z -- lib/ config/ CHANGELOG.md LICENSE *.gemspec README.md`.split("\x0")
 
   s.require_path = "lib"
 
-  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"
-  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
+  s.required_ruby_version = ">= 3.1"
 
-  s.add_development_dependency "rails",       ">= 3.0"
-  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'
+  s.add_dependency "money",         "~> 7.0"
+  s.add_dependency "monetize",      "~> 2.0"
+  s.add_dependency "activesupport", ">= 6.1"
+  s.add_dependency "railties",      ">= 6.1"
 
   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'
+    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"
+    s.metadata["rubygems_mfa_required"] = "true"
   end
 end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: money-rails
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Andreas Loupasakis
 - Shane Emmons
 - Simone Carletti
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2025-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -18,126 +17,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.13.2
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.13.2
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: monetize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.1
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !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'
+        version: '6.1'
 description: This library provides integration of RubyMoney - Money gem with Rails
 email:
 - alup.rubymoney@gmail.com
@@ -148,12 +77,14 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
-- Rakefile
 - config/locales/money.da.yml
 - config/locales/money.en.yml
+- config/locales/money.pt.yml
+- config/locales/money.ru.yml
 - lib/generators/money_rails/initializer_generator.rb
 - lib/generators/templates/money.rb
 - lib/money-rails.rb
+- lib/money-rails/active_job/money_serializer.rb
 - 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
@@ -174,75 +105,6 @@ files:
 - lib/money-rails/test_helpers.rb
 - lib/money-rails/version.rb
 - money-rails.gemspec
-- spec/active_record/migration_extensions/schema_statements_spec.rb
-- spec/active_record/migration_extensions/table_spec.rb
-- spec/active_record/monetizable_spec.rb
-- 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
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/dummy_product.rb
-- spec/dummy/app/models/priceable.rb
-- spec/dummy/app/models/product.rb
-- spec/dummy/app/models/service.rb
-- spec/dummy/app/models/transaction.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/money.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en-GB.yml
-- spec/dummy/config/locales/en-US.yml
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/locales/it.yml
-- spec/dummy/config/mongoid.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/db/migrate/20120331190108_create_products.rb
-- spec/dummy/db/migrate/20120402080348_add_bonus_cents_to_product.rb
-- spec/dummy/db/migrate/20120524052716_create_services.rb
-- spec/dummy/db/migrate/20120528181002_create_transactions.rb
-- spec/dummy/db/migrate/20120528210103_create_dummy_products.rb
-- spec/dummy/db/migrate/20120607210247_add_column_that_allows_nil.rb
-- spec/dummy/db/migrate/20120712202655_add_sale_price_cents_to_product.rb
-- spec/dummy/db/migrate/20130124023419_add_price_in_a_range_cents_to_products.rb
-- spec/dummy/db/migrate/20140110194016_add_validates_method_amount_cents_to_products.rb
-- spec/dummy/db/migrate/20141005075025_add_aliased_attr_to_products.rb
-- spec/dummy/db/migrate/20150107061030_add_delivery_fee_cents_and_restock_fee_cents_to_product.rb
-- spec/dummy/db/migrate/20150126231442_add_reduced_price_to_products.rb
-- spec/dummy/db/migrate/20150213234410_add_special_price_to_products.rb
-- spec/dummy/db/migrate/20150217222612_add_lambda_price_to_products.rb
-- spec/dummy/db/migrate/20150303222230_add_skip_validation_price_cents_to_products.rb
-- spec/dummy/db/migrate/20151026220420_add_optional_amount_to_transactions.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/db/structure.sql
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- 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
-- spec/support/database_cleaner.rb
-- spec/test_helpers_spec.rb
 homepage: https://github.com/RubyMoney/money-rails
 licenses:
 - MIT
@@ -250,7 +112,7 @@ 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:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -258,84 +120,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.6.5
 specification_version: 4
 summary: Money gem integration with Rails
-test_files:
-- spec/active_record/migration_extensions/schema_statements_spec.rb
-- spec/active_record/migration_extensions/table_spec.rb
-- spec/active_record/monetizable_spec.rb
-- 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
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/dummy_product.rb
-- spec/dummy/app/models/priceable.rb
-- spec/dummy/app/models/product.rb
-- spec/dummy/app/models/service.rb
-- spec/dummy/app/models/transaction.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/money.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en-GB.yml
-- spec/dummy/config/locales/en-US.yml
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/locales/it.yml
-- spec/dummy/config/mongoid.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/db/migrate/20120331190108_create_products.rb
-- spec/dummy/db/migrate/20120402080348_add_bonus_cents_to_product.rb
-- spec/dummy/db/migrate/20120524052716_create_services.rb
-- spec/dummy/db/migrate/20120528181002_create_transactions.rb
-- spec/dummy/db/migrate/20120528210103_create_dummy_products.rb
-- spec/dummy/db/migrate/20120607210247_add_column_that_allows_nil.rb
-- spec/dummy/db/migrate/20120712202655_add_sale_price_cents_to_product.rb
-- spec/dummy/db/migrate/20130124023419_add_price_in_a_range_cents_to_products.rb
-- spec/dummy/db/migrate/20140110194016_add_validates_method_amount_cents_to_products.rb
-- spec/dummy/db/migrate/20141005075025_add_aliased_attr_to_products.rb
-- spec/dummy/db/migrate/20150107061030_add_delivery_fee_cents_and_restock_fee_cents_to_product.rb
-- spec/dummy/db/migrate/20150126231442_add_reduced_price_to_products.rb
-- spec/dummy/db/migrate/20150213234410_add_special_price_to_products.rb
-- spec/dummy/db/migrate/20150217222612_add_lambda_price_to_products.rb
-- spec/dummy/db/migrate/20150303222230_add_skip_validation_price_cents_to_products.rb
-- spec/dummy/db/migrate/20151026220420_add_optional_amount_to_transactions.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/db/structure.sql
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- 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
-- spec/support/database_cleaner.rb
-- spec/test_helpers_spec.rb
+test_files: []

data/Rakefile

@@ -1,84 +0,0 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-require 'bundler/gem_tasks'
-
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-GEMFILES_PATH = 'gemfiles/*.gemfile'.freeze
-
-load 'rails/tasks/engine.rake' if File.exist?(APP_RAKEFILE)
-
-require 'rake'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new
-
-task default: "spec:all"
-task test: :spec
-task spec: :prepare_test_env
-
-desc "Prepare money-rails engine test environment"
-task :prepare_test_env do
-  Rake.application['app:db:drop:all'].invoke
-  Rake.application['app:db:create'].invoke if Rails::VERSION::MAJOR >= 5
-  Rake.application['app:db:migrate'].invoke
-  Rake.application['app:db:test:prepare'].invoke
-end
-
-def run_with_gemfile(gemfile)
-  Bundler.with_clean_env do
-    begin
-      sh "BUNDLE_GEMFILE='#{gemfile}' bundle install --quiet"
-      Rake.application['app:db:create'].invoke
-      Rake.application['app:db:test:prepare'].invoke
-      sh "BUNDLE_GEMFILE='#{gemfile}' bundle exec rake spec"
-    ensure
-      Rake.application['app:db:drop:all'].execute
-    end
-  end
-end
-
-namespace :spec do
-  frameworks_versions = {}
-
-  Dir[GEMFILES_PATH].each do |gemfile|
-    file_name = File.basename(gemfile, '.gemfile')
-    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
-
-    desc "Run Tests against #{framework} #{[major, minor].compact.join('.')}"
-    task(file_name) { run_with_gemfile gemfile }
-  end
-
-  frameworks_versions.each do |framework, versions|
-    desc "Run Tests against all supported #{framework} versions"
-    task framework => versions
-  end
-
-  desc 'Run Tests against all ORMs'
-  task all: frameworks_versions.keys
-end
-
-desc "Update CONTRIBUTORS file"
-task :contributors do
-  sh "git shortlog -s | awk '{ print $2 \" \" $3 }' > CONTRIBUTORS"
-end