activemodel 5.2.5 → 6.0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9039d6e13061cd4e199a31b36d31d552a65dbd4ec37fff5030a08bfcbd3f787
-  data.tar.gz: 94d3de0fcc02f8f23302e59fbfb9ec8e690c4bc796f90c13257c0d47f8421cd5
+  metadata.gz: 7ecbea618c3d687827eb845c727679477517de6982f358f141ac616366527c89
+  data.tar.gz: 145c510d7a4fa6f89a0a18ab250c1847a3473bdc0a8399ba26479c98caeec39c
 SHA512:
-  metadata.gz: 45a41acc88fb4a97d513feb0356998fe1007a59b24b4f0e97801a1ca0f5def91c90afea459badbc50c2d20ff6054ebb862caf91f7e87f45f76cab8398793456f
-  data.tar.gz: 333361f1821156c0ef7844c57f5557b60eb6dcdd4132c652093b7ac39b2e268e725f058285127e0c58d3090687282ff107f8a75ae36183b4feb9d89c8db11345
+  metadata.gz: d3531a1a0edad1393ec7ae41deaa3f732f436511df28fd30a5749b6420495094719843f2bec1f8dc6f6846cbb6c8d10a4e202783425f2f429e041639d0cb634f
+  data.tar.gz: bff8dbeb868911a4583342ff79e6a4723ebbe07d1b14d7da1674670bcb535104121f6297493a7269599412499c7eb177f81b2aacd9257896def60af3a401b5f0

data/CHANGELOG.md

@@ -1,34 +1,84 @@
-## Rails 5.2.5 (March 26, 2021) ##
+## Rails 6.0.4.1 (August 19, 2021) ##
 
 *   No changes.
 
 
-## Rails 5.2.4.5 (February 10, 2021) ##
+## Rails 6.0.4 (June 15, 2021) ##
 
 *   No changes.
 
 
-## Rails 5.2.4.4 (September 09, 2020) ##
+## Rails 6.0.3.7 (May 05, 2021) ##
 
 *   No changes.
 
 
-## Rails 5.2.4.3 (May 18, 2020) ##
+## Rails 6.0.3.6 (March 26, 2021) ##
 
 *   No changes.
 
 
-## Rails 5.2.4.2 (March 19, 2020) ##
+## Rails 6.0.3.5 (February 10, 2021) ##
 
 *   No changes.
 
 
-## Rails 5.2.4.1 (December 18, 2019) ##
+## Rails 6.0.3.4 (October 07, 2020) ##
 
 *   No changes.
 
 
-## Rails 5.2.4 (November 27, 2019) ##
+## Rails 6.0.3.3 (September 09, 2020) ##
+
+*   No changes.
+
+
+## Rails 6.0.3.2 (June 17, 2020) ##
+
+*   No changes.
+
+
+## Rails 6.0.3.1 (May 18, 2020) ##
+
+*   No changes.
+
+
+## Rails 6.0.3 (May 06, 2020) ##
+
+*   No changes.
+
+
+## Rails 6.0.2.2 (March 19, 2020) ##
+
+*   No changes.
+
+
+## Rails 6.0.2.1 (December 18, 2019) ##
+
+*   No changes.
+
+
+## Rails 6.0.2 (December 13, 2019) ##
+
+*   No changes.
+
+
+## Rails 6.0.1 (November 5, 2019) ##
+
+*   No changes.
+
+
+## Rails 6.0.0 (August 16, 2019) ##
+
+*   No changes.
+
+
+## Rails 6.0.0.rc2 (July 22, 2019) ##
+
+*   No changes.
+
+
+## Rails 6.0.0.rc1 (April 24, 2019) ##
 
 *   Type cast falsy boolean symbols on boolean attribute as false.
 
@@ -36,8 +86,36 @@
 
     *Ryuta Kamizono*
 
+*   Change how validation error translation strings are fetched: The new behavior
+    will first try the more specific keys, including doing locale fallback, then try
+    the less specific ones.
+
+    For example, this is the order in which keys will now be tried for a `blank`
+    error on a `product`'s `title` attribute with current locale set to `en-US`:
+
+        en-US.activerecord.errors.models.product.attributes.title.blank
+        en-US.activerecord.errors.models.product.blank
+        en-US.activerecord.errors.messages.blank
+
+        en.activerecord.errors.models.product.attributes.title.blank
+        en.activerecord.errors.models.product.blank
+        en.activerecord.errors.messages.blank
 
-## Rails 5.2.3 (March 27, 2019) ##
+        en-US.errors.attributes.title.blank
+        en-US.errors.messages.blank
+
+        en.errors.attributes.title.blank
+        en.errors.messages.blank
+
+    *Hugo Vacher*
+
+
+## Rails 6.0.0.beta3 (March 11, 2019) ##
+
+*   No changes.
+
+
+## Rails 6.0.0.beta2 (February 25, 2019) ##
 
 *   Fix date value when casting a multiparameter date hash to not convert
     from Gregorian date to Julian date.
@@ -45,109 +123,120 @@
     Before:
 
         Day.new({"day(1i)"=>"1", "day(2i)"=>"1", "day(3i)"=>"1"})
-        => #<Day id: nil, day: "0001-01-03", created_at: nil, updated_at: nil>
+        # => #<Day id: nil, day: "0001-01-03", created_at: nil, updated_at: nil>
 
     After:
 
         Day.new({"day(1i)"=>"1", "day(2i)"=>"1", "day(3i)"=>"1"})
-        => #<Day id: nil, day: "0001-01-01", created_at: nil, updated_at: nil>
+        # => #<Day id: nil, day: "0001-01-01", created_at: nil, updated_at: nil>
 
     Fixes #28521.
 
     *Sayan Chakraborty*
 
-*   Fix numericality equality validation of `BigDecimal` and `Float`
-    by casting to `BigDecimal` on both ends of the validation.
-
-    *Gannon McGibbon*
+*   Fix year value when casting a multiparameter time hash.
 
+    When assigning a hash to a time attribute that's missing a year component
+    (e.g. a `time_select` with `:ignore_date` set to `true`) then the year
+    defaults to 1970 instead of the expected 2000. This results in the attribute
+    changing as a result of the save.
 
-## Rails 5.2.2.1 (March 11, 2019) ##
-
-*   No changes.
+    Before:
+    ```
+    event = Event.new(start_time: { 4 => 20, 5 => 30 })
+    event.start_time # => 1970-01-01 20:30:00 UTC
+    event.save
+    event.reload
+    event.start_time # => 2000-01-01 20:30:00 UTC
+    ```
 
+    After:
+    ```
+    event = Event.new(start_time: { 4 => 20, 5 => 30 })
+    event.start_time # => 2000-01-01 20:30:00 UTC
+    event.save
+    event.reload
+    event.start_time # => 2000-01-01 20:30:00 UTC
+    ```
 
-## Rails 5.2.2 (December 04, 2018) ##
+    *Andrew White*
 
-*   Fix numericality validator to still use value before type cast except Active Record.
 
-    Fixes #33651, #33686.
+## Rails 6.0.0.beta1 (January 18, 2019) ##
 
-    *Ryuta Kamizono*
+*   Internal calls to `human_attribute_name` on an `Active Model` now pass attributes as strings instead of symbols
+    in some cases.
 
+    This is in line with examples in Rails docs and puts the code in line with the intention -
+    the potential use of strings or symbols.
 
-## Rails 5.2.1.1 (November 27, 2018) ##
-
-*   No changes.
+    It is recommended to cast the attribute input to your desired type as if you you are overriding that methid.
 
+    *Martin Larochelle*
 
-## Rails 5.2.1 (August 07, 2018) ##
+*   Add `ActiveModel::Errors#of_kind?`.
 
-*   No changes.
+    *bogdanvlviv*, *Rafael Mendonça França*
 
+*   Fix numericality equality validation of `BigDecimal` and `Float`
+    by casting to `BigDecimal` on both ends of the validation.
 
-## Rails 5.2.0 (April 09, 2018) ##
+    *Gannon McGibbon*
 
-*   Do not lose all multiple `:includes` with options in serialization.
+*   Add `#slice!` method to `ActiveModel::Errors`.
 
-    *Mike Mangino*
+    *Daniel López Prat*
 
-*   Models using the attributes API with a proc default can now be marshalled.
+*   Fix numericality validator to still use value before type cast except Active Record.
 
-    Fixes #31216.
+    Fixes #33651, #33686.
 
-    *Sean Griffin*
+    *Ryuta Kamizono*
 
-*   Fix to working before/after validation callbacks on multiple contexts.
+*   Fix `ActiveModel::Serializers::JSON#as_json` method for timestamps.
 
-    *Yoshiyuki Hirano*
+    Before:
+    ```
+    contact = Contact.new(created_at: Time.utc(2006, 8, 1))
+    contact.as_json["created_at"] # => 2006-08-01 00:00:00 UTC
+    ```
 
-*   Execute `ConfirmationValidator` validation when `_confirmation`'s value is `false`.
+    After:
+    ```
+    contact = Contact.new(created_at: Time.utc(2006, 8, 1))
+    contact.as_json["created_at"] # => "2006-08-01T00:00:00.000Z"
+    ```
 
-    *bogdanvlviv*
+    *Bogdan Gusiev*
 
-*   Allow passing a Proc or Symbol to length validator options.
+*   Allows configurable attribute name for `#has_secure_password`. This
+    still defaults to an attribute named 'password', causing no breaking
+    change. There is a new method `#authenticate_XXX` where XXX is the
+    configured attribute name, making the existing `#authenticate` now an
+    alias for this when the attribute is the default 'password'.
 
-    *Matt Rohrer*
+    Example:
 
-*   Add method `#merge!` for `ActiveModel::Errors`.
+        class User < ActiveRecord::Base
+          has_secure_password :recovery_password, validations: false
+        end
 
-    *Jahfer Husain*
+        user = User.new()
+        user.recovery_password = "42password"
+        user.recovery_password_digest # => "$2a$04$iOfhwahFymCs5weB3BNH/uX..."
+        user.authenticate_recovery_password('42password') # => user
 
-*   Fix regression in numericality validator when comparing Decimal and Float input
-    values with more scale than the schema.
+    *Unathi Chonco*
 
-    *Bradley Priest*
+*   Add `config.active_model.i18n_customize_full_message` in order to control whether
+    the `full_message` error format can be overridden at the attribute or model
+    level in the locale files. This is `false` by default.
 
-*   Fix methods `#keys`, `#values` in `ActiveModel::Errors`.
+    *Martin Larochelle*
 
-    Change `#keys` to only return the keys that don't have empty messages.
+*   Rails 6 requires Ruby 2.5.0 or newer.
 
-    Change `#values` to only return the not empty values.
+    *Jeremy Daer*, *Kasper Timm Hansen*
 
-    Example:
 
-        # Before
-        person = Person.new
-        person.errors.keys     # => []
-        person.errors.values   # => []
-        person.errors.messages # => {}
-        person.errors[:name]   # => []
-        person.errors.messages # => {:name => []}
-        person.errors.keys     # => [:name]
-        person.errors.values   # => [[]]
-
-        # After
-        person = Person.new
-        person.errors.keys     # => []
-        person.errors.values   # => []
-        person.errors.messages # => {}
-        person.errors[:name]   # => []
-        person.errors.messages # => {:name => []}
-        person.errors.keys     # => []
-        person.errors.values   # => []
-
-    *bogdanvlviv*
-
-
-Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-stable/activemodel/CHANGELOG.md) for previous changes.
+Please check [5-2-stable](https://github.com/rails/rails/blob/5-2-stable/activemodel/CHANGELOG.md) for previous changes.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2018 David Heinemeier Hansson
+Copyright (c) 2004-2019 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -5,6 +5,8 @@ They allow for Action Pack helpers to interact with non-Active Record models,
 for example. Active Model also helps with building custom ORMs for use outside of
 the Rails framework.
 
+You can read more about Active Model in the {Active Model Basics}[https://edgeguides.rubyonrails.org/active_model_basics.html] guide.
+
 Prior to Rails 3.0, if a plugin or gem developer wanted to have an object
 interact with Action Pack helpers, it was required to either copy chunks of
 code from Rails, or monkey patch entire helpers to make them handle objects
@@ -239,7 +241,7 @@ The latest version of Active Model can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub
 
-* https://github.com/rails/rails/tree/5-2-stable/activemodel
+* https://github.com/rails/rails/tree/main/activemodel
 
 
 == License
@@ -253,7 +255,7 @@ Active Model is released under the MIT license:
 
 API documentation is at:
 
-* http://api.rubyonrails.org
+* https://api.rubyonrails.org
 
 Bug reports for the Ruby on Rails project can be filed here:
 
@@ -261,4 +263,4 @@ Bug reports for the Ruby on Rails project can be filed here:
 
 Feature requests should be discussed on the rails-core mailing list here:
 
-* https://groups.google.com/forum/?fromgroups#!forum/rubyonrails-core
+* https://discuss.rubyonrails.org/c/rubyonrails-core

data/lib/active_model/attribute/user_provided_default.rb

@@ -44,8 +44,7 @@ module ActiveModel
         end
       end
 
-      protected
-
+      private
         attr_reader :user_provided_value
     end
   end

data/lib/active_model/attribute.rb

@@ -133,10 +133,6 @@ module ActiveModel
     end
 
     protected
-
-      attr_reader :original_attribute
-      alias_method :assigned?, :original_attribute
-
       def original_value_for_database
         if assigned?
           original_attribute.original_value_for_database
@@ -146,6 +142,9 @@ module ActiveModel
       end
 
     private
+      attr_reader :original_attribute
+      alias :assigned? :original_attribute
+
       def initialize_dup(other)
         if defined?(@value) && @value.duplicable?
           @value = @value.dup

data/lib/active_model/attribute_assignment.rb

@@ -27,7 +27,7 @@ module ActiveModel
     #   cat.status # => 'sleeping'
     def assign_attributes(new_attributes)
       if !new_attributes.respond_to?(:stringify_keys)
-        raise ArgumentError, "When assigning attributes, you must pass a hash as an argument."
+        raise ArgumentError, "When assigning attributes, you must pass a hash as an argument, #{new_attributes.class} passed."
       end
       return if new_attributes.empty?
 
@@ -38,7 +38,6 @@ module ActiveModel
     alias attributes= assign_attributes
 
     private
-
       def _assign_attributes(attributes)
         attributes.each do |k, v|
           _assign_attribute(k, v)

data/lib/active_model/attribute_methods.rb

@@ -286,12 +286,12 @@ module ActiveModel
           method_name = matcher.method_name(attr_name)
 
           unless instance_method_already_implemented?(method_name)
-            generate_method = "define_method_#{matcher.method_missing_target}"
+            generate_method = "define_method_#{matcher.target}"
 
             if respond_to?(generate_method, true)
               send(generate_method, attr_name.to_s)
             else
-              define_proxy_call true, generated_attribute_methods, method_name, matcher.method_missing_target, attr_name.to_s
+              define_proxy_call true, generated_attribute_methods, method_name, matcher.target, attr_name.to_s
             end
           end
         end
@@ -352,53 +352,55 @@ module ActiveModel
 
         def attribute_method_matchers_matching(method_name)
           attribute_method_matchers_cache.compute_if_absent(method_name) do
-            # Must try to match prefixes/suffixes first, or else the matcher with no prefix/suffix
-            # will match every time.
+            # Bump plain matcher to last place so that only methods that do not
+            # match any other pattern match the actual attribute name.
+            # This is currently only needed to support legacy usage.
             matchers = attribute_method_matchers.partition(&:plain?).reverse.flatten(1)
-            matchers.map { |method| method.match(method_name) }.compact
+            matchers.map { |matcher| matcher.match(method_name) }.compact
           end
         end
 
         # Define a method `name` in `mod` that dispatches to `send`
         # using the given `extra` args. This falls back on `define_method`
         # and `send` if the given names cannot be compiled.
-        def define_proxy_call(include_private, mod, name, send, *extra)
+        def define_proxy_call(include_private, mod, name, target, *extra)
           defn = if NAME_COMPILABLE_REGEXP.match?(name)
             "def #{name}(*args)"
           else
             "define_method(:'#{name}') do |*args|"
           end
 
-          extra = (extra.map!(&:inspect) << "*args").join(", ".freeze)
+          extra = (extra.map!(&:inspect) << "*args").join(", ")
 
-          target = if CALL_COMPILABLE_REGEXP.match?(send)
-            "#{"self." unless include_private}#{send}(#{extra})"
+          body = if CALL_COMPILABLE_REGEXP.match?(target)
+            "#{"self." unless include_private}#{target}(#{extra})"
           else
-            "send(:'#{send}', #{extra})"
+            "send(:'#{target}', #{extra})"
           end
 
           mod.module_eval <<-RUBY, __FILE__, __LINE__ + 1
             #{defn}
-              #{target}
+              #{body}
             end
+            ruby2_keywords(:'#{name}') if respond_to?(:ruby2_keywords, true)
           RUBY
         end
 
         class AttributeMethodMatcher #:nodoc:
-          attr_reader :prefix, :suffix, :method_missing_target
+          attr_reader :prefix, :suffix, :target
 
-          AttributeMethodMatch = Struct.new(:target, :attr_name, :method_name)
+          AttributeMethodMatch = Struct.new(:target, :attr_name)
 
           def initialize(options = {})
             @prefix, @suffix = options.fetch(:prefix, ""), options.fetch(:suffix, "")
             @regex = /^(?:#{Regexp.escape(@prefix)})(.*)(?:#{Regexp.escape(@suffix)})$/
-            @method_missing_target = "#{@prefix}attribute#{@suffix}"
+            @target = "#{@prefix}attribute#{@suffix}"
             @method_name = "#{prefix}%s#{suffix}"
           end
 
           def match(method_name)
             if @regex =~ method_name
-              AttributeMethodMatch.new(method_missing_target, $1, method_name)
+              AttributeMethodMatch.new(target, $1)
             end
           end
 
@@ -430,6 +432,7 @@ module ActiveModel
         match ? attribute_missing(match, *args, &block) : super
       end
     end
+    ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
 
     # +attribute_missing+ is like +method_missing+, but for attributes. When
     # +method_missing+ is called we check to see if there is a matching
@@ -474,5 +477,43 @@ module ActiveModel
       def _read_attribute(attr)
         __send__(attr)
       end
+
+      module AttrNames # :nodoc:
+        DEF_SAFE_NAME = /\A[a-zA-Z_]\w*\z/
+
+        # We want to generate the methods via module_eval rather than
+        # define_method, because define_method is slower on dispatch.
+        # Evaluating many similar methods may use more memory as the instruction
+        # sequences are duplicated and cached (in MRI).  define_method may
+        # be slower on dispatch, but if you're careful about the closure
+        # created, then define_method will consume much less memory.
+        #
+        # But sometimes the database might return columns with
+        # characters that are not allowed in normal method names (like
+        # 'my_column(omg)'. So to work around this we first define with
+        # the __temp__ identifier, and then use alias method to rename
+        # it to what we want.
+        #
+        # We are also defining a constant to hold the frozen string of
+        # the attribute name. Using a constant means that we do not have
+        # to allocate an object on each call to the attribute method.
+        # Making it frozen means that it doesn't get duped when used to
+        # key the @attributes in read_attribute.
+        def self.define_attribute_accessor_method(mod, attr_name, writer: false)
+          method_name = "#{attr_name}#{'=' if writer}"
+          if attr_name.ascii_only? && DEF_SAFE_NAME.match?(attr_name)
+            yield method_name, "'#{attr_name}'.freeze"
+          else
+            safe_name = attr_name.unpack1("h*")
+            const_name = "ATTR_#{safe_name}"
+            const_set(const_name, attr_name) unless const_defined?(const_name)
+            temp_method_name = "__temp__#{safe_name}#{'=' if writer}"
+            attr_name_expr = "::ActiveModel::AttributeMethods::AttrNames::#{const_name}"
+            yield temp_method_name, attr_name_expr
+            mod.alias_method method_name, temp_method_name
+            mod.undef_method temp_method_name
+          end
+        end
+      end
   end
 end