activemodel 7.0.8.1 → 7.1.0.beta1

data/lib/active_model/validations/validates.rb

@@ -6,7 +6,7 @@ module ActiveModel
   module Validations
     module ClassMethods
       # This method is a shortcut to all default validators and any custom
-      # validator classes ending in 'Validator'. Note that Rails default
+      # validator classes ending in 'Validator'. Note that \Rails default
       # validators can be overridden inside specific classes by creating
       # custom validator classes in their place such as PresenceValidator.
       #
@@ -116,7 +116,7 @@ module ActiveModel
           key = "#{key.to_s.camelize}Validator"
 
           begin
-            validator = key.include?("::") ? key.constantize : const_get(key)
+            validator = const_get(key)
           rescue NameError
             raise ArgumentError, "Unknown validator: '#{key}'"
           end
@@ -130,7 +130,7 @@ module ActiveModel
       # This method is used to define validations that cannot be corrected by end
       # users and are considered exceptional. So each validator defined with bang
       # or <tt>:strict</tt> option set to <tt>true</tt> will always raise
-      # <tt>ActiveModel::StrictValidationFailed</tt> instead of adding error
+      # ActiveModel::StrictValidationFailed instead of adding error
       # when validation fails. See <tt>validates</tt> for more information about
       # the validation itself.
       #
@@ -144,7 +144,7 @@ module ActiveModel
       #   person = Person.new
       #   person.name = ''
       #   person.valid?
-      #   # => ActiveModel::StrictValidationFailed: Name can't be blank
+      #   # => ActiveModel::StrictValidationFailed: Name can’t be blank
       def validates!(*attributes)
         options = attributes.extract_options!
         options[:strict] = true

data/lib/active_model/validations/with.rb

@@ -45,6 +45,13 @@ module ActiveModel
       #     validates_with MyValidator, MyOtherValidator, on: :create
       #   end
       #
+      # There is no default error message for +validates_with+. You must
+      # manually add errors to the record's errors collection in the validator
+      # class.
+      #
+      # To implement the validate method, you must have a +record+ parameter
+      # defined, which is the record to be validated.
+      #
       # Configuration options:
       # * <tt>:on</tt> - Specifies the contexts where this validation is active.
       #   Runs in all validation contexts by default +nil+. You can pass a symbol
@@ -83,7 +90,7 @@ module ActiveModel
         options[:class] = self
 
         args.each do |klass|
-          validator = klass.new(options, &block)
+          validator = klass.new(options.dup, &block)
 
           if validator.respond_to?(:attributes) && !validator.attributes.empty?
             validator.attributes.each do |attribute|
@@ -139,7 +146,7 @@ module ActiveModel
       options[:class] = self.class
 
       args.each do |klass|
-        validator = klass.new(options, &block)
+        validator = klass.new(options.dup, &block)
         validator.validate(self)
       end
     end

data/lib/active_model/validations.rb

@@ -3,7 +3,7 @@
 require "active_support/core_ext/array/extract_options"
 
 module ActiveModel
-  # == Active \Model \Validations
+  # = Active \Model \Validations
   #
   # Provides a full validation framework to your objects.
   #
@@ -31,7 +31,7 @@ module ActiveModel
   #   person.invalid?                 # => true
   #   person.errors.messages          # => {first_name:["starts with z."]}
   #
-  # Note that <tt>ActiveModel::Validations</tt> automatically adds an +errors+
+  # Note that +ActiveModel::Validations+ automatically adds an +errors+
   # method to your instances initialized with a new ActiveModel::Errors
   # object, so there is no need for you to do this manually.
   module Validations
@@ -45,6 +45,25 @@ module ActiveModel
       extend  HelperMethods
       include HelperMethods
 
+      ##
+      # :method: validation_context
+      # Returns the context when running validations.
+      #
+      # This is useful when running validations except a certain context (opposite to the +on+ option).
+      #
+      #   class Person
+      #     include ActiveModel::Validations
+      #
+      #     attr_accessor :name
+      #     validates :name, presence: true, if: -> { validation_context != :custom }
+      #   end
+      #
+      #   person = Person.new
+      #   person.valid?          #=> false
+      #   person.valid?(:new)    #=> false
+      #   person.valid?(:custom) #=> true
+
+      ##
       attr_accessor :validation_context
       private :validation_context=
       define_callbacks :validate, scope: :name
@@ -161,12 +180,7 @@ module ActiveModel
         end
 
         if options.key?(:on)
-          options = options.dup
-          options[:on] = Array(options[:on])
-          options[:if] = [
-            ->(o) { !(options[:on] & Array(o.validation_context)).empty? },
-            *options[:if]
-          ]
+          options = options.merge(if: [predicate_for_validation_context(options[:on]), *options[:if]])
         end
 
         set_callback(:validate, *args, options, &block)
@@ -277,6 +291,21 @@ module ActiveModel
         base._validators = dup.each { |k, v| dup[k] = v.dup }
         super
       end
+
+      private
+        @@predicates_for_validation_contexts = {}
+
+        def predicate_for_validation_context(context)
+          context = context.is_a?(Array) ? context.sort : Array(context)
+
+          @@predicates_for_validation_contexts[context] ||= -> (model) do
+            if model.validation_context.is_a?(Array)
+              model.validation_context.any? { |model_context| context.include?(model_context) }
+            else
+              context.include?(model.validation_context)
+            end
+          end
+        end
     end
 
     # Clean the +Errors+ object if instance is duped.
@@ -297,7 +326,7 @@ module ActiveModel
     #
     #   person = Person.new
     #   person.valid? # => false
-    #   person.errors # => #<ActiveModel::Errors:0x007fe603816640 @messages={name:["can't be blank"]}>
+    #   person.errors # => #<ActiveModel::Errors:0x007fe603816640 @messages={name:["can’t be blank"]}>
     def errors
       @errors ||= Errors.new(self)
     end
@@ -402,6 +431,12 @@ module ActiveModel
     alias :read_attribute_for_validation :send
 
   private
+    def init_internals
+      super
+      @errors = nil
+      @validation_context = nil
+    end
+
     def run_validations!
       _run_validate_callbacks
       errors.empty?
@@ -412,7 +447,7 @@ module ActiveModel
     end
   end
 
-  # = Active Model ValidationError
+  # = Active \Model \ValidationError
   #
   # Raised by <tt>validate!</tt> when the model is invalid. Use the
   # +model+ method to retrieve the record which did not validate.

data/lib/active_model/validator.rb

@@ -3,7 +3,7 @@
 require "active_support/core_ext/module/anonymous"
 
 module ActiveModel
-  # == Active \Model \Validator
+  # = Active \Model \Validator
   #
   # A simple base class that can be used along with
   # ActiveModel::Validations::ClassMethods.validates_with
@@ -26,7 +26,7 @@ module ActiveModel
   #       end
   #   end
   #
-  # Any class that inherits from ActiveModel::Validator must implement a method
+  # Any class that inherits from \ActiveModel::Validator must implement a method
   # called +validate+ which accepts a +record+.
   #
   #   class Person
@@ -65,7 +65,7 @@ module ActiveModel
   # life cycle, and not on each validation run.
   #
   # The easiest way to add custom validators for validating individual attributes
-  # is with the convenient ActiveModel::EachValidator.
+  # is with the convenient ActiveModel::EachValidator class.
   #
   #   class TitleValidator < ActiveModel::EachValidator
   #     def validate_each(record, attribute, value)
@@ -73,8 +73,8 @@ module ActiveModel
   #     end
   #   end
   #
-  # This can now be used in combination with the +validates+ method
-  # (see ActiveModel::Validations::ClassMethods#validates for more on this).
+  # This can now be used in combination with the +validates+ method.
+  # See ActiveModel::Validations::ClassMethods#validates for more on this.
   #
   #   class Person
   #     include ActiveModel::Validations
@@ -124,6 +124,8 @@ module ActiveModel
     end
   end
 
+  # = Active \Model \EachValidator
+  #
   # +EachValidator+ is a validator which iterates through the attributes given
   # in the options hash invoking the <tt>validate_each</tt> method passing in the
   # record, attribute, and value.

data/lib/active_model/version.rb

@@ -3,7 +3,7 @@
 require_relative "gem_version"
 
 module ActiveModel
-  # Returns the currently loaded version of \Active \Model as a <tt>Gem::Version</tt>.
+  # Returns the currently loaded version of \Active \Model as a +Gem::Version+.
   def self.version
     gem_version
   end

data/lib/active_model.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #--
-# Copyright (c) 2004-2022 David Heinemeier Hansson
+# Copyright (c) David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -26,15 +26,19 @@
 require "active_support"
 require "active_support/rails"
 require "active_model/version"
+require "active_model/deprecator"
 
+# :include: activemodel/README.rdoc
 module ActiveModel
   extend ActiveSupport::Autoload
 
+  autoload :Access
   autoload :API
   autoload :Attribute
   autoload :Attributes
   autoload :AttributeAssignment
   autoload :AttributeMethods
+  autoload :AttributeRegistration
   autoload :BlockValidator, "active_model/validator"
   autoload :Callbacks
   autoload :Conversion

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel
 version: !ruby/object:Gem::Version
-  version: 7.0.8.1
+  version: 7.1.0.beta1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-21 00:00:00.000000000 Z
+date: 2023-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.1
+        version: 7.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.1
+        version: 7.1.0.beta1
 description: A toolkit for building modeling frameworks like Active Record. Rich support
   for attributes, callbacks, validations, serialization, internationalization, and
   testing.
@@ -36,18 +36,21 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - lib/active_model.rb
+- lib/active_model/access.rb
 - lib/active_model/api.rb
 - lib/active_model/attribute.rb
 - lib/active_model/attribute/user_provided_default.rb
 - lib/active_model/attribute_assignment.rb
 - lib/active_model/attribute_methods.rb
 - lib/active_model/attribute_mutation_tracker.rb
+- lib/active_model/attribute_registration.rb
 - lib/active_model/attribute_set.rb
 - lib/active_model/attribute_set/builder.rb
 - lib/active_model/attribute_set/yaml_encoder.rb
 - lib/active_model/attributes.rb
 - lib/active_model/callbacks.rb
 - lib/active_model/conversion.rb
+- lib/active_model/deprecator.rb
 - lib/active_model/dirty.rb
 - lib/active_model/error.rb
 - lib/active_model/errors.rb
@@ -80,6 +83,7 @@ files:
 - lib/active_model/type/immutable_string.rb
 - lib/active_model/type/integer.rb
 - lib/active_model/type/registry.rb
+- lib/active_model/type/serialize_cast_value.rb
 - lib/active_model/type/string.rb
 - lib/active_model/type/time.rb
 - lib/active_model/type/value.rb
@@ -98,6 +102,7 @@ files:
 - lib/active_model/validations/length.rb
 - lib/active_model/validations/numericality.rb
 - lib/active_model/validations/presence.rb
+- lib/active_model/validations/resolve_value.rb
 - lib/active_model/validations/validates.rb
 - lib/active_model/validations/with.rb
 - lib/active_model/validator.rb
@@ -107,10 +112,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.0.8.1/activemodel/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.0.8.1/
+  changelog_uri: https://github.com/rails/rails/blob/v7.1.0.beta1/activemodel/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.1.0.beta1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.0.8.1/activemodel
+  source_code_uri: https://github.com/rails/rails/tree/v7.1.0.beta1/activemodel
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -123,11 +128,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.18
 signing_key:
 specification_version: 4
 summary: A toolkit for building modeling frameworks (part of Rails).