Remove duplication between alias_attribute_method_definition and define_proxy_call

Author: rafaelfranca

activemodel/lib/active_model/attribute_methods.rb

@@ -231,21 +231,7 @@ def alias_attribute_method_definition(code_generator, pattern, new_name, old_nam
         call_args = []
         call_args << parameters if parameters
 
-        code_generator.define_cached_method(method_name, as: mangled_name, namespace: :alias_attribute) do |batch|
-          body = if CALL_COMPILABLE_REGEXP.match?(target_name)
-            "self.#{target_name}(#{call_args.join(", ")})"
-          else
-            call_args.unshift(":'#{target_name}'")
-            "send(#{call_args.join(", ")})"
-          end
-
-          modifier = parameters == FORWARD_PARAMETERS ? "ruby2_keywords " : ""
-
-          batch <<
-            "#{modifier}def #{mangled_name}(#{parameters || ''})" <<
-            body <<
-            "end"
-        end
+        define_call(code_generator, method_name, target_name, mangled_name, parameters, call_args, namespace: :alias_attribute)
       end
 
       # Is +new_name+ an alias?
@@ -424,11 +410,25 @@ def define_proxy_call(code_generator, name, proxy_target, parameters, *call_args
           call_args << parameters if parameters
           namespace = :"#{namespace}_#{proxy_target}_#{call_args.join("_")}}"
 
+          define_call(code_generator, name, proxy_target, mangled_name, parameters, call_args, namespace: namespace)
+        end
+
+        def build_mangled_name(name)
+          mangled_name = name
+
+          unless NAME_COMPILABLE_REGEXP.match?(name)
+            mangled_name = "__temp__#{name.unpack1("h*")}"
+          end
+
+          mangled_name
+        end
+
+        def define_call(code_generator, name, target_name, mangled_name, parameters, call_args, namespace:)
           code_generator.define_cached_method(name, as: mangled_name, namespace: namespace) do |batch|
-            body = if CALL_COMPILABLE_REGEXP.match?(proxy_target)
-              "self.#{proxy_target}(#{call_args.join(", ")})"
+            body = if CALL_COMPILABLE_REGEXP.match?(target_name)
+              "self.#{target_name}(#{call_args.join(", ")})"
             else
-              call_args.unshift(":'#{proxy_target}'")
+              call_args.unshift(":'#{target_name}'")
               "send(#{call_args.join(", ")})"
             end
 
@@ -441,16 +441,6 @@ def define_proxy_call(code_generator, name, proxy_target, parameters, *call_args
           end
         end
 
-        def build_mangled_name(name)
-          mangled_name = name
-
-          unless NAME_COMPILABLE_REGEXP.match?(name)
-            mangled_name = "__temp__#{name.unpack1("h*")}"
-          end
-
-          mangled_name
-        end
-
         class AttributeMethodPattern # :nodoc:
           attr_reader :prefix, :suffix, :proxy_target, :parameters