activemodel 4.2.0 → 6.1.0

data/lib/active_model/validator.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/module/anonymous"
 
 module ActiveModel
-
   # == Active \Model \Validator
   #
   # A simple base class that can be used along with
@@ -15,7 +16,7 @@ module ActiveModel
   #   class MyValidator < ActiveModel::Validator
   #     def validate(record)
   #       if some_complex_logic
-  #         record.errors[:base] = "This record is invalid"
+  #         record.errors.add(:base, "This record is invalid")
   #       end
   #     end
   #
@@ -83,13 +84,13 @@ module ActiveModel
   #   end
   #
   # It can be useful to access the class that is using that validator when there are prerequisites such
-  # as an +attr_accessor+ being present. This class is accessible via +options[:class]+ in the constructor.
-  # To setup your validator override the constructor.
+  # as an +attr_accessor+ being present. This class is accessible via <tt>options[:class]</tt> in the constructor.
+  # To set up your validator override the constructor.
   #
   #   class MyValidator < ActiveModel::Validator
   #     def initialize(options={})
   #       super
-  #       options[:class].send :attr_accessor, :custom_attribute
+  #       options[:class].attr_accessor :custom_attribute
   #     end
   #   end
   class Validator
@@ -98,20 +99,20 @@ module ActiveModel
     # Returns the kind of the validator.
     #
     #   PresenceValidator.kind   # => :presence
-    #   UniquenessValidator.kind # => :uniqueness
+    #   AcceptanceValidator.kind # => :acceptance
     def self.kind
-      @kind ||= name.split('::').last.underscore.sub(/_validator$/, '').to_sym unless anonymous?
+      @kind ||= name.split("::").last.underscore.chomp("_validator").to_sym unless anonymous?
     end
 
     # Accepts options that will be made available through the +options+ reader.
     def initialize(options = {})
-      @options  = options.except(:class).freeze
+      @options = options.except(:class).freeze
     end
 
     # Returns the kind for this validator.
     #
-    #   PresenceValidator.new.kind   # => :presence
-    #   UniquenessValidator.new.kind # => :uniqueness
+    #   PresenceValidator.new(attributes: [:username]).kind # => :presence
+    #   AcceptanceValidator.new(attributes: [:terms]).kind  # => :acceptance
     def kind
       self.class.kind
     end
@@ -127,7 +128,7 @@ module ActiveModel
   # in the options hash invoking the <tt>validate_each</tt> method passing in the
   # record, attribute and value.
   #
-  # All Active Model validations are built on top of this validator.
+  # All \Active \Model validations are built on top of this validator.
   class EachValidator < Validator #:nodoc:
     attr_reader :attributes
 
@@ -142,12 +143,13 @@ module ActiveModel
     end
 
     # Performs validation on the supplied record. By default this will call
-    # +validates_each+ to determine validity therefore subclasses should
-    # override +validates_each+ with validation logic.
+    # +validate_each+ to determine validity therefore subclasses should
+    # override +validate_each+ with validation logic.
     def validate(record)
       attributes.each do |attribute|
         value = record.read_attribute_for_validation(attribute)
         next if (value.nil? && options[:allow_nil]) || (value.blank? && options[:allow_blank])
+        value = prepare_value_for_validation(value, record, attribute)
         validate_each(record, attribute, value)
       end
     end
@@ -163,6 +165,11 @@ module ActiveModel
     # +ArgumentError+ when invalid options are supplied.
     def check_validity!
     end
+
+    private
+      def prepare_value_for_validation(value, record, attr_name)
+        value
+      end
   end
 
   # +BlockValidator+ is a special +EachValidator+ which receives a block on initialization
@@ -174,9 +181,8 @@ module ActiveModel
     end
 
     private
-
-    def validate_each(record, attribute, value)
-      @block.call(record, attribute, value)
-    end
+      def validate_each(record, attribute, value)
+        @block.call(record, attribute, value)
+      end
   end
 end

data/lib/active_model/version.rb

@@ -1,7 +1,9 @@
-require_relative 'gem_version'
+# frozen_string_literal: true
+
+require_relative "gem_version"
 
 module ActiveModel
-  # Returns the version of the currently loaded ActiveModel 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

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 #--
-# Copyright (c) 2004-2014 David Heinemeier Hansson
+# Copyright (c) 2004-2020 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -21,34 +23,40 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-require 'active_support'
-require 'active_support/rails'
-require 'active_model/version'
+require "active_support"
+require "active_support/rails"
+require "active_model/version"
 
 module ActiveModel
   extend ActiveSupport::Autoload
 
+  autoload :Attribute
+  autoload :Attributes
+  autoload :AttributeAssignment
   autoload :AttributeMethods
-  autoload :BlockValidator, 'active_model/validator'
+  autoload :BlockValidator, "active_model/validator"
   autoload :Callbacks
   autoload :Conversion
   autoload :Dirty
-  autoload :EachValidator, 'active_model/validator'
+  autoload :EachValidator, "active_model/validator"
   autoload :ForbiddenAttributesProtection
   autoload :Lint
   autoload :Model
-  autoload :Name, 'active_model/naming'
+  autoload :Name, "active_model/naming"
   autoload :Naming
   autoload :SecurePassword
   autoload :Serialization
-  autoload :TestCase
   autoload :Translation
+  autoload :Type
   autoload :Validations
   autoload :Validator
 
   eager_autoload do
     autoload :Errors
-    autoload :StrictValidationFailed, 'active_model/errors'
+    autoload :Error
+    autoload :RangeError, "active_model/errors"
+    autoload :StrictValidationFailed, "active_model/errors"
+    autoload :UnknownAttributeError, "active_model/errors"
   end
 
   module Serializers
@@ -56,7 +64,6 @@ module ActiveModel
 
     eager_autoload do
       autoload :JSON
-      autoload :Xml
     end
   end
 
@@ -67,5 +74,5 @@ module ActiveModel
 end
 
 ActiveSupport.on_load(:i18n) do
-  I18n.load_path << File.dirname(__FILE__) + '/active_model/locale/en.yml'
+  I18n.load_path << File.expand_path("active_model/locale/en.yml", __dir__)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 6.1.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-20 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
-- !ruby/object:Gem::Dependency
-  name: builder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 6.1.0
 description: A toolkit for building modeling frameworks like Active Record. Rich support
   for attributes, callbacks, validations, serialization, internationalization, and
   testing.
@@ -50,10 +36,19 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - lib/active_model.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_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/dirty.rb
+- lib/active_model/error.rb
 - lib/active_model/errors.rb
 - lib/active_model/forbidden_attributes_protection.rb
 - lib/active_model/gem_version.rb
@@ -61,13 +56,32 @@ files:
 - lib/active_model/locale/en.yml
 - lib/active_model/model.rb
 - lib/active_model/naming.rb
+- lib/active_model/nested_error.rb
 - lib/active_model/railtie.rb
 - lib/active_model/secure_password.rb
 - lib/active_model/serialization.rb
 - lib/active_model/serializers/json.rb
-- lib/active_model/serializers/xml.rb
-- lib/active_model/test_case.rb
 - lib/active_model/translation.rb
+- lib/active_model/type.rb
+- lib/active_model/type/big_integer.rb
+- lib/active_model/type/binary.rb
+- lib/active_model/type/boolean.rb
+- lib/active_model/type/date.rb
+- lib/active_model/type/date_time.rb
+- lib/active_model/type/decimal.rb
+- lib/active_model/type/float.rb
+- lib/active_model/type/helpers.rb
+- lib/active_model/type/helpers/accepts_multiparameter_time.rb
+- lib/active_model/type/helpers/mutable.rb
+- lib/active_model/type/helpers/numeric.rb
+- lib/active_model/type/helpers/time_value.rb
+- lib/active_model/type/helpers/timezone.rb
+- lib/active_model/type/immutable_string.rb
+- lib/active_model/type/integer.rb
+- lib/active_model/type/registry.rb
+- lib/active_model/type/string.rb
+- lib/active_model/type/time.rb
+- lib/active_model/type/value.rb
 - lib/active_model/validations.rb
 - lib/active_model/validations/absence.rb
 - lib/active_model/validations/acceptance.rb
@@ -76,6 +90,7 @@ files:
 - lib/active_model/validations/confirmation.rb
 - lib/active_model/validations/exclusion.rb
 - lib/active_model/validations/format.rb
+- lib/active_model/validations/helper_methods.rb
 - lib/active_model/validations/inclusion.rb
 - lib/active_model/validations/length.rb
 - lib/active_model/validations/numericality.rb
@@ -84,10 +99,15 @@ files:
 - lib/active_model/validations/with.rb
 - lib/active_model/validator.rb
 - lib/active_model/version.rb
-homepage: http://www.rubyonrails.org
+homepage: https://rubyonrails.org
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/rails/rails/issues
+  changelog_uri: https://github.com/rails/rails/blob/v6.1.0/activemodel/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.1.0/
+  mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
+  source_code_uri: https://github.com/rails/rails/tree/v6.1.0/activemodel
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -96,15 +116,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A toolkit for building modeling frameworks (part of Rails).

data/lib/active_model/serializers/xml.rb

@@ -1,238 +0,0 @@
-require 'active_support/core_ext/module/attribute_accessors'
-require 'active_support/core_ext/array/conversions'
-require 'active_support/core_ext/hash/conversions'
-require 'active_support/core_ext/hash/slice'
-require 'active_support/core_ext/time/acts_like'
-
-module ActiveModel
-  module Serializers
-    # == Active Model XML Serializer
-    module Xml
-      extend ActiveSupport::Concern
-      include ActiveModel::Serialization
-
-      included do
-        extend ActiveModel::Naming
-      end
-
-      class Serializer #:nodoc:
-        class Attribute #:nodoc:
-          attr_reader :name, :value, :type
-
-          def initialize(name, serializable, value)
-            @name, @serializable = name, serializable
-
-            if value.acts_like?(:time) && value.respond_to?(:in_time_zone)
-              value  = value.in_time_zone
-            end
-
-            @value = value
-            @type  = compute_type
-          end
-
-          def decorations
-            decorations = {}
-            decorations[:encoding] = 'base64' if type == :binary
-            decorations[:type] = (type == :string) ? nil : type
-            decorations[:nil] = true if value.nil?
-            decorations
-          end
-
-        protected
-
-          def compute_type
-            return if value.nil?
-            type = ActiveSupport::XmlMini::TYPE_NAMES[value.class.name]
-            type ||= :string if value.respond_to?(:to_str)
-            type ||= :yaml
-            type
-          end
-        end
-
-        class MethodAttribute < Attribute #:nodoc:
-        end
-
-        attr_reader :options
-
-        def initialize(serializable, options = nil)
-          @serializable = serializable
-          @options = options ? options.dup : {}
-        end
-
-        def serializable_hash
-          @serializable.serializable_hash(@options.except(:include))
-        end
-
-        def serializable_collection
-          methods = Array(options[:methods]).map(&:to_s)
-          serializable_hash.map do |name, value|
-            name = name.to_s
-            if methods.include?(name)
-              self.class::MethodAttribute.new(name, @serializable, value)
-            else
-              self.class::Attribute.new(name, @serializable, value)
-            end
-          end
-        end
-
-        def serialize
-          require 'builder' unless defined? ::Builder
-
-          options[:indent]  ||= 2
-          options[:builder] ||= ::Builder::XmlMarkup.new(indent: options[:indent])
-
-          @builder = options[:builder]
-          @builder.instruct! unless options[:skip_instruct]
-
-          root = (options[:root] || @serializable.model_name.element).to_s
-          root = ActiveSupport::XmlMini.rename_key(root, options)
-
-          args = [root]
-          args << { xmlns: options[:namespace] } if options[:namespace]
-          args << { type: options[:type] } if options[:type] && !options[:skip_types]
-
-          @builder.tag!(*args) do
-            add_attributes_and_methods
-            add_includes
-            add_extra_behavior
-            add_procs
-            yield @builder if block_given?
-          end
-        end
-
-      private
-
-        def add_extra_behavior
-        end
-
-        def add_attributes_and_methods
-          serializable_collection.each do |attribute|
-            key = ActiveSupport::XmlMini.rename_key(attribute.name, options)
-            ActiveSupport::XmlMini.to_tag(key, attribute.value,
-              options.merge(attribute.decorations))
-          end
-        end
-
-        def add_includes
-          @serializable.send(:serializable_add_includes, options) do |association, records, opts|
-            add_associations(association, records, opts)
-          end
-        end
-
-        # TODO: This can likely be cleaned up to simple use ActiveSupport::XmlMini.to_tag as well.
-        def add_associations(association, records, opts)
-          merged_options = opts.merge(options.slice(:builder, :indent))
-          merged_options[:skip_instruct] = true
-
-          [:skip_types, :dasherize, :camelize].each do |key|
-            merged_options[key] = options[key] if merged_options[key].nil? && !options[key].nil?
-          end
-
-          if records.respond_to?(:to_ary)
-            records = records.to_ary
-
-            tag  = ActiveSupport::XmlMini.rename_key(association.to_s, options)
-            type = options[:skip_types] ? { } : { type: "array" }
-            association_name = association.to_s.singularize
-            merged_options[:root] = association_name
-
-            if records.empty?
-              @builder.tag!(tag, type)
-            else
-              @builder.tag!(tag, type) do
-                records.each do |record|
-                  if options[:skip_types]
-                    record_type = {}
-                  else
-                    record_class = (record.class.to_s.underscore == association_name) ? nil : record.class.name
-                    record_type = { type: record_class }
-                  end
-
-                  record.to_xml merged_options.merge(record_type)
-                end
-              end
-            end
-          else
-            merged_options[:root] = association.to_s
-
-            unless records.class.to_s.underscore == association.to_s
-              merged_options[:type] = records.class.name
-            end
-
-            records.to_xml merged_options
-          end
-        end
-
-        def add_procs
-          if procs = options.delete(:procs)
-            Array(procs).each do |proc|
-              if proc.arity == 1
-                proc.call(options)
-              else
-                proc.call(options, @serializable)
-              end
-            end
-          end
-        end
-      end
-
-      # Returns XML representing the model. Configuration can be
-      # passed through +options+.
-      #
-      # Without any +options+, the returned XML string will include all the
-      # model's attributes.
-      #
-      #   user = User.find(1)
-      #   user.to_xml
-      #
-      #   <?xml version="1.0" encoding="UTF-8"?>
-      #   <user>
-      #     <id type="integer">1</id>
-      #     <name>David</name>
-      #     <age type="integer">16</age>
-      #     <created-at type="dateTime">2011-01-30T22:29:23Z</created-at>
-      #   </user>
-      #
-      # The <tt>:only</tt> and <tt>:except</tt> options can be used to limit the
-      # attributes included, and work similar to the +attributes+ method.
-      #
-      # To include the result of some method calls on the model use <tt>:methods</tt>.
-      #
-      # To include associations use <tt>:include</tt>.
-      #
-      # For further documentation, see <tt>ActiveRecord::Serialization#to_xml</tt>
-      def to_xml(options = {}, &block)
-        Serializer.new(self, options).serialize(&block)
-      end
-
-      # Sets the model +attributes+ from an XML string. Returns +self+.
-      #
-      #   class Person
-      #     include ActiveModel::Serializers::Xml
-      #
-      #     attr_accessor :name, :age, :awesome
-      #
-      #     def attributes=(hash)
-      #       hash.each do |key, value|
-      #         instance_variable_set("@#{key}", value)
-      #       end
-      #     end
-      #
-      #     def attributes
-      #       instance_values
-      #     end
-      #   end
-      #
-      #   xml = { name: 'bob', age: 22, awesome:true }.to_xml
-      #   person = Person.new
-      #   person.from_xml(xml) # => #<Person:0x007fec5e3b3c40 @age=22, @awesome=true, @name="bob">
-      #   person.name          # => "bob"
-      #   person.age           # => 22
-      #   person.awesome       # => true
-      def from_xml(xml)
-        self.attributes = Hash.from_xml(xml).values.first
-        self
-      end
-    end
-  end
-end

data/lib/active_model/test_case.rb

@@ -1,4 +0,0 @@
-module ActiveModel #:nodoc:
-  class TestCase < ActiveSupport::TestCase #:nodoc:
-  end
-end