activemodel 5.0.0.rc1 → 5.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 187907df332936988c9eba39330779ff89b1080e
-  data.tar.gz: 7eca08dafdab89b326c0167ecfee8d5b7d487ded
+  metadata.gz: 3f7ad7a43ab3ab58ba5f7416d2ccf4f703022c69
+  data.tar.gz: 2c34cdd86def65c713490bae07845a11f042fd55
 SHA512:
-  metadata.gz: 6dd164ef7b2f08b8b876bf9c4f94f3f24c01e67db30afefad7c7c56daa5411c8628ed36ce9c68ad26149d9c60c73dba542ba3164a12d72e3007991bda3240f0f
-  data.tar.gz: 5c8e3f1e7662de8671191f6ff6c9cd347f53d4fcb4bdc7960790182c99d62a71becaf5a09ae4c4477cbb112f78ae63d6788033d8eadddcf710fdf5f21a9d3649
+  metadata.gz: 86c1a3cd564baa3947317fda7e795c0552fba747cabf4d3b49c4a6429d49dca2d8cc923b54eda49c540d79ca44a7e09bcf81054cc94d5b1b63998e8b98355c96
+  data.tar.gz: 192a19c563abce9f7a9dfcb9c169427bd4fe34be360d6fde5a6f14ea3efca44c85e95b1d177f60975296649b440eb7affd9c7a8e7d14d0b5040685ac7f2000e8

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## Rails 5.0.0.rc2 (June 22, 2016) ##
+
+*   Ensure that instances of `ActiveModel::Errors` can be marshalled.
+    Fixes #25165.
+
+    *Sean Griffin*
+
 ## Rails 5.0.0.rc1 (May 06, 2016) ##
 
 *   No changes.

data/lib/active_model/errors.rb

@@ -71,8 +71,8 @@ module ActiveModel
     #   end
     def initialize(base)
       @base     = base
-      @messages = Hash.new { |messages, attribute| messages[attribute] = [] }
-      @details  = Hash.new { |details, attribute| details[attribute] = [] }
+      @messages = apply_default_array({})
+      @details = apply_default_array({})
     end
 
     def initialize_dup(other) # :nodoc:
@@ -493,6 +493,16 @@ module ActiveModel
       I18n.translate(key, options)
     end
 
+    def marshal_dump
+      [@base, without_default_proc(@messages), without_default_proc(@details)]
+    end
+
+    def marshal_load(array)
+      @base, @messages, @details = array
+      apply_default_array(@messages)
+      apply_default_array(@details)
+    end
+
   private
     def normalize_message(attribute, message, options)
       case message
@@ -506,6 +516,17 @@ module ActiveModel
     def normalize_detail(message, options)
       { error: message }.merge(options.except(*CALLBACKS_OPTIONS + MESSAGE_OPTIONS))
     end
+
+    def without_default_proc(hash)
+      hash.dup.tap do |new_h|
+        new_h.default_proc = nil
+      end
+    end
+
+    def apply_default_array(hash)
+      hash.default_proc = proc { |h, key| h[key] = [] }
+      hash
+    end
   end
 
   # Raised when a validation cannot be corrected by end users and are considered

data/lib/active_model/gem_version.rb

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

data/lib/active_model/validations/numericality.rb

@@ -120,7 +120,7 @@ module ActiveModel
       # * <tt>:only_integer</tt> - Specifies whether the value has to be an
       #   integer, e.g. an integral value (default is +false+).
       # * <tt>:allow_nil</tt> - Skip validation if attribute is +nil+ (default is
-      #   +false+). Notice that for fixnum and float columns empty strings are
+      #   +false+). Notice that for Integer and Float columns empty strings are
       #   converted to +nil+.
       # * <tt>:greater_than</tt> - Specifies the value must be greater than the
       #   supplied value.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc1
+  version: 5.0.0.rc2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc1
+        version: 5.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc1
+        version: 5.0.0.rc2
 description: A toolkit for building modeling frameworks like Active Record. Rich support
   for attributes, callbacks, validations, serialization, internationalization, and
   testing.
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A toolkit for building modeling frameworks (part of Rails).