Defined attribute should not expand positional hash argument

activemodel/lib/active_model/attribute_methods.rb

@@ -364,14 +364,13 @@ def attribute_method_matchers_matching(method_name)
         # using the given `extra` args. This falls back on `define_method`
         # and `send` if the given names cannot be compiled.
         def define_proxy_call(include_private, mod, name, target, *extra)
-          kw = RUBY_VERSION >= "2.7" ? ", **options" : nil
           defn = if NAME_COMPILABLE_REGEXP.match?(name)
-            "def #{name}(*args#{kw})"
+            "def #{name}(*args)"
           else
-            "define_method(:'#{name}') do |*args#{kw}|"
+            "define_method(:'#{name}') do |*args|"
           end
 
-          extra = (extra.map!(&:inspect) << "*args#{kw}").join(", ")
+          extra = (extra.map!(&:inspect) << "*args").join(", ")
 
           body = if CALL_COMPILABLE_REGEXP.match?(target)
             "#{"self." unless include_private}#{target}(#{extra})"
@@ -383,6 +382,7 @@ def define_proxy_call(include_private, mod, name, target, *extra)
             #{defn}
               #{body}
             end
+            ruby2_keywords(:'#{name}') if respond_to?(:ruby2_keywords, true)
           RUBY
         end
 

activemodel/test/cases/attribute_methods_test.rb

@@ -33,7 +33,9 @@ def attribute(name)
     attributes[name.to_s]
   end
 
-  alias attribute_test attribute
+  def attribute_test(name, attrs = {})
+    attrs[name] = attribute(name)
+  end
 
   def private_method
     "<3 <3"
@@ -212,9 +214,25 @@ def foo
   test "accessing a suffixed attribute" do
     m = ModelWithAttributes2.new
     m.attributes = { "foo" => "bar" }
+    attrs = {}
 
     assert_equal "bar", m.foo
-    assert_equal "bar", m.foo_test
+    assert_equal "bar", m.foo_test(attrs)
+    assert_equal "bar", attrs["foo"]
+  end
+
+  test "defined attribute doesn't expand positional hash argument" do
+    ModelWithAttributes2.define_attribute_methods(:foo)
+
+    m = ModelWithAttributes2.new
+    m.attributes = { "foo" => "bar" }
+    attrs = {}
+
+    assert_equal "bar", m.foo
+    assert_equal "bar", m.foo_test(attrs)
+    assert_equal "bar", attrs["foo"]
+  ensure
+    ModelWithAttributes2.undefine_attribute_methods
   end
 
   test "should not interfere with method_missing if the attr has a private/protected method" do