activemodel 7.0.4 → 6.1.7.1

data/lib/active_model/validations.rb

@@ -32,7 +32,7 @@ module ActiveModel
   #   person.errors.messages          # => {first_name:["starts with z."]}
   #
   # Note that <tt>ActiveModel::Validations</tt> automatically adds an +errors+
-  # method to your instances initialized with a new ActiveModel::Errors
+  # method to your instances initialized with a new <tt>ActiveModel::Errors</tt>
   # object, so there is no need for you to do this manually.
   module Validations
     extend ActiveSupport::Concern
@@ -73,14 +73,14 @@ module ActiveModel
       #   <tt>on: [:create, :custom_validation_context]</tt>)
       # * <tt>:allow_nil</tt> - Skip validation if attribute is +nil+.
       # * <tt>:allow_blank</tt> - Skip validation if attribute is blank.
-      # * <tt>:if</tt> - Specifies a method, proc, or string to call to determine
+      # * <tt>:if</tt> - Specifies a method, proc or string to call to determine
       #   if the validation should occur (e.g. <tt>if: :allow_validation</tt>,
       #   or <tt>if: Proc.new { |user| user.signup_step > 2 }</tt>). The method,
       #   proc or string should return or evaluate to a +true+ or +false+ value.
-      # * <tt>:unless</tt> - Specifies a method, proc, or string to call to
+      # * <tt>:unless</tt> - Specifies a method, proc or string to call to
       #   determine if the validation should not occur (e.g. <tt>unless: :skip_validation</tt>,
       #   or <tt>unless: Proc.new { |user| user.signup_step <= 2 }</tt>). The
-      #   method, proc, or string should return or evaluate to a +true+ or +false+
+      #   method, proc or string should return or evaluate to a +true+ or +false+
       #   value.
       def validates_each(*attr_names, &block)
         validates_with BlockValidator, _merge_attributes(attr_names), &block
@@ -118,7 +118,7 @@ module ActiveModel
       #     end
       #   end
       #
-      # Or with a block where +self+ points to the current record to be validated:
+      # Or with a block where self points to the current record to be validated:
       #
       #   class Comment
       #     include ActiveModel::Validations
@@ -137,14 +137,14 @@ module ActiveModel
       #   or an array of symbols. (e.g. <tt>on: :create</tt> or
       #   <tt>on: :custom_validation_context</tt> or
       #   <tt>on: [:create, :custom_validation_context]</tt>)
-      # * <tt>:if</tt> - Specifies a method, proc, or string to call to determine
+      # * <tt>:if</tt> - Specifies a method, proc or string to call to determine
       #   if the validation should occur (e.g. <tt>if: :allow_validation</tt>,
       #   or <tt>if: Proc.new { |user| user.signup_step > 2 }</tt>). The method,
       #   proc or string should return or evaluate to a +true+ or +false+ value.
-      # * <tt>:unless</tt> - Specifies a method, proc, or string to call to
+      # * <tt>:unless</tt> - Specifies a method, proc or string to call to
       #   determine if the validation should not occur (e.g. <tt>unless: :skip_validation</tt>,
       #   or <tt>unless: Proc.new { |user| user.signup_step <= 2 }</tt>). The
-      #   method, proc, or string should return or evaluate to a +true+ or +false+
+      #   method, proc or string should return or evaluate to a +true+ or +false+
       #   value.
       #
       # NOTE: Calling +validate+ multiple times on the same method will overwrite previous definitions.
@@ -152,7 +152,7 @@ module ActiveModel
       def validate(*args, &block)
         options = args.extract_options!
 
-        if args.all?(Symbol)
+        if args.all? { |arg| arg.is_a?(Symbol) }
           options.each_key do |k|
             unless VALID_OPTIONS_FOR_VALIDATE.include?(k)
               raise ArgumentError.new("Unknown key: #{k.inspect}. Valid keys are: #{VALID_OPTIONS_FOR_VALIDATE.map(&:inspect).join(', ')}. Perhaps you meant to call `validates` instead of `validate`?")
@@ -241,7 +241,7 @@ module ActiveModel
       #   class Person
       #     include ActiveModel::Validations
       #
-      #     attr_accessor :name, :age
+      #     attr_accessor :name , :age
       #
       #     validates_presence_of :name
       #     validates_inclusion_of :age, in: 0..99
@@ -272,7 +272,7 @@ module ActiveModel
       end
 
       # Copy validators on inheritance.
-      def inherited(base) # :nodoc:
+      def inherited(base) #:nodoc:
         dup = _validators.dup
         base._validators = dup.each { |k, v| dup[k] = v.dup }
         super
@@ -280,7 +280,7 @@ module ActiveModel
     end
 
     # Clean the +Errors+ object if instance is duped.
-    def initialize_dup(other) # :nodoc:
+    def initialize_dup(other) #:nodoc:
       @errors = nil
       super
     end

data/lib/active_model/validator.rb

@@ -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 <tt>ActiveModel::EachValidator</tt>.
   #
   #   class TitleValidator < ActiveModel::EachValidator
   #     def validate_each(record, attribute, value)
@@ -74,7 +74,7 @@ module ActiveModel
   #   end
   #
   # This can now be used in combination with the +validates+ method
-  # (see ActiveModel::Validations::ClassMethods#validates for more on this).
+  # (see <tt>ActiveModel::Validations::ClassMethods.validates</tt> for more on this).
   #
   #   class Person
   #     include ActiveModel::Validations
@@ -126,10 +126,10 @@ module ActiveModel
 
   # +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.
+  # record, attribute and value.
   #
   # All \Active \Model validations are built on top of this validator.
-  class EachValidator < Validator
+  class EachValidator < Validator #:nodoc:
     attr_reader :attributes
 
     # Returns a new validator instance. All options will be available via the
@@ -174,7 +174,7 @@ module ActiveModel
 
   # +BlockValidator+ is a special +EachValidator+ which receives a block on initialization
   # and call this block for each attribute being validated. +validates_each+ uses this validator.
-  class BlockValidator < EachValidator # :nodoc:
+  class BlockValidator < EachValidator #:nodoc:
     def initialize(options, &block)
       @block = block
       super

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 version of the currently loaded \Active \Model as a <tt>Gem::Version</tt>
   def self.version
     gem_version
   end

data/lib/active_model.rb

@@ -30,7 +30,6 @@ require "active_model/version"
 module ActiveModel
   extend ActiveSupport::Autoload
 
-  autoload :API
   autoload :Attribute
   autoload :Attributes
   autoload :AttributeAssignment

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel
 version: !ruby/object:Gem::Version
-  version: 7.0.4
+  version: 6.1.7.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-09 00:00:00.000000000 Z
+date: 2023-01-17 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.4
+        version: 6.1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.4
+        version: 6.1.7.1
 description: A toolkit for building modeling frameworks like Active Record. Rich support
   for attributes, callbacks, validations, serialization, internationalization, and
   testing.
@@ -36,7 +36,6 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - lib/active_model.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
@@ -88,8 +87,6 @@ files:
 - lib/active_model/validations/acceptance.rb
 - lib/active_model/validations/callbacks.rb
 - lib/active_model/validations/clusivity.rb
-- lib/active_model/validations/comparability.rb
-- lib/active_model/validations/comparison.rb
 - lib/active_model/validations/confirmation.rb
 - lib/active_model/validations/exclusion.rb
 - lib/active_model/validations/format.rb
@@ -107,10 +104,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.0.4/activemodel/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.0.4/
+  changelog_uri: https://github.com/rails/rails/blob/v6.1.7.1/activemodel/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.1.7.1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.0.4/activemodel
+  source_code_uri: https://github.com/rails/rails/tree/v6.1.7.1/activemodel
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -120,14 +117,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.3
 signing_key:
 specification_version: 4
 summary: A toolkit for building modeling frameworks (part of Rails).

data/lib/active_model/api.rb

@@ -1,99 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveModel
-  # == Active \Model \API
-  #
-  # Includes the required interface for an object to interact with
-  # Action Pack and Action View, using different Active Model modules.
-  # It includes model name introspections, conversions, translations, and
-  # validations. Besides that, it allows you to initialize the object with a
-  # hash of attributes, pretty much like Active Record does.
-  #
-  # A minimal implementation could be:
-  #
-  #   class Person
-  #     include ActiveModel::API
-  #     attr_accessor :name, :age
-  #   end
-  #
-  #   person = Person.new(name: 'bob', age: '18')
-  #   person.name # => "bob"
-  #   person.age  # => "18"
-  #
-  # Note that, by default, <tt>ActiveModel::API</tt> implements <tt>persisted?</tt>
-  # to return +false+, which is the most common case. You may want to override
-  # it in your class to simulate a different scenario:
-  #
-  #   class Person
-  #     include ActiveModel::API
-  #     attr_accessor :id, :name
-  #
-  #     def persisted?
-  #       self.id.present?
-  #     end
-  #   end
-  #
-  #   person = Person.new(id: 1, name: 'bob')
-  #   person.persisted? # => true
-  #
-  # Also, if for some reason you need to run code on <tt>initialize</tt>, make
-  # sure you call +super+ if you want the attributes hash initialization to
-  # happen.
-  #
-  #   class Person
-  #     include ActiveModel::API
-  #     attr_accessor :id, :name, :omg
-  #
-  #     def initialize(attributes={})
-  #       super
-  #       @omg ||= true
-  #     end
-  #   end
-  #
-  #   person = Person.new(id: 1, name: 'bob')
-  #   person.omg # => true
-  #
-  # For more detailed information on other functionalities available, please
-  # refer to the specific modules included in <tt>ActiveModel::API</tt>
-  # (see below).
-  module API
-    extend ActiveSupport::Concern
-    include ActiveModel::AttributeAssignment
-    include ActiveModel::Validations
-    include ActiveModel::Conversion
-
-    included do
-      extend ActiveModel::Naming
-      extend ActiveModel::Translation
-    end
-
-    # Initializes a new model with the given +params+.
-    #
-    #   class Person
-    #     include ActiveModel::API
-    #     attr_accessor :name, :age
-    #   end
-    #
-    #   person = Person.new(name: 'bob', age: '18')
-    #   person.name # => "bob"
-    #   person.age  # => "18"
-    def initialize(attributes = {})
-      assign_attributes(attributes) if attributes
-
-      super()
-    end
-
-    # Indicates if the model is persisted. Default is +false+.
-    #
-    #  class Person
-    #    include ActiveModel::API
-    #    attr_accessor :id, :name
-    #  end
-    #
-    #  person = Person.new(id: 1, name: 'bob')
-    #  person.persisted? # => false
-    def persisted?
-      false
-    end
-  end
-end

data/lib/active_model/validations/comparability.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveModel
-  module Validations
-    module Comparability # :nodoc:
-      COMPARE_CHECKS = { greater_than: :>, greater_than_or_equal_to: :>=,
-        equal_to: :==, less_than: :<, less_than_or_equal_to: :<=,
-        other_than: :!= }.freeze
-
-      def option_value(record, option_value)
-        case option_value
-        when Proc
-          option_value.call(record)
-        when Symbol
-          record.send(option_value)
-        else
-          option_value
-        end
-      end
-
-      def error_options(value, option_value)
-        options.except(*COMPARE_CHECKS.keys).merge!(
-          count: option_value,
-          value: value
-        )
-      end
-    end
-  end
-end

data/lib/active_model/validations/comparison.rb

@@ -1,82 +0,0 @@
-# frozen_string_literal: true
-
-require "active_model/validations/comparability"
-
-module ActiveModel
-  module Validations
-    class ComparisonValidator < EachValidator # :nodoc:
-      include Comparability
-
-      def check_validity!
-        unless (options.keys & COMPARE_CHECKS.keys).any?
-          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
-      end
-
-      def validate_each(record, attr_name, value)
-        options.slice(*COMPARE_CHECKS.keys).each do |option, raw_option_value|
-          option_value = option_value(record, raw_option_value)
-
-          if value.nil? || value.blank?
-            return record.errors.add(attr_name, :blank, **error_options(value, option_value))
-          end
-
-          unless value.public_send(COMPARE_CHECKS[option], option_value)
-            record.errors.add(attr_name, option, **error_options(value, option_value))
-          end
-        rescue ArgumentError => e
-          record.errors.add(attr_name, e.message)
-        end
-      end
-    end
-
-    module HelperMethods
-      # Validates the value of a specified attribute fulfills all
-      # defined comparisons with another value, proc, or attribute.
-      #
-      #   class Person < ActiveRecord::Base
-      #     validates_comparison_of :value, greater_than: 'the sum of its parts'
-      #   end
-      #
-      # Configuration options:
-      # * <tt>:message</tt> - A custom error message (default is: "failed comparison").
-      # * <tt>:greater_than</tt> - Specifies the value must be greater than the
-      #   supplied value.
-      # * <tt>:greater_than_or_equal_to</tt> - Specifies the value must be
-      #   greater than or equal to the supplied value.
-      # * <tt>:equal_to</tt> - Specifies the value must be equal to the supplied
-      #   value.
-      # * <tt>:less_than</tt> - Specifies the value must be less than the
-      #   supplied value.
-      # * <tt>:less_than_or_equal_to</tt> - Specifies the value must be less
-      #   than or equal to the supplied value.
-      # * <tt>:other_than</tt> - Specifies the value must not be equal to the
-      #   supplied value.
-      #
-      # There is also a list of default options supported by every validator:
-      # +:if+, +:unless+, +:on+, +:allow_nil+, +:allow_blank+, and +:strict+ .
-      # See ActiveModel::Validations::ClassMethods#validates for more information.
-      #
-      # The validator requires at least one of the following checks to be supplied.
-      # Each will accept a proc, value, or a symbol which corresponds to a method:
-      #
-      # * <tt>:greater_than</tt>
-      # * <tt>:greater_than_or_equal_to</tt>
-      # * <tt>:equal_to</tt>
-      # * <tt>:less_than</tt>
-      # * <tt>:less_than_or_equal_to</tt>
-      # * <tt>:other_than</tt>
-      #
-      # For example:
-      #
-      #   class Person < ActiveRecord::Base
-      #     validates_comparison_of :birth_date, less_than_or_equal_to: -> { Date.today }
-      #     validates_comparison_of :preferred_name, other_than: :given_name, allow_nil: true
-      #   end
-      def validates_comparison_of(*attr_names)
-        validates_with ComparisonValidator, _merge_attributes(attr_names)
-      end
-    end
-  end
-end