activerecord 3.0.11 → 3.0.12.rc1

data/lib/active_record/associations.rb

@@ -1439,7 +1439,7 @@ module ActiveRecord
 
             if association.nil? || force_reload
               association = association_proxy_class.new(self, reflection)
-              retval = force_reload ? reflection.klass.uncached { association.reload } : association.load
+              retval = force_reload ? reflection.klass.uncached { association.reload } : association._load
               if retval.nil? and association_proxy_class == BelongsToAssociation
                 association_instance_set(reflection.name, nil)
                 return nil

data/lib/active_record/associations/association_proxy.rb

@@ -113,7 +113,7 @@ module ActiveRecord
       end
 
       # Loads the \target if not already loaded. Returns +self+ if the \target is present.
-      def load
+      def _load
         load_target unless loaded?
         self unless @target.nil?
       end
@@ -121,7 +121,7 @@ module ActiveRecord
       # Reloads the \target and returns +self+ on success.
       def reload
         reset
-        load
+        _load
       end
 
       # Has the \target been already \loaded?

data/lib/active_record/version.rb

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

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
+  hash: 15424023
+  prerelease: 7
   segments: 
   - 3
   - 0
-  - 11
-  version: 3.0.11
+  - 12
+  - rc
+  - 1
+  version: 3.0.12.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,45 +17,48 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-18 00:00:00 Z
+date: 2012-02-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 15424023
         segments: 
         - 3
         - 0
-        - 11
-        version: 3.0.11
-  requirement: *id001
+        - 12
+        - rc
+        - 1
+        version: 3.0.12.rc1
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activemodel
-  type: :runtime
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 15424023
         segments: 
         - 3
         - 0
-        - 11
-        version: 3.0.11
-  requirement: *id002
+        - 12
+        - rc
+        - 1
+        version: 3.0.12.rc1
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: arel
-  type: :runtime
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,12 +69,12 @@ dependencies:
         - 0
         - 10
         version: 2.0.10
-  requirement: *id003
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: tzinfo
-  type: :runtime
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -80,7 +85,8 @@ dependencies:
         - 3
         - 23
         version: 0.3.23
-  requirement: *id004
+  type: :runtime
+  version_requirements: *id004
 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: []
@@ -92,98 +98,98 @@ extra_rdoc_files:
 files: 
 - CHANGELOG
 - README.rdoc
+- examples/associations.png
 - examples/performance.rb
 - examples/simple.rb
-- examples/associations.png
-- lib/active_record/locale/en.yml
+- lib/active_record/aggregations.rb
+- lib/active_record/association_preload.rb
+- lib/active_record/associations/association_collection.rb
+- lib/active_record/associations/association_proxy.rb
+- lib/active_record/associations/belongs_to_association.rb
+- lib/active_record/associations/belongs_to_polymorphic_association.rb
+- lib/active_record/associations/has_and_belongs_to_many_association.rb
+- lib/active_record/associations/has_many_association.rb
+- 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/through_association_scope.rb
 - lib/active_record/associations.rb
-- lib/active_record/relation.rb
-- lib/active_record/migration.rb
-- lib/active_record/railties/jdbcmysql_error.rb
-- lib/active_record/railties/databases.rake
-- lib/active_record/railties/controller_runtime.rb
-- lib/active_record/nested_attributes.rb
-- lib/active_record/dynamic_finder_match.rb
-- lib/active_record/attribute_methods.rb
-- lib/active_record/relation/spawn_methods.rb
-- lib/active_record/relation/predicate_builder.rb
-- lib/active_record/relation/batches.rb
-- lib/active_record/relation/calculations.rb
-- lib/active_record/relation/finder_methods.rb
-- lib/active_record/relation/query_methods.rb
-- lib/active_record/schema.rb
-- lib/active_record/named_scope.rb
-- lib/active_record/schema_dumper.rb
-- lib/active_record/errors.rb
-- lib/active_record/test_case.rb
-- lib/active_record/fixtures.rb
+- lib/active_record/attribute_methods/before_type_cast.rb
 - lib/active_record/attribute_methods/dirty.rb
 - lib/active_record/attribute_methods/primary_key.rb
-- lib/active_record/attribute_methods/time_zone_conversion.rb
 - lib/active_record/attribute_methods/query.rb
-- lib/active_record/attribute_methods/write.rb
 - lib/active_record/attribute_methods/read.rb
-- lib/active_record/attribute_methods/before_type_cast.rb
-- lib/active_record/aggregations.rb
-- lib/active_record/locking/pessimistic.rb
-- lib/active_record/locking/optimistic.rb
-- lib/active_record/observer.rb
-- lib/active_record/log_subscriber.rb
-- lib/active_record/reflection.rb
-- lib/active_record/counter_cache.rb
-- lib/active_record/version.rb
-- lib/active_record/transactions.rb
-- lib/active_record/serialization.rb
-- lib/active_record/timestamp.rb
-- lib/active_record/railtie.rb
-- lib/active_record/session_store.rb
-- lib/active_record/persistence.rb
-- lib/active_record/validations.rb
-- lib/active_record/callbacks.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/connection_adapters/postgresql_adapter.rb
-- lib/active_record/connection_adapters/abstract/quoting.rb
-- lib/active_record/connection_adapters/abstract/schema_statements.rb
+- lib/active_record/callbacks.rb
+- lib/active_record/connection_adapters/abstract/connection_pool.rb
+- lib/active_record/connection_adapters/abstract/connection_specification.rb
 - lib/active_record/connection_adapters/abstract/database_limits.rb
-- lib/active_record/connection_adapters/abstract/schema_definitions.rb
 - lib/active_record/connection_adapters/abstract/database_statements.rb
-- lib/active_record/connection_adapters/abstract/connection_specification.rb
-- lib/active_record/connection_adapters/abstract/connection_pool.rb
 - lib/active_record/connection_adapters/abstract/query_cache.rb
+- lib/active_record/connection_adapters/abstract/quoting.rb
+- lib/active_record/connection_adapters/abstract/schema_definitions.rb
+- lib/active_record/connection_adapters/abstract/schema_statements.rb
 - lib/active_record/connection_adapters/abstract_adapter.rb
-- lib/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/active_record/connection_adapters/mysql_adapter.rb
+- lib/active_record/connection_adapters/postgresql_adapter.rb
+- lib/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/active_record/connection_adapters/sqlite_adapter.rb
-- lib/active_record/association_preload.rb
+- lib/active_record/counter_cache.rb
+- lib/active_record/dynamic_finder_match.rb
 - lib/active_record/dynamic_scope_match.rb
-- lib/active_record/validations/uniqueness.rb
-- lib/active_record/validations/associated.rb
+- lib/active_record/errors.rb
+- lib/active_record/fixtures.rb
+- lib/active_record/locale/en.yml
+- lib/active_record/locking/optimistic.rb
+- lib/active_record/locking/pessimistic.rb
+- lib/active_record/log_subscriber.rb
+- lib/active_record/migration.rb
+- lib/active_record/named_scope.rb
+- lib/active_record/nested_attributes.rb
+- lib/active_record/observer.rb
+- lib/active_record/persistence.rb
 - lib/active_record/query_cache.rb
+- lib/active_record/railtie.rb
+- lib/active_record/railties/controller_runtime.rb
+- lib/active_record/railties/databases.rake
+- lib/active_record/railties/jdbcmysql_error.rb
+- lib/active_record/reflection.rb
+- lib/active_record/relation/batches.rb
+- lib/active_record/relation/calculations.rb
+- lib/active_record/relation/finder_methods.rb
+- 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/schema.rb
+- lib/active_record/schema_dumper.rb
+- lib/active_record/serialization.rb
 - lib/active_record/serializers/xml_serializer.rb
-- lib/active_record/associations/has_many_through_association.rb
-- lib/active_record/associations/belongs_to_polymorphic_association.rb
-- lib/active_record/associations/belongs_to_association.rb
-- lib/active_record/associations/has_one_through_association.rb
-- lib/active_record/associations/association_proxy.rb
-- lib/active_record/associations/has_many_association.rb
-- lib/active_record/associations/has_and_belongs_to_many_association.rb
-- lib/active_record/associations/has_one_association.rb
-- lib/active_record/associations/through_association_scope.rb
-- lib/active_record/associations/association_collection.rb
-- lib/rails/generators/active_record/migration.rb
-- lib/rails/generators/active_record/session_migration/session_migration_generator.rb
-- lib/rails/generators/active_record/session_migration/templates/migration.rb
+- lib/active_record/session_store.rb
+- lib/active_record/test_case.rb
+- lib/active_record/timestamp.rb
+- lib/active_record/transactions.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/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/module.rb
 - lib/rails/generators/active_record/model/templates/model.rb
-- lib/rails/generators/active_record/observer/templates/observer.rb
+- lib/rails/generators/active_record/model/templates/module.rb
 - lib/rails/generators/active_record/observer/observer_generator.rb
+- 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
-- lib/active_record.rb
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -207,16 +213,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: activerecord
-rubygems_version: 1.8.6
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Object-relational mapper framework (part of Rails).