Merge branch 'main' into fix-monetized-attributes-class-discrepancy

Author: semmons99

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased
+
+- Allow monetizing methods with kwargs
+
 ## 1.15.0
 
 - Bump money version to ~> 6.16

LICENSE

@@ -1,7 +1,7 @@
 MIT License
 
 Copyright (c) 2012 Andreas Loupasakis
-Copyright (c) 2023 Shane Emmons
+Copyright (c) 2024 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

README.md

@@ -1,7 +1,7 @@
 # RubyMoney - Money-Rails
 
 [![Gem Version](https://badge.fury.io/rb/money-rails.svg)](http://badge.fury.io/rb/money-rails)
-[![Build Status](https://secure.travis-ci.org/RubyMoney/money-rails.svg?branch=master)](http://travis-ci.org/RubyMoney/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)
 
 ## Introduction
@@ -474,6 +474,12 @@ MoneyRails.configure do |config|
   #   symbol: nil,
   #   sign_before_symbol: nil
   # }
+
+  # Set whether an error should be raised when parsing money values
+  # This includes assigning to a monetized field with the wrong currency
+  # Default value is false
+  #
+  # config.raise_error_on_money_parsing = true
 end
 ```
 
@@ -493,6 +499,7 @@ end
 * `amount_column`: Provide values for the amount column (holding the fractional part of a money object).
 * `currency_column`: Provide default values or even disable (`present: false`) the currency column.
 * `rounding_mode`: Set `Money.rounding_mode` to one of the BigDecimal constants.
+* `raise_error_on_money_parsing`: Set whether errors should be raised when parsing money values
 
 ### Helpers
 

lib/money-rails/active_record/monetizable.rb

@@ -118,8 +118,8 @@ def monetize(*fields)
 
 
             # 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 @@ def track_monetized_attribute(name, value)
         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

spec/active_record/monetizable_spec.rb

@@ -725,6 +725,10 @@ class SubProduct < Product
           expect(transaction.total).to eq(Money.new(3000, :usd))
         end
 
+        it "constructs the money object from the mapped method value with arguments" do
+          expect(transaction.total(1, bar: 2)).to eq(Money.new(3003, :usd))
+        end
+
         it "allows currency column postfix to be blank" do
           allow(MoneyRails::Configuration).to receive(:currency_column) { { postfix: nil, column_name: 'currency' } }
           expect(dummy_product_with_nil_currency.price.currency).to eq(Money::Currency.find(:gbp))

spec/dummy/app/models/transaction.rb

@@ -7,7 +7,7 @@ class Transaction < ActiveRecord::Base
 
   monetize :optional_amount_cents, with_model_currency: :currency, allow_nil: true
 
-  def total_cents
-    return amount_cents + tax_cents
+  def total_cents(foo = 0, bar: 0)
+    amount_cents + tax_cents + foo + bar
   end
 end