activemodel 5.2.3.rc1 → 6.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57fe827ff814dde112447074f27149b1b723e25ee1161210adcd46906b384222
-  data.tar.gz: 362da50ed52cdba8bfeb824673b37b0466cb92bb3ffafa70e6ede1daf27f8a47
+  metadata.gz: 69b55e1af8331655f54dbced151a75b1ccbd7e48757fc4a3fd1ee2e5f2236d5a
+  data.tar.gz: e756ba5fc97ccd6ee212f32568e58e372b6e94d79082c81711b8e39ac6d86a3a
 SHA512:
-  metadata.gz: ed20115eaf44cc76db921bdd8339c96525751ab6285879a773d1aa0db7c9226e5b89c0b626d35bf50a41a51c23c2d9128270c2a908e845d521fae9634e612953
-  data.tar.gz: a4aa37d04da1aa165e945a587998dededb9197f96a57c7af5d289ebe45d873703a161d8595d91271bd997aa6433ef5ff05c9ba11f5b0feb2cac85a6751980db7
+  metadata.gz: 394b1945a1c68549337a884d68985f0e15c2cbef0e0f968ee50ab55076327e6d55558d9d884d580b7359ea87f460c9a31211090f621f919b3967aa2e9b93188d
+  data.tar.gz: 0e1e72d58afc1f7b3f572276c9efa4b21586fa4741d8e31ab2c3bf7bb19e98888f571731d4b5dc04c0ae5f76e5e6c8ee4cf481458eef8e1669c03445277317ec

data/CHANGELOG.md

@@ -1,34 +1,17 @@
-## Rails 5.2.3.rc1 (March 21, 2019) ##
+## Rails 6.0.0.beta1 (January 18, 2019) ##
 
-*   Fix date value when casting a multiparameter date hash to not convert
-    from Gregorian date to Julian date.
+*   Add `ActiveModel::Errors#of_kind?`.
 
-    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>
-
-    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>
-
-    Fixes #28521.
-
-    *Sayan Chakraborty*
+    *bogdanvlviv*, *Rafael Mendonça França*
 
 *   Fix numericality equality validation of `BigDecimal` and `Float`
     by casting to `BigDecimal` on both ends of the validation.
 
     *Gannon McGibbon*
 
+*   Add `#slice!` method to `ActiveModel::Errors`.
 
-## Rails 5.2.2.1 (March 11, 2019) ##
-
-*   No changes.
-
-
-## Rails 5.2.2 (December 04, 2018) ##
+    *Daniel López Prat*
 
 *   Fix numericality validator to still use value before type cast except Active Record.
 
@@ -36,79 +19,50 @@
 
     *Ryuta Kamizono*
 
+*   Fix `ActiveModel::Serializers::JSON#as_json` method for timestamps.
 
-## Rails 5.2.1.1 (November 27, 2018) ##
-
-*   No changes.
-
-
-## Rails 5.2.1 (August 07, 2018) ##
-
-*   No changes.
-
-
-## Rails 5.2.0 (April 09, 2018) ##
-
-*   Do not lose all multiple `:includes` with options in serialization.
-
-    *Mike Mangino*
-
-*   Models using the attributes API with a proc default can now be marshalled.
-
-    Fixes #31216.
-
-    *Sean Griffin*
-
-*   Fix to working before/after validation callbacks on multiple contexts.
-
-    *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_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

@@ -239,7 +239,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/master/activemodel
 
 
 == License

data/lib/active_model.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #--
-# 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/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/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_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?
 

data/lib/active_model/attribute_methods.rb

@@ -369,7 +369,7 @@ module ActiveModel
             "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})"
@@ -474,5 +474,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

data/lib/active_model/attribute_mutation_tracker.rb

@@ -69,13 +69,8 @@ module ActiveModel
       forced_changes << attr_name.to_s
     end
 
-    # TODO Change this to private once we've dropped Ruby 2.2 support.
-    # Workaround for Ruby 2.2 "private attribute?" warning.
-    protected
-
-      attr_reader :attributes, :forced_changes
-
     private
+      attr_reader :attributes, :forced_changes
 
       def attr_names
         attributes.keys

data/lib/active_model/attribute_set.rb

@@ -37,16 +37,8 @@ module ActiveModel
       attributes.each_key.select { |name| self[name].initialized? }
     end
 
-    if defined?(JRUBY_VERSION)
-      # This form is significantly faster on JRuby, and this is one of our biggest hotspots.
-      # https://github.com/jruby/jruby/pull/2562
-      def fetch_value(name, &block)
-        self[name].value(&block)
-      end
-    else
-      def fetch_value(name)
-        self[name].value { |n| yield n if block_given? }
-      end
+    def fetch_value(name, &block)
+      self[name].value(&block)
     end
 
     def write_from_database(name, value)

data/lib/active_model/attribute_set/builder.rb

@@ -90,9 +90,6 @@ module ActiveModel
     end
 
     protected
-
-      attr_reader :types, :values, :additional_types, :delegate_hash, :default_attributes
-
       def materialize
         unless @materialized
           values.each_key { |key| self[key] }
@@ -105,6 +102,7 @@ module ActiveModel
       end
 
     private
+      attr_reader :types, :values, :additional_types, :delegate_hash, :default_attributes
 
       def assign_default_value(name)
         type = additional_types.fetch(name, types[name])

data/lib/active_model/attribute_set/yaml_encoder.rb

@@ -33,8 +33,7 @@ module ActiveModel
         end
       end
 
-      protected
-
+      private
         attr_reader :default_types
     end
   end

data/lib/active_model/attributes.rb

@@ -29,17 +29,16 @@ module ActiveModel
       private
 
         def define_method_attribute=(name)
-          safe_name = name.unpack("h*".freeze).first
-          ActiveModel::AttributeMethods::AttrNames.set_name_cache safe_name, name
-
-          generated_attribute_methods.module_eval <<-STR, __FILE__, __LINE__ + 1
-            def __temp__#{safe_name}=(value)
-              name = ::ActiveModel::AttributeMethods::AttrNames::ATTR_#{safe_name}
-              write_attribute(name, value)
-            end
-            alias_method #{(name + '=').inspect}, :__temp__#{safe_name}=
-            undef_method :__temp__#{safe_name}=
-          STR
+          ActiveModel::AttributeMethods::AttrNames.define_attribute_accessor_method(
+            generated_attribute_methods, name, writer: true,
+          ) do |temp_method_name, attr_name_expr|
+            generated_attribute_methods.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+              def #{temp_method_name}(value)
+                name = #{attr_name_expr}
+                write_attribute(name, value)
+              end
+            RUBY
+          end
         end
 
         NO_DEFAULT_PROVIDED = Object.new # :nodoc:
@@ -97,15 +96,4 @@ module ActiveModel
         write_attribute(attribute_name, value)
       end
   end
-
-  module AttributeMethods #:nodoc:
-    AttrNames = Module.new {
-      def self.set_name_cache(name, value)
-        const_name = "ATTR_#{name}"
-        unless const_defined? const_name
-          const_set const_name, value.dup.freeze
-        end
-      end
-    }
-  end
 end

data/lib/active_model/callbacks.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "active_support/core_ext/array/extract_options"
+require "active_support/core_ext/hash/keys"
 
 module ActiveModel
   # == Active \Model \Callbacks
@@ -127,26 +128,28 @@ module ActiveModel
     private
 
       def _define_before_model_callback(klass, callback)
-        klass.define_singleton_method("before_#{callback}") do |*args, &block|
-          set_callback(:"#{callback}", :before, *args, &block)
+        klass.define_singleton_method("before_#{callback}") do |*args, **options, &block|
+          options.assert_valid_keys(:if, :unless, :prepend)
+          set_callback(:"#{callback}", :before, *args, options, &block)
         end
       end
 
       def _define_around_model_callback(klass, callback)
-        klass.define_singleton_method("around_#{callback}") do |*args, &block|
-          set_callback(:"#{callback}", :around, *args, &block)
+        klass.define_singleton_method("around_#{callback}") do |*args, **options, &block|
+          options.assert_valid_keys(:if, :unless, :prepend)
+          set_callback(:"#{callback}", :around, *args, options, &block)
         end
       end
 
       def _define_after_model_callback(klass, callback)
-        klass.define_singleton_method("after_#{callback}") do |*args, &block|
-          options = args.extract_options!
+        klass.define_singleton_method("after_#{callback}") do |*args, **options, &block|
+          options.assert_valid_keys(:if, :unless, :prepend)
           options[:prepend] = true
           conditional = ActiveSupport::Callbacks::Conditionals::Value.new { |v|
             v != false
           }
           options[:if] = Array(options[:if]) << conditional
-          set_callback(:"#{callback}", :after, *(args << options), &block)
+          set_callback(:"#{callback}", :after, *args, options, &block)
         end
       end
   end

data/lib/active_model/conversion.rb

@@ -103,7 +103,7 @@ module ActiveModel
         @_to_partial_path ||= begin
           element = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(name))
           collection = ActiveSupport::Inflector.tableize(name)
-          "#{collection}/#{element}".freeze
+          "#{collection}/#{element}"
         end
       end
     end