activerecord 3.2.21 → 3.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4d12d5e44431550c616522271504c6a129a3a80
-  data.tar.gz: 05035b1c9da53423115748d8b8a66176428288f5
+  metadata.gz: d685d6b2e0591a43ef4db163eaacb4719da9b4ff
+  data.tar.gz: b459417898a13e28e215bcab931e45acb6a6b420
 SHA512:
-  metadata.gz: d254f605da43430475aeb17c84e823dea51f5e44cc478c76ecd2d2551a0612cbbe9d1539ff6810af1fb41c15d9603565b9ab76d5e736481ecc5452e00170e955
-  data.tar.gz: a4d2b116545ccd32eaa7a9e7c3f500df6c40d1c2f9005d909ddc8dff3b6779ad05d0f418bd85a6d95486f5a5d54baf0984bc52e635e7d6edb230b839508fe1d4
+  metadata.gz: e67ea6890e20adc8301230ed16d969ff4fb87a792f37cd4dc9436033f557bf319897b0b9e9ebe55d24d397ba1de730fc879f7fb2186f92f7002eacd70f52c5fb
+  data.tar.gz: b053ac5da94cd12748373ff954db55f6a5fda9dccd6953a4e47a36909d71dd32ad1f53675fdf91f2faa3edbe3ae6d4362f4a50e5e85179405b44fcd1ac42cd1f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Rails 3.2.22 (Jun 16, 2015) ##
+
+* No changes.
+
+
 ## Rails 3.2.19 (Jul 2, 2014) ##
 
 *   Fix SQL Injection Vulnerability in 'bitstring' quoting.

data/lib/active_record/associations/has_many_association.rb

@@ -50,15 +50,15 @@ module ActiveRecord
           [options[:limit], count].compact.min
         end
 
-        def has_cached_counter?(reflection = reflection)
+        def has_cached_counter?(reflection = self.reflection)
           owner.attribute_present?(cached_counter_attribute_name(reflection))
         end
 
-        def cached_counter_attribute_name(reflection = reflection)
+        def cached_counter_attribute_name(reflection = self.reflection)
           "#{reflection.name}_count"
         end
 
-        def update_counter(difference, reflection = reflection)
+        def update_counter(difference, reflection = self.reflection)
           if has_cached_counter?(reflection)
             counter = cached_counter_attribute_name(reflection)
             owner.class.update_counters(owner.id, counter => difference)
@@ -77,7 +77,7 @@ module ActiveRecord
         #     it will be decremented twice.
         #
         # Hence this method.
-        def inverse_updates_counter_cache?(reflection = reflection)
+        def inverse_updates_counter_cache?(reflection = self.reflection)
           counter_name = cached_counter_attribute_name(reflection)
           reflection.klass.reflect_on_all_associations(:belongs_to).any? { |inverse_reflection|
             inverse_reflection.counter_cache_column == counter_name

data/lib/active_record/fixtures.rb

@@ -589,7 +589,7 @@ module ActiveRecord
 
           # interpolate the fixture label
           row.each do |key, value|
-            row[key] = label if value == "$LABEL"
+            row[key] = label if value.is_a?(String) && value == "$LABEL"
           end
 
           # generate a primary key if necessary

data/lib/active_record/version.rb

@@ -2,7 +2,7 @@ module ActiveRecord
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 21
+    TINY  = 22
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 3.2.21
+  version: 3.2.22
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2015-06-16 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.21
+        version: 3.2.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.21
+        version: 3.2.22
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.21
+        version: 3.2.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.21
+        version: 3.2.22
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).