activemodel 7.1.1 → 7.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 191a355e300ba0a18a587294a4ba721be77929a97a780f0a7dfaa519dd31ec2f
-  data.tar.gz: f27b9ae46f6e20784e8c6eebc82994cb01cb169d3b57e622c9a772fccce1bf12
+  metadata.gz: 47edf9505c3471e453e228f0f5df53f81f4ef35f124245e2fa3fe21a4fe98e83
+  data.tar.gz: 4c693d298afbfed8f0cd722d33f2426e0f3edb7305bb581e0c4ee2a3fa1203b1
 SHA512:
-  metadata.gz: 9985a97c165f261521b48011e8ac8a63ec61a6e6357a6ea2c9491bbed44838a492f400fccfa48f8362b7cbf53f8600a912420d57fbc473e0dcfdbfa7ed93e882
-  data.tar.gz: 5aa0cc11f2366bd7019c10926ae34c2d0fa9e6f3acc5970dee48d25aa876efc23f71b3089e99d58e3b95375de81a17634869d962a3741037b32b7f72e1bc546e
+  metadata.gz: 59b03357543036b2856fdec81f20ae784e4af91a5229caa9651ca689e1d62b85a5a1cb27a1767ce7865535344f986c7c2759f3efbf31a0665e13da5b53831dcd
+  data.tar.gz: 1a1a03cf6c4ed8f6d3f6462a9037a6d56343accb8c1aaf39e4320f32b359fe2f14339b498b67e2a59c1be1f796bcbee79ad36641bbefac22542f10597d8b2751

data/CHANGELOG.md

@@ -1,3 +1,72 @@
+## 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.
+
+
+## Rails 7.1.3.3 (May 16, 2024) ##
+
+*   No changes.
+
+
+## Rails 7.1.3.2 (February 21, 2024) ##
+
+*   No changes.
+
+
+## Rails 7.1.3.1 (February 21, 2024) ##
+
+*   No changes.
+
+
+## Rails 7.1.3 (January 16, 2024) ##
+
+*   No changes.
+
+
+## Rails 7.1.2 (November 10, 2023) ##
+
+*   Make `==(other)` method of AttributeSet safe.
+
+    *Dmitry Pogrebnoy*
+
+
 ## Rails 7.1.1 (October 11, 2023) ##
 
 *   No changes.

data/lib/active_model/attribute.rb

@@ -178,11 +178,11 @@ module ActiveModel
         def forgetting_assignment
           # If this attribute was not persisted (with a `value_for_database`
           # that might differ from `value_before_type_cast`) and `value` has not
-          # changed in place, we can simply dup this attribute to avoid
-          # deserialize / cast / serialize calls from computing the new
+          # changed in place, we can use the existing `value_before_type_cast`
+          # to avoid deserialize / cast / serialize calls from computing the new
           # attribute's `value_before_type_cast`.
           if !defined?(@value_for_database) && !changed_in_place?
-            dup
+            with_value_from_database(value_before_type_cast)
           else
             super
           end

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/attribute_set.rb

@@ -104,7 +104,7 @@ module ActiveModel
     end
 
     def ==(other)
-      attributes == other.attributes
+      other.is_a?(AttributeSet) && attributes == other.send(:attributes)
     end
 
     protected

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/dirty.rb

@@ -187,7 +187,7 @@ module ActiveModel
       #
       #   person = Person.new(name: 'Steph')
       #   person.name = 'Stephanie'
-      #   person.name_change # => ['Steph', 'Stephanie']
+      #   person.name_was # => 'Steph'
 
       ##
       # :method: *_previous_change

data/lib/active_model/errors.rb

@@ -63,6 +63,7 @@ module ActiveModel
 
     extend Forwardable
 
+    ##
     # :method: each
     #
     # :call-seq: each(&block)
@@ -74,6 +75,31 @@ module ActiveModel
     #     # Will yield <#ActiveModel::Error attribute=name, type=too_short,
     #                                       options={:count=>3}>
     #   end
+
+    ##
+    # :method: clear
+    #
+    # :call-seq: clear
+    #
+    # Clears all errors. Clearing the errors does not, however, make the model
+    # valid. The next time the validations are run (for example, via
+    # ActiveRecord::Validations#valid?), the errors collection will be filled
+    # again if any validations fail.
+
+    ##
+    # :method: empty?
+    #
+    # :call-seq: empty?
+    #
+    # Returns true if there are no errors.
+
+    ##
+    # :method: size
+    #
+    # :call-seq: size
+    #
+    # Returns number of errors.
+
     def_delegators :@errors, :each, :clear, :empty?, :size, :uniq!
 
     # The actual array of +Error+ objects

data/lib/active_model/gem_version.rb

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

data/lib/active_model/model.rb

@@ -52,6 +52,10 @@ module ActiveModel
     # Returns a hash of the given methods with their names as keys and returned
     # values as values.
     #
+    #   person = Person.new(id: 1, name: "bob")
+    #   person.slice(:id, :name)
+    #   => { "id" => 1, "name" => "bob" }
+    #
     #--
     # Implemented by ActiveModel::Access#slice.
 
@@ -62,6 +66,10 @@ module ActiveModel
     #
     # Returns an array of the values returned by the given methods.
     #
+    #   person = Person.new(id: 1, name: "bob")
+    #   person.values_at(:id, :name)
+    #   => [1, "bob"]
+    #
     #--
     # Implemented by ActiveModel::Access#values_at.
   end

data/lib/active_model/type/helpers/numeric.rb

@@ -42,7 +42,8 @@ module ActiveModel
           end
 
           def number_to_non_number?(old_value, new_value_before_type_cast)
-            old_value != nil && non_numeric_string?(new_value_before_type_cast.to_s)
+            old_value != nil && !new_value_before_type_cast.is_a?(::Numeric) &&
+              non_numeric_string?(new_value_before_type_cast.to_s)
           end
 
           def non_numeric_string?(value)

data/lib/active_model/validations/validates.rb

@@ -10,7 +10,7 @@ module ActiveModel
       # validators can be overridden inside specific classes by creating
       # custom validator classes in their place such as PresenceValidator.
       #
-      # Examples of using the default rails validators:
+      # Examples of using the default \Rails validators:
       #
       #   validates :username, absence: true
       #   validates :terms, acceptance: true

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,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.1.5
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-11 00:00:00.000000000 Z
+date: 2024-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.5
 description: A toolkit for building modeling frameworks like Active Record. Rich support
   for attributes, callbacks, validations, serialization, internationalization, and
   testing.
@@ -112,12 +112,12 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.1.1/activemodel/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.1.1/
+  changelog_uri: https://github.com/rails/rails/blob/v7.1.5/activemodel/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.1.5/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.1.1/activemodel
+  source_code_uri: https://github.com/rails/rails/tree/v7.1.5/activemodel
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -132,8 +132,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.18
-signing_key:
+rubygems_version: 3.5.16
+signing_key: 
 specification_version: 4
 summary: A toolkit for building modeling frameworks (part of Rails).
 test_files: []