activerecord 4.1.1 → 4.1.2.rc1

data/lib/active_record/timestamp.rb

@@ -43,7 +43,7 @@ module ActiveRecord
 
   private
 
-    def create_record
+    def _create_record
       if self.record_timestamps
         current_time = current_time_from_proper_timezone
 
@@ -57,7 +57,7 @@ module ActiveRecord
       super
     end
 
-    def update_record(*args)
+    def _update_record(*args)
       if should_record_timestamps?
         current_time = current_time_from_proper_timezone
 

data/lib/active_record/transactions.rb

@@ -369,7 +369,7 @@ module ActiveRecord
           @new_record = restore_state[:new_record]
           @destroyed  = restore_state[:destroyed]
           if restore_state.has_key?(:id)
-            self.id = restore_state[:id]
+            write_attribute(self.class.primary_key, restore_state[:id])
           else
             @attributes.delete(self.class.primary_key)
             @attributes_cache.delete(self.class.primary_key)

data/lib/active_record/validations/presence.rb

@@ -4,7 +4,7 @@ module ActiveRecord
       def validate(record)
         super
         attributes.each do |attribute|
-          next unless record.class.reflect_on_association(attribute)
+          next unless record.class._reflect_on_association(attribute)
           associated_records = Array.wrap(record.send(attribute))
 
           # Superclass validates presence. Ensure present records aren't about to be destroyed.

data/lib/active_record/validations/uniqueness.rb

@@ -47,7 +47,7 @@ module ActiveRecord
       end
 
       def build_relation(klass, table, attribute, value) #:nodoc:
-        if reflection = klass.reflect_on_association(attribute)
+        if reflection = klass._reflect_on_association(attribute)
           attribute = reflection.foreign_key
           value = value.attributes[reflection.primary_key_column.name] unless value.nil?
         end
@@ -75,7 +75,7 @@ module ActiveRecord
 
       def scope_relation(record, table, relation)
         Array(options[:scope]).each do |scope_item|
-          if reflection = record.class.reflect_on_association(scope_item)
+          if reflection = record.class._reflect_on_association(scope_item)
             scope_value = record.send(reflection.foreign_key)
             scope_item  = reflection.foreign_key
           else

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 4.1.1
-  prerelease: 
+  version: 4.1.2.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 4.1.2.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 4.1.2.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 4.1.2.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 4.1.2.rc1
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.0
 description: Databases on Rails. Build a persistent domain model by mapping database
@@ -73,8 +66,10 @@ files:
 - README.rdoc
 - examples/performance.rb
 - examples/simple.rb
+- lib/active_record.rb
 - lib/active_record/aggregations.rb
 - lib/active_record/association_relation.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
@@ -93,10 +88,11 @@ 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/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
@@ -106,11 +102,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/dirty.rb
 - lib/active_record/attribute_methods/primary_key.rb
@@ -119,7 +114,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
@@ -170,9 +164,9 @@ files:
 - 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/migration/command_recorder.rb
 - lib/active_record/migration/join_table.rb
-- lib/active_record/migration.rb
 - lib/active_record/model_schema.rb
 - lib/active_record/nested_attributes.rb
 - lib/active_record/no_touching.rb
@@ -187,26 +181,26 @@ 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
 - lib/active_record/relation/finder_methods.rb
 - lib/active_record/relation/merger.rb
+- lib/active_record/relation/predicate_builder.rb
 - lib/active_record/relation/predicate_builder/array_handler.rb
 - lib/active_record/relation/predicate_builder/relation_handler.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/result.rb
 - lib/active_record/runtime_registry.rb
 - lib/active_record/sanitization.rb
 - lib/active_record/schema.rb
 - lib/active_record/schema_dumper.rb
 - lib/active_record/schema_migration.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/statement_cache.rb
@@ -218,45 +212,43 @@ 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/presence.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/create_table_migration.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/model.rb
 - lib/rails/generators/active_record/model/templates/module.rb
-- lib/rails/generators/active_record.rb
 homepage: http://www.rubyonrails.org
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Object-relational mapper framework (part of Rails).
 test_files: []