activemodel 5.1.4 → 5.1.5.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 14d047e4a2335ef26939d0f59dcb6f1b74dc2000
-  data.tar.gz: 45e391b13163001bc535e0c85f8dd6d3e0b15614
+SHA256:
+  metadata.gz: ee08b52469bd21af38d855b94e1c64ad758bdf478bead7d15105261be33a0791
+  data.tar.gz: a89bd9a6f70e49a110809fb6825cfe4d93faea56d2aa6d6dadfa918d7780e672
 SHA512:
-  metadata.gz: bbf0d0f50e828ae92cda62ad17cc581808fe9b32cbe8201fa6fee28f71aec1fb0313c334efbdc4a57fdeb90cdde848f05e8f099cfe26f1ab0788bb07756887ae
-  data.tar.gz: 03c025244fb4af8e33a823f6541431cd1fea82d906425bd5d60660e6c97007148fa1f90f0992a864409a3145fd6cc3de80ee1493cf8172d7a9575afd1fc20f0d
+  metadata.gz: 182830a35abde2b82043f381f439296597f73f5401d231593f641b419474c3ce44ae21ae73ff3b77d724494be5ed19ed3d275d7daed4d8d9475ee58653ddd2e5
+  data.tar.gz: c23097e6c0b07b959b00f9fa2530d556727607ab22107c155202fab34ba368eb2b70677cd548e0cc00ed2088f2d02bb5114b4c0452345694db302edae92b7100

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Rails 5.1.5.rc1 (February 01, 2018) ##
+
+*   Fix to working before/after validation callbacks on multiple contexts.
+
+    *Yoshiyuki Hirano*
+
 ## Rails 5.1.4 (September 07, 2017) ##
 
 *   No changes.

data/lib/active_model/gem_version.rb

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

data/lib/active_model/validations/callbacks.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel
 version: !ruby/object:Gem::Version
-  version: 5.1.4
+  version: 5.1.5.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: 5.1.5.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: 5.1.5.rc1
 description: A toolkit for building modeling frameworks like Active Record. Rich support
   for attributes, callbacks, validations, serialization, internationalization, and
   testing.
@@ -92,7 +92,9 @@ files:
 homepage: http://rubyonrails.org
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/rails/rails/tree/v5.1.5.rc1/activemodel
+  changelog_uri: https://github.com/rails/rails/blob/v5.1.5.rc1/activemodel/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -104,12 +106,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A toolkit for building modeling frameworks (part of Rails).