activemodel 7.1.3.4 → 7.1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62a8e27551c3779ec7676e6d2e0e66c13c2a8f95c88562722bfdcb8d9d319f2f
-  data.tar.gz: 2cd6f1f9bcf63a13c2688fbc6854d1173f657bfecbfca5ef9a24bd06b5c61f32
+  metadata.gz: e89137dfa40b068e71b94112ef2591344ea839e3e077c3b1c97cb15bf8248119
+  data.tar.gz: 7bc83d36358978fd5f9ed4d54f58d2e80eac9a05fd5b5464130beec1fc8eb745
 SHA512:
-  metadata.gz: 1e2132e134510005376a33192f81e408fdc3e5813f368c7c8a0ce2b00328d963c94970549219a7e9b2352136a8c223da5bb2e753e9cae9e43ce2b0f6304ad8df
-  data.tar.gz: bb81aaefa19e40042623a008d8e4d0e062f35590f4150eabb6349dd0b394b3b0d58276b2acdf17137a09c4f25a97caf011069590ff09cebb43581a3d7549919b
+  metadata.gz: 5774c02cbdd72532211828a0410af3bb5215ac937e8868809257206c4798a76051a484cfa7a0d3e19476ad6339c1076ae1b5d2055ce78b3fdde4641d9cef9086
+  data.tar.gz: 615a9ed964889e21a90432b6c08411f03df07836a66de01bf9079b44979e2779032667c568873569a436e40b030b62d9c7c7aed7ac20fe74f4c905c8eaa8d5da

data/CHANGELOG.md

@@ -1,3 +1,50 @@
+## Rails 7.1.5.2 (August 13, 2025) ##
+
+*   No changes.
+
+
+## Rails 7.1.5.1 (December 10, 2024) ##
+
+*   No changes.
+
+
+## Rails 7.1.5 (October 30, 2024) ##
+
+*   Fix regression in `alias_attribute` to work with user defined methods.
+
+    `alias_attribute` would wrongly assume the attribute accessor was generated by Active Model.
+
+    ```ruby
+    class Person
+      include ActiveModel::AttributeMethods
+
+      define_attribute_methods :name
+      attr_accessor :name
+
+      alias_attribute :full_name, :name
+    end
+
+    person.full_name # => NoMethodError: undefined method `attribute' for an instance of Person
+    ```
+
+    *Jean Boussier*
+
+
+## Rails 7.1.4.2 (October 23, 2024) ##
+
+*   No changes.
+
+
+## Rails 7.1.4.1 (October 15, 2024) ##
+
+*   No changes.
+
+
+## Rails 7.1.4 (August 22, 2024) ##
+
+*   No changes.
+
+
 ## Rails 7.1.3.4 (June 04, 2024) ##
 
 *   No changes.

data/lib/active_model/attribute_methods.rb

@@ -215,9 +215,12 @@ module ActiveModel
         end
       end
 
-      def generate_alias_attribute_methods(code_generator, new_name, old_name)
-        attribute_method_patterns.each do |pattern|
-          alias_attribute_method_definition(code_generator, pattern, new_name, old_name)
+      def generate_alias_attribute_methods(code_generator, new_name, old_name) # :nodoc:
+        ActiveSupport::CodeGenerator.batch(code_generator, __FILE__, __LINE__) do |owner|
+          attribute_method_patterns.each do |pattern|
+            alias_attribute_method_definition(code_generator, pattern, new_name, old_name)
+          end
+          attribute_method_patterns_cache.clear
         end
       end
 
@@ -231,7 +234,7 @@ module ActiveModel
           mangled_name = "__temp__#{target_name.unpack1("h*")}"
         end
 
-        code_generator.define_cached_method(method_name, as: mangled_name, namespace: :alias_attribute) do |batch|
+        code_generator.define_cached_method(mangled_name, as: method_name, namespace: :alias_attribute) do |batch|
           body = if CALL_COMPILABLE_REGEXP.match?(target_name)
             "self.#{target_name}(#{parameters || ''})"
           else
@@ -321,25 +324,44 @@ module ActiveModel
       #   person.name = 'Bob'
       #   person.name        # => "Bob"
       #   person.name_short? # => true
-      def define_attribute_method(attr_name, _owner: generated_attribute_methods)
+      def define_attribute_method(attr_name, _owner: generated_attribute_methods, as: attr_name)
         ActiveSupport::CodeGenerator.batch(_owner, __FILE__, __LINE__) do |owner|
           attribute_method_patterns.each do |pattern|
-            method_name = pattern.method_name(attr_name)
-
-            unless instance_method_already_implemented?(method_name)
-              generate_method = "define_method_#{pattern.proxy_target}"
-
-              if respond_to?(generate_method, true)
-                send(generate_method, attr_name.to_s, owner: owner)
-              else
-                define_proxy_call(owner, method_name, pattern.proxy_target, pattern.parameters, attr_name.to_s, namespace: :active_model_proxy)
-              end
-            end
+            define_attribute_method_pattern(pattern, attr_name, owner: owner, as: as)
           end
           attribute_method_patterns_cache.clear
         end
       end
 
+      def define_attribute_method_pattern(pattern, attr_name, owner:, as:, override: false) # :nodoc:
+        canonical_method_name = pattern.method_name(attr_name)
+        public_method_name = pattern.method_name(as)
+
+        # If defining a regular attribute method, we don't override methods that are explictly
+        # defined in parrent classes.
+        if instance_method_already_implemented?(public_method_name)
+          # However, for `alias_attribute`, we always define the method.
+          # We check for override second because `instance_method_already_implemented?`
+          # also check for dangerous methods.
+          return unless override
+        end
+
+        generate_method = "define_method_#{pattern.proxy_target}"
+        if respond_to?(generate_method, true)
+          send(generate_method, attr_name.to_s, owner: owner, as: as)
+        else
+          define_proxy_call(
+            owner,
+            canonical_method_name,
+            pattern.proxy_target,
+            pattern.parameters,
+            attr_name.to_s,
+            namespace: :active_model_proxy,
+            as: public_method_name,
+          )
+        end
+      end
+
       # Removes all the previously dynamically defined methods from the class, including alias attribute methods.
       #
       #   class Person
@@ -418,7 +440,7 @@ module ActiveModel
         # Define a method `name` in `mod` that dispatches to `send`
         # using the given `extra` args. This falls back on `send`
         # if the called name cannot be compiled.
-        def define_proxy_call(code_generator, name, proxy_target, parameters, *call_args, namespace:)
+        def define_proxy_call(code_generator, name, proxy_target, parameters, *call_args, namespace:, as: name)
           mangled_name = name
           unless NAME_COMPILABLE_REGEXP.match?(name)
             mangled_name = "__temp__#{name.unpack1("h*")}"
@@ -426,9 +448,9 @@ module ActiveModel
 
           call_args.map!(&:inspect)
           call_args << parameters if parameters
-          namespace = :"#{namespace}_#{proxy_target}_#{call_args.join("_")}}"
+          namespace = :"#{namespace}_#{proxy_target}"
 
-          code_generator.define_cached_method(name, as: mangled_name, namespace: namespace) do |batch|
+          code_generator.define_cached_method(mangled_name, as: as, namespace: namespace) do |batch|
             body = if CALL_COMPILABLE_REGEXP.match?(proxy_target)
               "self.#{proxy_target}(#{call_args.join(", ")})"
             else

data/lib/active_model/attributes.rb

@@ -76,11 +76,11 @@ module ActiveModel
       end
 
       private
-        def define_method_attribute=(name, owner:)
+        def define_method_attribute=(canonical_name, owner:, as: canonical_name)
           ActiveModel::AttributeMethods::AttrNames.define_attribute_accessor_method(
-            owner, name, writer: true,
+            owner, canonical_name, writer: true,
           ) do |temp_method_name, attr_name_expr|
-            owner.define_cached_method("#{name}=", as: temp_method_name, namespace: :active_model) do |batch|
+            owner.define_cached_method(temp_method_name, as: "#{as}=", namespace: :active_model) do |batch|
               batch <<
                 "def #{temp_method_name}(value)" <<
                 "  _write_attribute(#{attr_name_expr}, value)" <<

data/lib/active_model/gem_version.rb

@@ -9,8 +9,8 @@ module ActiveModel
   module VERSION
     MAJOR = 7
     MINOR = 1
-    TINY  = 3
-    PRE   = "4"
+    TINY  = 5
+    PRE   = "2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_model.rb

@@ -28,7 +28,7 @@ require "active_support/rails"
 require "active_model/version"
 require "active_model/deprecator"
 
-# :include: activemodel/README.rdoc
+# :include: ../README.rdoc
 module ActiveModel
   extend ActiveSupport::Autoload
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: activemodel
 version: !ruby/object:Gem::Version
-  version: 7.1.3.4
+  version: 7.1.5.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-04 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3.4
+        version: 7.1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3.4
+        version: 7.1.5.2
 description: A toolkit for building modeling frameworks like Active Record. Rich support
   for attributes, callbacks, validations, serialization, internationalization, and
   testing.
@@ -112,12 +111,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.1.3.4/activemodel/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.1.3.4/
+  changelog_uri: https://github.com/rails/rails/blob/v7.1.5.2/activemodel/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.1.5.2/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.1.3.4/activemodel
+  source_code_uri: https://github.com/rails/rails/tree/v7.1.5.2/activemodel
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -132,8 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A toolkit for building modeling frameworks (part of Rails).
 test_files: []