activerecord 3.2.19 → 3.2.22.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b2a1b133cbd413ee58ccc671828333632ed6db3b
+  data.tar.gz: 8f7eed84647eebadf1270dc241dca3063b4586f5
+SHA512:
+  metadata.gz: 0bef1cca318f136e3c84fda17c030b840b6d889a836dee9753b000bde1fa951b90873145d6a79f7f42d76db8ae6fa66e79244baea47f5e440f8dafa1ecd6325e
+  data.tar.gz: 98f44f3efcaa299b5044a14851dc577b63c6281d4f18c152ce2fd4de1562170e8fa6aac3109eb101fdc1b5df05f5cb06efc1b8ea6ab7e69e080ebbac137a74fd

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+* 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.
+
+
 ## Rails 3.2.19 (Jul 2, 2014) ##
 
 *   Fix SQL Injection Vulnerability in 'bitstring' quoting.

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/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/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/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/nested_attributes.rb

@@ -470,11 +470,12 @@ module ActiveRecord
     # has_destroy_flag? or if a <tt>:reject_if</tt> proc exists for this
     # association and evaluates to +true+.
     def reject_new_record?(association_name, attributes)
-      has_destroy_flag?(attributes) || call_reject_if(association_name, attributes)
+      will_be_destroyed?(association_name, attributes) || call_reject_if(association_name, attributes)
     end
 
     def call_reject_if(association_name, attributes)
-      return false if has_destroy_flag?(attributes)
+      return false if will_be_destroyed?(association_name, attributes)
+
       case callback = self.nested_attributes_options[association_name][:reject_if]
       when Symbol
         method(callback).arity == 0 ? send(callback) : send(callback, attributes)
@@ -483,6 +484,15 @@ module ActiveRecord
       end
     end
 
+    # Only take into account the destroy flag if <tt>:allow_destroy</tt> is true
+    def will_be_destroyed?(association_name, attributes)
+      allow_destroy?(association_name) && has_destroy_flag?(attributes)
+    end
+
+    def allow_destroy?(association_name)
+      self.nested_attributes_options[association_name][:allow_destroy]
+    end
+
     def raise_nested_attributes_record_not_found(association_name, record_id)
       raise RecordNotFound, "Couldn't find #{self.class.reflect_on_association(association_name).klass.name} with ID=#{record_id} for #{self.class.name} with ID=#{id}"
     end

data/lib/active_record/version.rb

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

metadata

@@ -1,103 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: activerecord
-version: !ruby/object:Gem::Version 
-  hash: 41
-  prerelease: 
-  segments: 
-  - 3
-  - 2
-  - 19
-  version: 3.2.19
+version: !ruby/object:Gem::Version
+  version: 3.2.22.5
 platform: ruby
-authors: 
+authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-07-02 00:00:00 -03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 3
-        - 2
-        - 19
-        version: 3.2.19
-  type: :runtime
-  version_requirements: *id001
-  prerelease: false
+date: 2016-09-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 3
-        - 2
-        - 19
-        version: 3.2.19
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.22.5
   type: :runtime
-  version_requirements: *id002
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.22.5
+- !ruby/object:Gem::Dependency
   name: activemodel
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 0
-        - 2
-        version: 3.0.2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.22.5
   type: :runtime
-  version_requirements: *id003
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.22.5
+- !ruby/object:Gem::Dependency
   name: arel
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 3
-        - 29
-        version: 0.3.29
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.2
   type: :runtime
-  version_requirements: *id004
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+- !ruby/object:Gem::Dependency
   name: tzinfo
-description: Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.29
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.29
+description: Databases on Rails. Build a persistent domain model by mapping database
+  tables to Ruby classes. Strong conventions for associations, validations, aggregations,
+  migrations, and testing come baked-in.
 email: david@loudthinking.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - CHANGELOG.md
 - MIT-LICENSE
 - README.rdoc
 - examples/associations.png
 - examples/performance.rb
 - examples/simple.rb
+- lib/active_record.rb
 - lib/active_record/aggregations.rb
+- lib/active_record/associations.rb
 - lib/active_record/associations/alias_tracker.rb
 - lib/active_record/associations/association.rb
 - lib/active_record/associations/association_scope.rb
@@ -117,11 +103,12 @@ files:
 - lib/active_record/associations/has_many_through_association.rb
 - lib/active_record/associations/has_one_association.rb
 - lib/active_record/associations/has_one_through_association.rb
+- lib/active_record/associations/join_dependency.rb
 - lib/active_record/associations/join_dependency/join_association.rb
 - lib/active_record/associations/join_dependency/join_base.rb
 - lib/active_record/associations/join_dependency/join_part.rb
-- lib/active_record/associations/join_dependency.rb
 - lib/active_record/associations/join_helper.rb
+- lib/active_record/associations/preloader.rb
 - lib/active_record/associations/preloader/association.rb
 - lib/active_record/associations/preloader/belongs_to.rb
 - lib/active_record/associations/preloader/collection_association.rb
@@ -132,11 +119,10 @@ files:
 - lib/active_record/associations/preloader/has_one_through.rb
 - lib/active_record/associations/preloader/singular_association.rb
 - lib/active_record/associations/preloader/through_association.rb
-- lib/active_record/associations/preloader.rb
 - lib/active_record/associations/singular_association.rb
 - lib/active_record/associations/through_association.rb
-- lib/active_record/associations.rb
 - lib/active_record/attribute_assignment.rb
+- lib/active_record/attribute_methods.rb
 - lib/active_record/attribute_methods/before_type_cast.rb
 - lib/active_record/attribute_methods/deprecated_underscore_read.rb
 - lib/active_record/attribute_methods/dirty.rb
@@ -146,7 +132,6 @@ files:
 - lib/active_record/attribute_methods/serialization.rb
 - lib/active_record/attribute_methods/time_zone_conversion.rb
 - lib/active_record/attribute_methods/write.rb
-- lib/active_record/attribute_methods.rb
 - lib/active_record/autosave_association.rb
 - lib/active_record/base.rb
 - lib/active_record/callbacks.rb
@@ -176,8 +161,8 @@ files:
 - lib/active_record/errors.rb
 - lib/active_record/explain.rb
 - lib/active_record/explain_subscriber.rb
-- lib/active_record/fixtures/file.rb
 - lib/active_record/fixtures.rb
+- lib/active_record/fixtures/file.rb
 - lib/active_record/identity_map.rb
 - lib/active_record/inheritance.rb
 - lib/active_record/integration.rb
@@ -185,8 +170,8 @@ files:
 - lib/active_record/locking/optimistic.rb
 - lib/active_record/locking/pessimistic.rb
 - lib/active_record/log_subscriber.rb
-- lib/active_record/migration/command_recorder.rb
 - lib/active_record/migration.rb
+- lib/active_record/migration/command_recorder.rb
 - lib/active_record/model_schema.rb
 - lib/active_record/nested_attributes.rb
 - lib/active_record/observer.rb
@@ -200,6 +185,7 @@ files:
 - lib/active_record/railties/jdbcmysql_error.rb
 - lib/active_record/readonly_attributes.rb
 - lib/active_record/reflection.rb
+- lib/active_record/relation.rb
 - lib/active_record/relation/batches.rb
 - lib/active_record/relation/calculations.rb
 - lib/active_record/relation/delegation.rb
@@ -207,14 +193,13 @@ files:
 - lib/active_record/relation/predicate_builder.rb
 - lib/active_record/relation/query_methods.rb
 - lib/active_record/relation/spawn_methods.rb
-- lib/active_record/relation.rb
 - lib/active_record/result.rb
 - lib/active_record/sanitization.rb
 - lib/active_record/schema.rb
 - lib/active_record/schema_dumper.rb
+- lib/active_record/scoping.rb
 - lib/active_record/scoping/default.rb
 - lib/active_record/scoping/named.rb
-- lib/active_record/scoping.rb
 - lib/active_record/serialization.rb
 - lib/active_record/serializers/xml_serializer.rb
 - lib/active_record/session_store.rb
@@ -223,14 +208,14 @@ files:
 - lib/active_record/timestamp.rb
 - lib/active_record/transactions.rb
 - lib/active_record/translation.rb
+- lib/active_record/validations.rb
 - lib/active_record/validations/associated.rb
 - lib/active_record/validations/uniqueness.rb
-- lib/active_record/validations.rb
 - lib/active_record/version.rb
-- lib/active_record.rb
+- lib/rails/generators/active_record.rb
+- lib/rails/generators/active_record/migration.rb
 - lib/rails/generators/active_record/migration/migration_generator.rb
 - lib/rails/generators/active_record/migration/templates/migration.rb
-- lib/rails/generators/active_record/migration.rb
 - lib/rails/generators/active_record/model/model_generator.rb
 - lib/rails/generators/active_record/model/templates/migration.rb
 - lib/rails/generators/active_record/model/templates/model.rb
@@ -239,43 +224,31 @@ files:
 - lib/rails/generators/active_record/observer/templates/observer.rb
 - lib/rails/generators/active_record/session_migration/session_migration_generator.rb
 - lib/rails/generators/active_record/session_migration/templates/migration.rb
-- lib/rails/generators/active_record.rb
-has_rdoc: true
 homepage: http://www.rubyonrails.org
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --main
+rdoc_options:
+- "--main"
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.6.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Object-relational mapper framework (part of Rails).
 test_files: []
-
+has_rdoc: