activemodel 5.1.7 → 5.2.0.beta1

data/lib/active_model/forbidden_attributes_protection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   # Raised when forbidden attributes are used for mass assignment.
   #

data/lib/active_model/gem_version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   # Returns the version of the currently loaded \Active \Model as a <tt>Gem::Version</tt>
   def self.gem_version
@@ -6,9 +8,9 @@ module ActiveModel
 
   module VERSION
     MAJOR = 5
-    MINOR = 1
-    TINY  = 7
-    PRE   = nil
+    MINOR = 2
+    TINY  = 0
+    PRE   = "beta1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_model/lint.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Lint
     # == Active \Model \Lint \Tests

data/lib/active_model/model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   # == Active \Model \Basic \Model
   #

data/lib/active_model/naming.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/hash/except"
 require "active_support/core_ext/module/introspection"
-require "active_support/core_ext/module/remove_method"
+require "active_support/core_ext/module/redefine_method"
 
 module ActiveModel
   class Name
@@ -47,7 +49,7 @@ module ActiveModel
     # :method: <=>
     #
     # :call-seq:
-    #   ==(other)
+    #   <=>(other)
     #
     # Equivalent to <tt>String#<=></tt>.
     #
@@ -216,7 +218,7 @@ module ActiveModel
   # provided method below, or rolling your own is required.
   module Naming
     def self.extended(base) #:nodoc:
-      base.remove_possible_method :model_name
+      base.silence_redefinition_of_method :model_name
       base.delegate :model_name, to: :class
     end
 

data/lib/active_model/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_model"
 require "rails"
 

data/lib/active_model/secure_password.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module SecurePassword
     extend ActiveSupport::Concern
 
-    # BCrypt hash function can handle maximum 72 characters, and if we pass
-    # password of length more than 72 characters it ignores extra characters.
+    # BCrypt hash function can handle maximum 72 bytes, and if we pass
+    # password of length more than 72 bytes it ignores extra characters.
     # Hence need to put a restriction on password length.
     MAX_PASSWORD_LENGTH_ALLOWED = 72
 
@@ -18,7 +20,7 @@ module ActiveModel
       #
       # The following validations are added automatically:
       # * Password must be present on creation
-      # * Password length should be less than or equal to 72 characters
+      # * Password length should be less than or equal to 72 bytes
       # * Confirmation of password (using a +password_confirmation+ attribute)
       #
       # If password confirmation validation is not needed, simply leave out the

data/lib/active_model/serialization.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/hash/except"
 require "active_support/core_ext/hash/slice"
 

data/lib/active_model/serializers/json.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/json"
 
 module ActiveModel
@@ -10,8 +12,7 @@ module ActiveModel
       included do
         extend ActiveModel::Naming
 
-        class_attribute :include_root_in_json, instance_writer: false
-        self.include_root_in_json = false
+        class_attribute :include_root_in_json, instance_writer: false, default: false
       end
 
       # Returns a hash representing the model. Some configuration can be

data/lib/active_model/translation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   # == Active \Model \Translation
   #

data/lib/active_model/type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_model/type/helpers"
 require "active_model/type/value"
 
@@ -30,6 +32,10 @@ module ActiveModel
       def lookup(*args, **kwargs) # :nodoc:
         registry.lookup(*args, **kwargs)
       end
+
+      def default_value # :nodoc:
+        @default_value ||= Value.new
+      end
     end
 
     register(:big_integer, Type::BigInteger)

data/lib/active_model/type/big_integer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_model/type/integer"
 
 module ActiveModel

data/lib/active_model/type/binary.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Type
     class Binary < Value # :nodoc:

data/lib/active_model/type/boolean.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Type
     # == Active \Model \Type \Boolean

data/lib/active_model/type/date.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Type
     class Date < Value # :nodoc:

data/lib/active_model/type/date_time.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Type
     class DateTime < Value # :nodoc:
@@ -10,6 +12,10 @@ module ActiveModel
         :datetime
       end
 
+      def serialize(value)
+        super(cast(value))
+      end
+
       private
 
         def cast_value(value)

data/lib/active_model/type/decimal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bigdecimal/util"
 
 module ActiveModel

data/lib/active_model/type/float.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Type
     class Float < Value # :nodoc:

data/lib/active_model/type/helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_model/type/helpers/accepts_multiparameter_time"
 require "active_model/type/helpers/numeric"
 require "active_model/type/helpers/mutable"

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Type
     module Helpers # :nodoc: all
@@ -19,6 +21,10 @@ module ActiveModel
             end
           end
 
+          define_method(:value_constructed_by_mass_assignment?) do |value|
+            value.is_a?(Hash)
+          end
+
           define_method(:value_from_multiparameter_assignment) do |values_hash|
             defaults.each do |k, v|
               values_hash[k] ||= v

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Type
     module Helpers # :nodoc: all

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Type
     module Helpers # :nodoc: all

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

@@ -1,4 +1,5 @@
-require "active_support/core_ext/string/zones"
+# frozen_string_literal: true
+
 require "active_support/core_ext/time/zones"
 
 module ActiveModel

data/lib/active_model/type/immutable_string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Type
     class ImmutableString < Value # :nodoc:

data/lib/active_model/type/integer.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Type
     class Integer < Value # :nodoc:
       include Helpers::Numeric
 
       # Column storage size in bytes.
-      # 4 bytes means a MySQL int or Postgres integer as opposed to smallint etc.
+      # 4 bytes means an integer as opposed to smallint etc.
       DEFAULT_LIMIT = 4
 
       def initialize(*)

data/lib/active_model/type/registry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   # :stopdoc:
   module Type

data/lib/active_model/type/string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_model/type/immutable_string"
 
 module ActiveModel

data/lib/active_model/type/time.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Type
     class Time < Value # :nodoc:
@@ -16,8 +18,6 @@ module ActiveModel
         case value
         when ::String
           value = "2000-01-01 #{value}"
-          time_hash = ::Date._parse(value)
-          return if time_hash[:hour].nil?
         when ::Time
           value = value.change(year: 2000, day: 1, month: 1)
         end
@@ -28,10 +28,14 @@ module ActiveModel
       private
 
         def cast_value(value)
-          return apply_seconds_precision(value) unless value.is_a?(::String)
+          return value unless value.is_a?(::String)
           return if value.empty?
 
-          dummy_time_value = value.sub(/\A(\d\d\d\d-\d\d-\d\d |)/, "2000-01-01 ")
+          if value.start_with?("2000-01-01")
+            dummy_time_value = value
+          else
+            dummy_time_value = "2000-01-01 #{value}"
+          end
 
           fast_string_to_time(dummy_time_value) || begin
             time_hash = ::Date._parse(dummy_time_value)

data/lib/active_model/type/value.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Type
     class Value
@@ -84,7 +86,7 @@ module ActiveModel
         false
       end
 
-      def force_equality?(_value) # :nodoc:
+      def value_constructed_by_mass_assignment?(_value) # :nodoc:
         false
       end
 

data/lib/active_model/validations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/array/extract_options"
 require "active_support/core_ext/hash/keys"
 require "active_support/core_ext/hash/except"
@@ -49,8 +51,7 @@ module ActiveModel
       private :validation_context=
       define_callbacks :validate, scope: :name
 
-      class_attribute :_validators, instance_writer: false
-      self._validators = Hash.new { |h, k| h[k] = [] }
+      class_attribute :_validators, instance_writer: false, default: Hash.new { |h, k| h[k] = [] }
     end
 
     module ClassMethods
@@ -147,6 +148,9 @@ module ActiveModel
       #   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+
       #   value.
+      #
+      # NOTE: Calling +validate+ multiple times on the same method will overwrite previous definitions.
+      #
       def validate(*args, &block)
         options = args.extract_options!
 
@@ -432,4 +436,4 @@ module ActiveModel
   end
 end
 
-Dir[File.dirname(__FILE__) + "/validations/*.rb"].each { |file| require file }
+Dir[File.expand_path("validations/*.rb", __dir__)].each { |file| require file }

data/lib/active_model/validations/absence.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Validations
     # == \Active \Model Absence Validator

data/lib/active_model/validations/acceptance.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Validations
     class AcceptanceValidator < EachValidator # :nodoc:

data/lib/active_model/validations/callbacks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Validations
     # == Active \Model \Validation \Callbacks
@@ -52,16 +54,14 @@ module ActiveModel
         #   person.valid? # => true
         #   person.name   # => "bob"
         def before_validation(*args, &block)
-          options = args.extract_options!
-          options[:if] = Array(options[:if])
-
-          if options.key?(:on)
+          options = args.last
+          if options.is_a?(Hash) && options[:on]
+            options[:if] = Array(options[:if])
+            options[:on] = Array(options[:on])
             options[:if].unshift ->(o) {
-              !(Array(options[:on]) & Array(o.validation_context)).empty?
+              options[:on].include? o.validation_context
             }
           end
-
-          args << options
           set_callback(:validation, :before, *args, &block)
         end
 
@@ -95,15 +95,13 @@ module ActiveModel
           options = args.extract_options!
           options[:prepend] = true
           options[:if] = Array(options[:if])
-
-          if options.key?(:on)
+          if options[:on]
+            options[:on] = Array(options[:on])
             options[:if].unshift ->(o) {
-              !(Array(options[:on]) & Array(o.validation_context)).empty?
+              options[:on].include? o.validation_context
             }
           end
-
-          args << options
-          set_callback(:validation, :after, *args, &block)
+          set_callback(:validation, :after, *(args << options), &block)
         end
       end
 

data/lib/active_model/validations/clusivity.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/range"
 
 module ActiveModel

data/lib/active_model/validations/confirmation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   module Validations
     class ConfirmationValidator < EachValidator # :nodoc:
@@ -7,7 +9,7 @@ module ActiveModel
       end
 
       def validate_each(record, attribute, value)
-        if (confirmed = record.send("#{attribute}_confirmation"))
+        unless (confirmed = record.send("#{attribute}_confirmation")).nil?
           unless confirmation_value_equal?(record, attribute, value, confirmed)
             human_attribute_name = record.class.human_attribute_name(attribute)
             record.errors.add(:"#{attribute}_confirmation", :confirmation, options.except(:case_sensitive).merge!(attribute: human_attribute_name))