activerecord 3.2.22.4 → 3.2.22.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66d5ba0e0f319c243cf6e9cbaf266e00410499f7
-  data.tar.gz: 54206ff225d217e9447d0620d4103cff614b9870
+  metadata.gz: b2a1b133cbd413ee58ccc671828333632ed6db3b
+  data.tar.gz: 8f7eed84647eebadf1270dc241dca3063b4586f5
 SHA512:
-  metadata.gz: d2167e6e336d5feea7a3305bb1a1f324c0df47cfd8d339aa4c9cccf0107462c797e6160c09d23a605dde1f86f12581d4d08b4b92bb33eaf950f903489d311a86
-  data.tar.gz: afbdd3c0ad5de1976da42c075ba15c09ee7c356fded0886f49480851c64deb34c04fc73488a39e874459551b129b071fb8cdcfe3ae72c0c62a3cc9415a895d4f
+  metadata.gz: 0bef1cca318f136e3c84fda17c030b840b6d889a836dee9753b000bde1fa951b90873145d6a79f7f42d76db8ae6fa66e79244baea47f5e440f8dafa1ecd6325e
+  data.tar.gz: 98f44f3efcaa299b5044a14851dc577b63c6281d4f18c152ce2fd4de1562170e8fa6aac3109eb101fdc1b5df05f5cb06efc1b8ea6ab7e69e080ebbac137a74fd

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+* Support Ruby 2.3 by not unexpectedly calling `.to_proc` on Hash objects
+
+    Fixes #25010
+
+    *tlrdstd*
+
 ## Rails 3.2.22 (Jun 16, 2015) ##
 
 * No changes.

data/lib/active_record/associations/association.rb

@@ -158,7 +158,7 @@ module ActiveRecord
       end
 
       def interpolate(sql, record = nil)
-        if sql.respond_to?(:to_proc)
+        if sql.respond_to?(:to_proc) && !sql.is_a?(Hash)
           owner.send(:instance_exec, record, &sql)
         else
           sql

data/lib/active_record/associations/join_dependency/join_association.rb

@@ -146,7 +146,7 @@ module ActiveRecord
         private
 
         def interpolate(conditions)
-          if conditions.respond_to?(:to_proc)
+          if conditions.respond_to?(:to_proc) && !conditions.is_a?(Hash)
             instance_eval(&conditions)
           else
             conditions

data/lib/active_record/associations/preloader/association.rb

@@ -113,7 +113,7 @@ module ActiveRecord
         end
 
         def process_conditions(conditions)
-          if conditions.respond_to?(:to_proc)
+          if conditions.respond_to?(:to_proc) && !conditions.is_a?(Hash)
             conditions = klass.send(:instance_eval, &conditions)
           end
 

data/lib/active_record/version.rb

@@ -3,7 +3,7 @@ module ActiveRecord
     MAJOR = 3
     MINOR = 2
     TINY  = 22
-    PRE   = "4"
+    PRE   = "5"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 3.2.22.4
+  version: 3.2.22.5
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.22.4
+        version: 3.2.22.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.22.4
+        version: 3.2.22.5
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.22.4
+        version: 3.2.22.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.22.4
+        version: 3.2.22.5
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -246,8 +246,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).
 test_files: []
+has_rdoc: