activemodel 7.1.4 → 7.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c65d57cfe07c87ab6784d35d6cad7b867be9b1af79dbd9f94952bc853f1bdb2
-  data.tar.gz: 7ed7f9189c0b5856f04f00cbad7b4b666c3a04ff00ecb97cb95aca385a8952b0
+  metadata.gz: 70a0c28c415bc15bb939ec838af49318530a90d8f42546153450f4cc108c18c8
+  data.tar.gz: 57a6406ae772d62fb5b90e3df60de2ecf3f64e3a8c810cea7f24694ad70d16ef
 SHA512:
-  metadata.gz: 8c3efab2ebac160a00422547aa31c996135971e742680e26d1ecb93fe96ad95f76ebc6fb52932f58d84a4ee51a888f2701eef1bfe9d70da54fef0cf8a77233e6
-  data.tar.gz: 66dc340915cd6ffeef7e0a504f7fbcafda2e9af0b728a6679bd23b9e2db8c57f18cf10b64c4b4b2228b62f602e92f16384def45b70ac5f232e78467c8e7b3ab0
+  metadata.gz: 54191c069916b9400da52e84d6ba6d874570fc708a89069dd702d59db8fd37f143bc3aa0021d286d6ef9b970cbcfcf828e3111cb9b8c5f7c0502f84a88929a39
+  data.tar.gz: 16565d50c780f4a2ca419f3e8fff5a2856db38340ae93dc1ad0412bd0dcdc6fbd44b6559b00150ed083891fc392aac204e273f6511819aa7f12b076172f9178c

data/CHANGELOG.md

@@ -1,269 +1,24 @@
-## Rails 7.1.4 (August 22, 2024) ##
+## Rails 7.2.0.beta1 (May 29, 2024) ##
 
-*   No changes.
+*   Fix a bug where type casting of string to `Time` and `DateTime` doesn't
+    calculate minus minute value in TZ offset correctly.
 
+    *Akira Matsuda*
 
-## Rails 7.1.3.4 (June 04, 2024) ##
+*   Port the `type_for_attribute` method to Active Model. Classes that include
+    `ActiveModel::Attributes` will now provide this method. This method behaves
+    the same for Active Model as it does for Active Record.
 
-*   No changes.
+      ```ruby
+      class MyModel
+        include ActiveModel::Attributes
 
-
-## 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.
-
-
-## Rails 7.1.0 (October 05, 2023) ##
-
-*   No changes.
-
-
-## Rails 7.1.0.rc2 (October 01, 2023) ##
-
-*   No changes.
-
-
-## Rails 7.1.0.rc1 (September 27, 2023) ##
-
-*   Remove change in the typography of user facing error messages.
-    For example, “can’t be blank” is again “can't be blank”.
-
-    *Rafael Mendonça França*
-
-
-## Rails 7.1.0.beta1 (September 13, 2023) ##
-
-*   Support composite identifiers in `to_key`
-
-    `to_key` avoids wrapping `#id` value into an `Array` if `#id` already an array
-
-    *Nikita Vasilevsky*
-
-*   Add `ActiveModel::Conversion.param_delimiter` to configure delimiter being used in `to_param`
-
-    *Nikita Vasilevsky*
-
-*   `undefine_attribute_methods` undefines alias attribute methods along with attribute methods.
-
-    *Nikita Vasilevsky*
-
-*   Error.full_message now strips ":base" from the message.
-
-    *zzak*
-
-*   Add a load hook for `ActiveModel::Model` (named `active_model`) to match the load hook for
-    `ActiveRecord::Base` and allow for overriding aspects of the `ActiveModel::Model` class.
-
-    *Lewis Buckley*
-
-*   Improve password length validation in ActiveModel::SecurePassword to consider byte size for BCrypt
-    compatibility.
-
-    The previous password length validation only considered the character count, which may not
-    accurately reflect the 72-byte size limit imposed by BCrypt. This change updates the validation
-    to consider both character count and byte size while keeping the character length validation in place.
-
-    ```ruby
-    user = User.new(password: "a" * 73)  # 73 characters
-    user.valid? # => false
-    user.errors[:password] # => ["is too long"]
-
-
-    user = User.new(password: "あ" * 25)  # 25 characters, 75 bytes
-    user.valid? # => false
-    user.errors[:password] # => ["is too long"]
-    ```
-
-    *ChatGPT*, *Guillermo Iguaran*
-
-*   `has_secure_password` now generates an `#{attribute}_salt` method that returns the salt
-    used to compute the password digest. The salt will change whenever the password is changed,
-    so it can be used to create single-use password reset tokens with `generates_token_for`:
-
-    ```ruby
-    class User < ActiveRecord::Base
-      has_secure_password
-
-      generates_token_for :password_reset, expires_in: 15.minutes do
-        password_salt&.last(10)
-      end
-    end
-    ```
-
-    *Lázaro Nixon*
-
-*   Improve typography of user facing error messages. In English contractions,
-    the Unicode APOSTROPHE (`U+0027`) is now RIGHT SINGLE QUOTATION MARK
-    (`U+2019`). For example, "can't be blank" is now "can’t be blank".
-
-    *Jon Dufresne*
-
-*   Add class to `ActiveModel::MissingAttributeError` error message.
-
-    Show which class is missing the attribute in the error message:
-
-    ```ruby
-    user = User.first
-    user.pets.select(:id).first.user_id
-    # => ActiveModel::MissingAttributeError: missing attribute 'user_id' for Pet
-    ```
-
-    *Petrik de Heus*
-
-*   Raise `NoMethodError` in `ActiveModel::Type::Value#as_json` to avoid unpredictable
-    results.
-
-    *Vasiliy Ermolovich*
-
-*   Custom attribute types that inherit from Active Model built-in types and do
-    not override the `serialize` method will now benefit from an optimization
-    when serializing attribute values for the database.
-
-    For example, with a custom type like the following:
-
-    ```ruby
-    class DowncasedString < ActiveModel::Type::String
-      def cast(value)
-        super&.downcase
+        attribute :my_attribute, :integer
       end
-    end
-
-    ActiveRecord::Type.register(:downcased_string, DowncasedString)
-
-    class User < ActiveRecord::Base
-      attribute :email, :downcased_string
-    end
-
-    user = User.new(email: "FooBar@example.com")
-    ```
-
-    Serializing the `email` attribute for the database will be roughly twice as
-    fast.  More expensive `cast` operations will likely see greater improvements.
-
-    *Jonathan Hefner*
-
-*   `has_secure_password` now supports password challenges via a
-    `password_challenge` accessor and validation.
-
-    A password challenge is a safeguard to verify that the current user is
-    actually the password owner.  It can be used when changing sensitive model
-    fields, such as the password itself.  It is different than a password
-    confirmation, which is used to prevent password typos.
-
-    When `password_challenge` is set, the validation checks that the value's
-    digest matches the *currently persisted* `password_digest` (i.e.
-    `password_digest_was`).
 
-    This allows a password challenge to be done as part of a typical `update`
-    call, just like a password confirmation.  It also allows a password
-    challenge error to be handled in the same way as other validation errors.
-
-    For example, in the controller, instead of:
-
-    ```ruby
-    password_params = params.require(:password).permit(
-      :password_challenge,
-      :password,
-      :password_confirmation,
-    )
-
-    password_challenge = password_params.delete(:password_challenge)
-    @password_challenge_failed = !current_user.authenticate(password_challenge)
-
-    if !@password_challenge_failed && current_user.update(password_params)
-      # ...
-    end
-    ```
-
-    You can now write:
-
-    ```ruby
-    password_params = params.require(:password).permit(
-      :password_challenge,
-      :password,
-      :password_confirmation,
-    ).with_defaults(password_challenge: "")
-
-    if current_user.update(password_params)
-      # ...
-    end
-    ```
-
-    And, in the view, instead of checking `@password_challenge_failed`, you can
-    render an error for the `password_challenge` field just as you would for
-    other form fields, including utilizing `config.action_view.field_error_proc`.
+      MyModel.type_for_attribute(:my_attribute) # => #<ActiveModel::Type::Integer ...>
+      ```
 
     *Jonathan Hefner*
 
-*   Support infinite ranges for `LengthValidator`s `:in`/`:within` options
-
-    ```ruby
-    validates_length_of :first_name, in: ..30
-    ```
-
-    *fatkodima*
-
-*   Add support for beginless ranges to inclusivity/exclusivity validators:
-
-    ```ruby
-    validates_inclusion_of :birth_date, in: -> { (..Date.today) }
-    ```
-
-    ```ruby
-    validates_exclusion_of :birth_date, in: -> { (..Date.today) }
-    ```
-
-    *Bo Jeanes*
-
-*   Make validators accept lambdas without record argument
-
-    ```ruby
-    # Before
-    validates_comparison_of :birth_date, less_than_or_equal_to: ->(_record) { Date.today }
-
-    # After
-    validates_comparison_of :birth_date, less_than_or_equal_to: -> { Date.today }
-    ```
-
-    *fatkodima*
-
-*   Fix casting long strings to `Date`, `Time` or `DateTime`
-
-    *fatkodima*
-
-*   Use different cache namespace for proxy calls
-
-    Models can currently have different attribute bodies for the same method
-    names, leading to conflicts. Adding a new namespace `:active_model_proxy`
-    fixes the issue.
-
-    *Chris Salzberg*
-
-Please check [7-0-stable](https://github.com/rails/rails/blob/7-0-stable/activemodel/CHANGELOG.md) for previous changes.
+Please check [7-1-stable](https://github.com/rails/rails/blob/7-1-stable/activemodel/CHANGELOG.md) for previous changes.

data/README.rdoc

@@ -56,7 +56,7 @@ behavior out of the box:
     person.clear_name
     person.clear_age
 
-  {Learn more}[link:classes/ActiveModel/AttributeMethods.html]
+  {Learn more}[https://api.rubyonrails.org/classes/ActiveModel/AttributeMethods.html]
 
 * Callbacks for certain operations
 
@@ -74,7 +74,7 @@ behavior out of the box:
   This generates +before_create+, +around_create+ and +after_create+
   class methods that wrap your create method.
 
-  {Learn more}[link:classes/ActiveModel/Callbacks.html]
+  {Learn more}[https://api.rubyonrails.org/classes/ActiveModel/Callbacks.html]
 
 * Tracking value changes
 
@@ -110,7 +110,7 @@ behavior out of the box:
     person.save
     person.previous_changes # => {'name' => ['bob, 'robert']}
 
-  {Learn more}[link:classes/ActiveModel/Dirty.html]
+  {Learn more}[https://api.rubyonrails.org/classes/ActiveModel/Dirty.html]
 
 * Adding +errors+ interface to objects
 
@@ -141,7 +141,7 @@ behavior out of the box:
     person.errors.full_messages
     # => ["Name cannot be nil"]
 
-  {Learn more}[link:classes/ActiveModel/Errors.html]
+  {Learn more}[https://api.rubyonrails.org/classes/ActiveModel/Errors.html]
 
 * Model name introspection
 
@@ -152,7 +152,7 @@ behavior out of the box:
     NamedPerson.model_name.name   # => "NamedPerson"
     NamedPerson.model_name.human  # => "Named person"
 
-  {Learn more}[link:classes/ActiveModel/Naming.html]
+  {Learn more}[https://api.rubyonrails.org/classes/ActiveModel/Naming.html]
 
 * Making objects serializable
 
@@ -179,7 +179,7 @@ behavior out of the box:
     s = SerialPerson.new
     s.to_json             # => "{\"name\":null}"
 
-  {Learn more}[link:classes/ActiveModel/Serialization.html]
+  {Learn more}[https://api.rubyonrails.org/classes/ActiveModel/Serialization.html]
 
 * Internationalization (i18n) support
 
@@ -190,7 +190,7 @@ behavior out of the box:
     Person.human_attribute_name('my_attribute')
     # => "My attribute"
 
-  {Learn more}[link:classes/ActiveModel/Translation.html]
+  {Learn more}[https://api.rubyonrails.org/classes/ActiveModel/Translation.html]
 
 * Validation support
 
@@ -208,7 +208,7 @@ behavior out of the box:
     person.first_name = 'zoolander'
     person.valid?  # => false
 
-  {Learn more}[link:classes/ActiveModel/Validations.html]
+  {Learn more}[https://api.rubyonrails.org/classes/ActiveModel/Validations.html]
 
 * Custom validators
 
@@ -230,7 +230,7 @@ behavior out of the box:
     p.name = "Bob"
     p.valid?                  # =>  true
 
-  {Learn more}[link:classes/ActiveModel/Validator.html]
+  {Learn more}[https://api.rubyonrails.org/classes/ActiveModel/Validator.html]
 
 
 == Download and installation

data/lib/active_model/attribute.rb

@@ -153,7 +153,7 @@ module ActiveModel
       alias :assigned? :original_attribute
 
       def initialize_dup(other)
-        if defined?(@value) && @value.duplicable?
+        if @value&.duplicable?
           @value = @value.dup
         end
       end

data/lib/active_model/attribute_assignment.rb

@@ -45,8 +45,10 @@ module ActiveModel
 
       def _assign_attribute(k, v)
         setter = :"#{k}="
+        public_send(setter, v)
+      rescue NoMethodError
         if respond_to?(setter)
-          public_send(setter, v)
+          raise
         else
           raise UnknownAttributeError.new(self, k.to_s)
         end

data/lib/active_model/attribute_methods.rb

@@ -66,7 +66,6 @@ module ActiveModel
 
     NAME_COMPILABLE_REGEXP = /\A[a-zA-Z_]\w*[!?=]?\z/
     CALL_COMPILABLE_REGEXP = /\A[a-zA-Z_]\w*[!?]?\z/
-    FORWARD_PARAMETERS = "*args"
 
     included do
       class_attribute :attribute_aliases, instance_writer: false, default: {}
@@ -215,36 +214,23 @@ module ActiveModel
         end
       end
 
-      def generate_alias_attribute_methods(code_generator, new_name, old_name) # :nodoc:
-        define_attribute_method(old_name, _owner: code_generator, as: new_name)
+      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)
+        end
       end
 
       def alias_attribute_method_definition(code_generator, pattern, new_name, old_name) # :nodoc:
         method_name = pattern.method_name(new_name).to_s
         target_name = pattern.method_name(old_name).to_s
         parameters = pattern.parameters
-        mangled_name = target_name
 
-        unless NAME_COMPILABLE_REGEXP.match?(target_name)
-          mangled_name = "__temp__#{target_name.unpack1("h*")}"
-        end
+        mangled_name = build_mangled_name(target_name)
 
-        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
-            call_args = [":'#{target_name}'"]
-            call_args << parameters if parameters
-            "send(#{call_args.join(", ")})"
-          end
+        call_args = []
+        call_args << parameters if parameters
 
-          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?
@@ -319,41 +305,22 @@ module ActiveModel
       #   person.name = 'Bob'
       #   person.name        # => "Bob"
       #   person.name_short? # => true
-      def define_attribute_method(attr_name, _owner: generated_attribute_methods, as: attr_name)
+      def define_attribute_method(attr_name, _owner: generated_attribute_methods)
         ActiveSupport::CodeGenerator.batch(_owner, __FILE__, __LINE__) do |owner|
           attribute_method_patterns.each do |pattern|
-            define_attribute_method_pattern(pattern, attr_name, owner: owner, as: as)
-          end
-          attribute_method_patterns_cache.clear
-        end
-      end
+            method_name = pattern.method_name(attr_name)
 
-      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
+            unless instance_method_already_implemented?(method_name)
+              generate_method = "define_method_#{pattern.proxy_target}"
 
-        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,
-          )
+              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
+          end
+          attribute_method_patterns_cache.clear
         end
       end
 
@@ -398,6 +365,8 @@ module ActiveModel
           super
           base.class_eval do
             @attribute_method_patterns_cache = nil
+            @aliases_by_attribute_name = nil
+            @generated_attribute_methods = nil
           end
         end
 
@@ -435,28 +404,37 @@ 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:, as: name)
+        def define_proxy_call(code_generator, name, proxy_target, parameters, *call_args, namespace:)
+          mangled_name = build_mangled_name(name)
+
+          call_args.map!(&:inspect)
+          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
 
-          call_args.map!(&:inspect)
-          call_args << parameters if parameters
-          namespace = :"#{namespace}_#{proxy_target}"
+          mangled_name
+        end
 
-          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(", ")})"
+        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?(target_name)
+              "self.#{target_name}(#{call_args.join(", ")})"
             else
-              call_args.unshift(":'#{proxy_target}'")
+              call_args.unshift(":'#{target_name}'")
               "send(#{call_args.join(", ")})"
             end
 
-            modifier = parameters == FORWARD_PARAMETERS ? "ruby2_keywords " : ""
-
             batch <<
-              "#{modifier}def #{mangled_name}(#{parameters || ''})" <<
+              "def #{mangled_name}(#{parameters || ''})" <<
               body <<
               "end"
           end
@@ -470,7 +448,7 @@ module ActiveModel
           def initialize(prefix: "", suffix: "", parameters: nil)
             @prefix = prefix
             @suffix = suffix
-            @parameters = parameters.nil? ? FORWARD_PARAMETERS : parameters
+            @parameters = parameters.nil? ? "..." : parameters
             @regex = /\A(?:#{Regexp.escape(@prefix)})(.*)(?:#{Regexp.escape(@suffix)})\z/
             @proxy_target = "#{@prefix}attribute#{@suffix}"
             @method_name = "#{prefix}%s#{suffix}"
@@ -498,24 +476,22 @@ module ActiveModel
     # It's also possible to instantiate related objects, so a <tt>Client</tt>
     # class belonging to the +clients+ table with a +master_id+ foreign key
     # can instantiate master through <tt>Client#master</tt>.
-    def method_missing(method, *args, &block)
+    def method_missing(method, ...)
       if respond_to_without_attributes?(method, true)
         super
       else
-        match = matched_attribute_method(method.to_s)
-        match ? attribute_missing(match, *args, &block) : super
+        match = matched_attribute_method(method.name)
+        match ? attribute_missing(match, ...) : super
       end
     end
-    ruby2_keywords(:method_missing)
 
     # +attribute_missing+ is like +method_missing+, but for attributes. When
     # +method_missing+ is called we check to see if there is a matching
     # attribute method. If so, we tell +attribute_missing+ to dispatch the
     # attribute. This method can be overloaded to customize the behavior.
-    def attribute_missing(match, *args, &block)
-      __send__(match.proxy_target, match.attr_name, *args, &block)
+    def attribute_missing(match, ...)
+      __send__(match.proxy_target, match.attr_name, ...)
     end
-    ruby2_keywords(:attribute_missing)
 
     # A +Person+ instance with a +name+ attribute can ask
     # <tt>person.respond_to?(:name)</tt>, <tt>person.respond_to?(:name=)</tt>,

data/lib/active_model/attribute_registration.rb

@@ -10,17 +10,28 @@ module ActiveModel
 
     module ClassMethods # :nodoc:
       def attribute(name, type = nil, default: (no_default = true), **options)
+        name = resolve_attribute_name(name)
         type = resolve_type_name(type, **options) if type.is_a?(Symbol)
+        type = hook_attribute_type(name, type) if type
 
-        pending = pending_attribute(name)
-        pending.type = type if type
-        pending.default = default unless no_default
+        pending_attribute_modifications << PendingType.new(name, type) if type || no_default
+        pending_attribute_modifications << PendingDefault.new(name, default) unless no_default
+
+        reset_default_attributes
+      end
+
+      def decorate_attributes(names = nil, &decorator) # :nodoc:
+        names = names&.map { |name| resolve_attribute_name(name) }
+
+        pending_attribute_modifications << PendingDecorator.new(names, decorator)
 
         reset_default_attributes
       end
 
       def _default_attributes # :nodoc:
-        @default_attributes ||= build_default_attributes
+        @default_attributes ||= AttributeSet.new({}).tap do |attribute_set|
+          apply_pending_attribute_modifications(attribute_set)
+        end
       end
 
       def attribute_types # :nodoc:
@@ -29,40 +40,62 @@ module ActiveModel
         end
       end
 
+      def type_for_attribute(attribute_name, &block)
+        attribute_name = resolve_attribute_name(attribute_name)
+
+        if block
+          attribute_types.fetch(attribute_name, &block)
+        else
+          attribute_types[attribute_name]
+        end
+      end
+
       private
-        class PendingAttribute # :nodoc:
-          attr_accessor :type, :default
+        PendingType = Struct.new(:name, :type) do # :nodoc:
+          def apply_to(attribute_set)
+            attribute = attribute_set[name]
+            attribute_set[name] = attribute.with_type(type || attribute.type)
+          end
+        end
 
-          def apply_to(attribute)
-            attribute = attribute.with_type(type || attribute.type)
-            attribute = attribute.with_user_default(default) if defined?(@default)
-            attribute
+        PendingDefault = Struct.new(:name, :default) do # :nodoc:
+          def apply_to(attribute_set)
+            attribute_set[name] = attribute_set[name].with_user_default(default)
           end
         end
 
-        def pending_attribute(name)
-          @pending_attributes ||= {}
-          @pending_attributes[resolve_attribute_name(name)] ||= PendingAttribute.new
+        PendingDecorator = Struct.new(:names, :decorator) do # :nodoc:
+          def apply_to(attribute_set)
+            (names || attribute_set.keys).each do |name|
+              attribute = attribute_set[name]
+              type = decorator.call(name, attribute.type)
+              attribute_set[name] = attribute.with_type(type) if type
+            end
+          end
         end
 
-        def apply_pending_attributes(attribute_set)
-          superclass.send(__method__, attribute_set) if superclass.respond_to?(__method__, true)
+        def pending_attribute_modifications
+          @pending_attribute_modifications ||= []
+        end
 
-          defined?(@pending_attributes) && @pending_attributes.each do |name, pending|
-            attribute_set[name] = pending.apply_to(attribute_set[name])
+        def apply_pending_attribute_modifications(attribute_set)
+          if superclass.respond_to?(:apply_pending_attribute_modifications, true)
+            superclass.send(:apply_pending_attribute_modifications, attribute_set)
           end
 
-          attribute_set
+          pending_attribute_modifications.each do |modification|
+            modification.apply_to(attribute_set)
+          end
         end
 
-        def build_default_attributes
-          apply_pending_attributes(AttributeSet.new({}))
+        def reset_default_attributes
+          reset_default_attributes!
+          subclasses.each { |subclass| subclass.send(:reset_default_attributes) }
         end
 
-        def reset_default_attributes
+        def reset_default_attributes!
           @default_attributes = nil
           @attribute_types = nil
-          subclasses.each { |subclass| subclass.send(__method__) }
         end
 
         def resolve_attribute_name(name)
@@ -72,6 +105,13 @@ module ActiveModel
         def resolve_type_name(name, **options)
           Type.lookup(name, **options)
         end
+
+        # Hook for other modules to override. The attribute type is passed
+        # through this method immediately after it is resolved, before any type
+        # decorations are applied.
+        def hook_attribute_type(attribute, type)
+          type
+        end
     end
   end
 end

data/lib/active_model/attributes.rb

@@ -75,12 +75,25 @@ module ActiveModel
         attribute_types.keys
       end
 
+      ##
+      # :method: type_for_attribute
+      # :call-seq: type_for_attribute(attribute_name, &block)
+      #
+      # Returns the type of the specified attribute after applying any
+      # modifiers. This method is the only valid source of information for
+      # anything related to the types of a model's attributes. The return value
+      # of this method will implement the interface described by
+      # ActiveModel::Type::Value (though the object itself may not subclass it).
+      #--
+      # Implemented by ActiveModel::AttributeRegistration::ClassMethods#type_for_attribute.
+
+      ##
       private
-        def define_method_attribute=(canonical_name, owner:, as: canonical_name)
+        def define_method_attribute=(name, owner:)
           ActiveModel::AttributeMethods::AttrNames.define_attribute_accessor_method(
-            owner, canonical_name, writer: true,
+            owner, name, writer: true,
           ) do |temp_method_name, attr_name_expr|
-            owner.define_cached_method(temp_method_name, as: "#{as}=", namespace: :active_model) do |batch|
+            owner.define_cached_method("#{name}=", as: temp_method_name, namespace: :active_model) do |batch|
               batch <<
                 "def #{temp_method_name}(value)" <<
                 "  _write_attribute(#{attr_name_expr}, value)" <<

data/lib/active_model/callbacks.rb

@@ -60,7 +60,7 @@ module ActiveModel
   # Would only create the +after_create+ and +before_create+ callback methods in
   # your class.
   #
-  # NOTE: Calling the same callback multiple times will overwrite previous callback definitions.
+  # NOTE: Defining the same callback multiple times will overwrite previous callback definitions.
   #
   module Callbacks
     def self.extended(base) # :nodoc:

data/lib/active_model/gem_version.rb

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

data/lib/active_model/secure_password.rb

@@ -41,7 +41,7 @@ module ActiveModel
       #
       # To use +has_secure_password+, add bcrypt (~> 3.1.7) to your Gemfile:
       #
-      #   gem 'bcrypt', '~> 3.1.7'
+      #   gem "bcrypt", "~> 3.1.7"
       #
       # ==== Examples
       #

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

@@ -94,7 +94,13 @@ module ActiveModel
               end
 
               if $8
-                offset = $8 == "Z" ? 0 : $8.to_i * 3600 + $9.to_i * 60
+                offset = \
+                  if $8 == "Z"
+                    0
+                  else
+                    offset_h, offset_m = $8.to_i, $9.to_i
+                    offset_h.to_i * 3600 + (offset_h.negative? ? -1 : 1) * offset_m * 60
+                  end
               end
 
               new_time($1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i, usec, offset)

data/lib/active_model/type/registry.rb

@@ -20,16 +20,15 @@ module ActiveModel
         registrations[type_name] = block
       end
 
-      def lookup(symbol, *args)
+      def lookup(symbol, ...)
         registration = registrations[symbol]
 
         if registration
-          registration.call(symbol, *args)
+          registration.call(symbol, ...)
         else
           raise ArgumentError, "Unknown type #{symbol.inspect}"
         end
       end
-      ruby2_keywords(:lookup)
 
       private
         attr_reader :registrations

data/lib/active_model/validations/callbacks.rb

@@ -101,7 +101,7 @@ module ActiveModel
               options[:on] = Array(options[:on])
               options[:if] = [
                 ->(o) {
-                  !(options[:on] & Array(o.validation_context)).empty?
+                  options[:on].intersect?(Array(o.validation_context))
                 },
                 *options[:if]
               ]

data/lib/active_model/validations/comparison.rb

@@ -10,7 +10,7 @@ module ActiveModel
       include ResolveValue
 
       def check_validity!
-        unless (options.keys & COMPARE_CHECKS.keys).any?
+        unless options.keys.intersect?(COMPARE_CHECKS.keys)
           raise ArgumentError, "Expected one of :greater_than, :greater_than_or_equal_to, "\
           ":equal_to, :less_than, :less_than_or_equal_to, or :other_than option to be supplied."
         end

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel
 version: !ruby/object:Gem::Version
-  version: 7.1.4
+  version: 7.2.0.beta1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-22 00:00:00.000000000 Z
+date: 2024-05-29 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.4
+        version: 7.2.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.4
+        version: 7.2.0.beta1
 description: A toolkit for building modeling frameworks like Active Record. Rich support
   for attributes, callbacks, validations, serialization, internationalization, and
   testing.
@@ -112,10 +112,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.1.4/activemodel/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.1.4/
+  changelog_uri: https://github.com/rails/rails/blob/v7.2.0.beta1/activemodel/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.2.0.beta1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.1.4/activemodel
+  source_code_uri: https://github.com/rails/rails/tree/v7.2.0.beta1/activemodel
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -125,14 +125,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: A toolkit for building modeling frameworks (part of Rails).