activemodel 5.2.0.rc1 → 5.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 666a46bf39ff339f606b0d60219d61138a7de2def4808f6135255ee2a2b43ff0
-  data.tar.gz: 5de9942d5e2dfd21df46a9ac538bc83b4bc879c57884e3f26192f4204dac6d33
+  metadata.gz: 97b6d1fb9b61ef956d88c6ee764394e9ccc0fcad2333073a876066fd9c7fcb7a
+  data.tar.gz: 86e60a71d98b585c900c3351a4c4fcf1f16ac73e4c0fc0b4595a443733c31f50
 SHA512:
-  metadata.gz: f1f362e75e4a2cf7f08d2a89c2c8465516a72f014fc9d5d230a5cbc18195a4c734deb1b0c5bdede79d7126c7450154218b33824b5ab7b778ce033a800f156c68
-  data.tar.gz: b00a94be4f5c30d482412abfb0e395c46804195b6c64ab57ba0f4cb4f01481bf2ff6ae4b32f0b51177859b496f8253413bbe8672602390f80b71df7a31b8a500
+  metadata.gz: 3d11a69342faac6bed87647ec40059830c8441459f30a6c9d94f3656ff2ce89a08fe3b12eed6846bae3352eb5fb929d4e30ab91611e569e7dae5f9e851fe47ba
+  data.tar.gz: 3493c445e4a3db83fcad5b043a82d16cf1242286bd49e73755bebf82a17f6b0f8f78d9563d2eac7d6ba739dc921b8a9a8a9ce2108098e4aab72bfa335658feec

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## Rails 5.2.0.rc2 (March 20, 2018) ##
+
+*   Do not lose all multiple `:includes` with options in serialization.
+
+    *Mike Mangino*
+
+
 ## Rails 5.2.0.rc1 (January 30, 2018) ##
 
 *   Models using the attributes API with a proc default can now be marshalled.

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/master/activemodel
+* https://github.com/rails/rails/tree/5-2-stable/activemodel
 
 
 == License

data/lib/active_model/attribute_assignment.rb

@@ -35,6 +35,8 @@ module ActiveModel
       _assign_attributes(sanitize_for_mass_assignment(attributes))
     end
 
+    alias attributes= assign_attributes
+
     private
 
       def _assign_attributes(attributes)

data/lib/active_model/attribute_mutation_tracker.rb

@@ -35,10 +35,6 @@ module ActiveModel
       end
     end
 
-    def changed_attribute_names
-      attr_names.select { |attr| changed?(attr) }
-    end
-
     def any_changes?
       attr_names.any? { |attr| changed?(attr) }
     end
@@ -113,5 +109,8 @@ module ActiveModel
 
     def original_value(*)
     end
+
+    def force_change(*)
+    end
   end
 end

data/lib/active_model/attribute_set/builder.rb

@@ -22,12 +22,12 @@ module ActiveModel
   class LazyAttributeHash # :nodoc:
     delegate :transform_values, :each_key, :each_value, :fetch, :except, to: :materialize
 
-    def initialize(types, values, additional_types, default_attributes)
+    def initialize(types, values, additional_types, default_attributes, delegate_hash = {})
       @types = types
       @values = values
       @additional_types = additional_types
       @materialized = false
-      @delegate_hash = {}
+      @delegate_hash = delegate_hash
       @default_attributes = default_attributes
     end
 
@@ -76,15 +76,17 @@ module ActiveModel
     end
 
     def marshal_dump
-      materialize
+      [@types, @values, @additional_types, @default_attributes, @delegate_hash]
     end
 
-    def marshal_load(delegate_hash)
-      @delegate_hash = delegate_hash
-      @types = {}
-      @values = {}
-      @additional_types = {}
-      @materialized = true
+    def marshal_load(values)
+      if values.is_a?(Hash)
+        empty_hash = {}.freeze
+        initialize(empty_hash, empty_hash, empty_hash, empty_hash, values)
+        @materialized = true
+      else
+        initialize(*values)
+      end
     end
 
     protected

data/lib/active_model/attributes.rb

@@ -66,6 +66,10 @@ module ActiveModel
       super
     end
 
+    def attributes
+      @attributes.to_hash
+    end
+
     private
 
       def write_attribute(attr_name, value)

data/lib/active_model/dirty.rb

@@ -3,7 +3,6 @@
 require "active_support/hash_with_indifferent_access"
 require "active_support/core_ext/object/duplicable"
 require "active_model/attribute_mutation_tracker"
-require "active_model/attribute_set"
 
 module ActiveModel
   # == Active \Model \Dirty
@@ -143,8 +142,11 @@ module ActiveModel
     end
 
     def changes_applied # :nodoc:
-      _prepare_changes
+      unless defined?(@attributes)
+        @previously_changed = changes
+      end
       @mutations_before_last_save = mutations_from_database
+      @attributes_changed_by_setter = ActiveSupport::HashWithIndifferentAccess.new
       forget_attribute_assignments
       @mutations_from_database = nil
     end
@@ -155,7 +157,7 @@ module ActiveModel
     #   person.name = 'bob'
     #   person.changed? # => true
     def changed?
-      mutations_from_database.any_changes?
+      changed_attributes.present?
     end
 
     # Returns an array with the name of the attributes with unsaved changes.
@@ -164,24 +166,24 @@ module ActiveModel
     #   person.name = 'bob'
     #   person.changed # => ["name"]
     def changed
-      mutations_from_database.changed_attribute_names
+      changed_attributes.keys
     end
 
     # Handles <tt>*_changed?</tt> for +method_missing+.
     def attribute_changed?(attr, from: OPTION_NOT_GIVEN, to: OPTION_NOT_GIVEN) # :nodoc:
-      !!mutations_from_database.changed?(attr) &&
+      !!changes_include?(attr) &&
         (to == OPTION_NOT_GIVEN || to == _read_attribute(attr)) &&
-        (from == OPTION_NOT_GIVEN || from == attribute_was(attr))
+        (from == OPTION_NOT_GIVEN || from == changed_attributes[attr])
     end
 
     # Handles <tt>*_was</tt> for +method_missing+.
     def attribute_was(attr) # :nodoc:
-      mutations_from_database.original_value(attr)
+      attribute_changed?(attr) ? changed_attributes[attr] : _read_attribute(attr)
     end
 
     # Handles <tt>*_previously_changed?</tt> for +method_missing+.
     def attribute_previously_changed?(attr) #:nodoc:
-      mutations_before_last_save.changed?(attr)
+      previous_changes_include?(attr)
     end
 
     # Restore all previous data of the provided attributes.
@@ -191,12 +193,15 @@ module ActiveModel
 
     # Clears all dirty data: current changes and previous changes.
     def clear_changes_information
+      @previously_changed = ActiveSupport::HashWithIndifferentAccess.new
       @mutations_before_last_save = nil
+      @attributes_changed_by_setter = ActiveSupport::HashWithIndifferentAccess.new
       forget_attribute_assignments
       @mutations_from_database = nil
     end
 
     def clear_attribute_changes(attr_names)
+      attributes_changed_by_setter.except!(*attr_names)
       attr_names.each do |attr_name|
         clear_attribute_change(attr_name)
       end
@@ -209,7 +214,13 @@ module ActiveModel
     #   person.name = 'robert'
     #   person.changed_attributes # => {"name" => "bob"}
     def changed_attributes
-      mutations_from_database.changed_values.freeze
+      # This should only be set by methods which will call changed_attributes
+      # multiple times when it is known that the computed value cannot change.
+      if defined?(@cached_changed_attributes)
+        @cached_changed_attributes
+      else
+        attributes_changed_by_setter.reverse_merge(mutations_from_database.changed_values).freeze
+      end
     end
 
     # Returns a hash of changed attributes indicating their original
@@ -219,8 +230,9 @@ module ActiveModel
     #   person.name = 'bob'
     #   person.changes # => { "name" => ["bill", "bob"] }
     def changes
-      _prepare_changes
-      mutations_from_database.changes
+      cache_changed_attributes do
+        ActiveSupport::HashWithIndifferentAccess[changed.map { |attr| [attr, attribute_change(attr)] }]
+      end
     end
 
     # Returns a hash of attributes that were changed before the model was saved.
@@ -230,7 +242,8 @@ module ActiveModel
     #   person.save
     #   person.previous_changes # => {"name" => ["bob", "robert"]}
     def previous_changes
-      mutations_before_last_save.changes
+      @previously_changed ||= ActiveSupport::HashWithIndifferentAccess.new
+      @previously_changed.merge(mutations_before_last_save.changes)
     end
 
     def attribute_changed_in_place?(attr_name) # :nodoc:
@@ -246,17 +259,11 @@ module ActiveModel
         unless defined?(@mutations_from_database)
           @mutations_from_database = nil
         end
-
-        unless defined?(@attributes)
-          @_pseudo_attributes = true
-          @attributes = AttributeSet.new(
-            Hash.new { |h, attr|
-              h[attr] = Attribute.with_cast_value(attr, _clone_attribute(attr), Type.default_value)
-            }
-          )
+        @mutations_from_database ||= if defined?(@attributes)
+          ActiveModel::AttributeMutationTracker.new(@attributes)
+        else
+          NullMutationTracker.instance
         end
-
-        @mutations_from_database ||= ActiveModel::AttributeMutationTracker.new(@attributes)
       end
 
       def forget_attribute_assignments
@@ -267,45 +274,68 @@ module ActiveModel
         @mutations_before_last_save ||= ActiveModel::NullMutationTracker.instance
       end
 
+      def cache_changed_attributes
+        @cached_changed_attributes = changed_attributes
+        yield
+      ensure
+        clear_changed_attributes_cache
+      end
+
+      def clear_changed_attributes_cache
+        remove_instance_variable(:@cached_changed_attributes) if defined?(@cached_changed_attributes)
+      end
+
+      # Returns +true+ if attr_name is changed, +false+ otherwise.
+      def changes_include?(attr_name)
+        attributes_changed_by_setter.include?(attr_name) || mutations_from_database.changed?(attr_name)
+      end
+      alias attribute_changed_by_setter? changes_include?
+
+      # Returns +true+ if attr_name were changed before the model was saved,
+      # +false+ otherwise.
+      def previous_changes_include?(attr_name)
+        previous_changes.include?(attr_name)
+      end
+
       # Handles <tt>*_change</tt> for +method_missing+.
       def attribute_change(attr)
-        [attribute_was(attr), _read_attribute(attr)] if attribute_changed?(attr)
+        [changed_attributes[attr], _read_attribute(attr)] if attribute_changed?(attr)
       end
 
       # Handles <tt>*_previous_change</tt> for +method_missing+.
       def attribute_previous_change(attr)
-        mutations_before_last_save.change_to_attribute(attr)
+        previous_changes[attr] if attribute_previously_changed?(attr)
       end
 
       # Handles <tt>*_will_change!</tt> for +method_missing+.
       def attribute_will_change!(attr)
-        attr = attr.to_s
-        mutations_from_database.force_change(attr).tap do
-          @attributes[attr] if defined?(@_pseudo_attributes)
+        unless attribute_changed?(attr)
+          begin
+            value = _read_attribute(attr)
+            value = value.duplicable? ? value.clone : value
+          rescue TypeError, NoMethodError
+          end
+
+          set_attribute_was(attr, value)
         end
+        mutations_from_database.force_change(attr)
       end
 
       # Handles <tt>restore_*!</tt> for +method_missing+.
       def restore_attribute!(attr)
         if attribute_changed?(attr)
-          __send__("#{attr}=", attribute_was(attr))
+          __send__("#{attr}=", changed_attributes[attr])
           clear_attribute_changes([attr])
         end
       end
 
-      def _prepare_changes
-        if defined?(@_pseudo_attributes)
-          changed.each do |attr|
-            @attributes.write_from_user(attr, _read_attribute(attr))
-          end
-        end
+      def attributes_changed_by_setter
+        @attributes_changed_by_setter ||= ActiveSupport::HashWithIndifferentAccess.new
       end
 
-      def _clone_attribute(attr)
-        value = _read_attribute(attr)
-        value.duplicable? ? value.clone : value
-      rescue TypeError, NoMethodError
-        value
+      # Force an attribute to have a particular "before" value
+      def set_attribute_was(attr, old_value)
+        attributes_changed_by_setter[attr] = old_value
       end
   end
 end

data/lib/active_model/gem_version.rb

@@ -10,7 +10,7 @@ module ActiveModel
     MAJOR = 5
     MINOR = 2
     TINY  = 0
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_model/serialization.rb

@@ -179,7 +179,7 @@ module ActiveModel
         return unless includes = options[:include]
 
         unless includes.is_a?(Hash)
-          includes = Hash[Array(includes).map { |n| n.is_a?(Hash) ? n.to_a.first : [n, {}] }]
+          includes = Hash[Array(includes).flat_map { |n| n.is_a?(Hash) ? n.to_a : [[n, {}]] }]
         end
 
         includes.each do |association, opts|

data/lib/active_model/type/date.rb

@@ -42,7 +42,7 @@ module ActiveModel
         end
 
         def new_date(year, mon, mday)
-          if year && year != 0
+          unless year.nil? || (year == 0 && mon == 0 && mday == 0)
             ::Date.new(year, mon, mday) rescue nil
           end
         end

data/lib/active_model/type/time.rb

@@ -28,14 +28,10 @@ module ActiveModel
       private
 
         def cast_value(value)
-          return value unless value.is_a?(::String)
+          return apply_seconds_precision(value) unless value.is_a?(::String)
           return if value.empty?
 
-          if value.start_with?("2000-01-01")
-            dummy_time_value = value
-          else
-            dummy_time_value = "2000-01-01 #{value}"
-          end
+          dummy_time_value = value.sub(/\A(\d\d\d\d-\d\d-\d\d |)/, "2000-01-01 ")
 
           fast_string_to_time(dummy_time_value) || begin
             time_hash = ::Date._parse(dummy_time_value)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel
 version: !ruby/object:Gem::Version
-  version: 5.2.0.rc1
+  version: 5.2.0.rc2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0.rc1
+        version: 5.2.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0.rc1
+        version: 5.2.0.rc2
 description: A toolkit for building modeling frameworks like Active Record. Rich support
   for attributes, callbacks, validations, serialization, internationalization, and
   testing.
@@ -100,8 +100,8 @@ homepage: http://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v5.2.0.rc1/activemodel
-  changelog_uri: https://github.com/rails/rails/blob/v5.2.0.rc1/activemodel/CHANGELOG.md
+  source_code_uri: https://github.com/rails/rails/tree/v5.2.0.rc2/activemodel
+  changelog_uri: https://github.com/rails/rails/blob/v5.2.0.rc2/activemodel/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A toolkit for building modeling frameworks (part of Rails).