activerecord 4.0.13 → 4.1.0.beta1

data/lib/active_record/tasks/database_tasks.rb

@@ -51,10 +51,6 @@ module ActiveRecord
       register_task(/postgresql/,   ActiveRecord::Tasks::PostgreSQLDatabaseTasks)
       register_task(/sqlite/,       ActiveRecord::Tasks::SQLiteDatabaseTasks)
 
-      register_task(/firebird/,     ActiveRecord::Tasks::FirebirdDatabaseTasks)
-      register_task(/sqlserver/,    ActiveRecord::Tasks::SqlserverDatabaseTasks)
-      register_task(/(oci|oracle)/, ActiveRecord::Tasks::OracleDatabaseTasks)
-
       def current_config(options = {})
         options.reverse_merge! :env => env
         if options.has_key?(:config)
@@ -149,6 +145,14 @@ module ActiveRecord
         class_for_adapter(configuration['adapter']).new(*arguments).structure_load(filename)
       end
 
+      def check_schema_file(filename)
+        unless File.exist?(filename)
+          message = %{#{filename} doesn't exist yet. Run `rake db:migrate` to create it, then try again.}
+          message << %{ If you do not intend to use a database, you should instead alter #{Rails.root}/config/application.rb to limit the frameworks that will be loaded.} if defined?(::Rails)
+          Kernel.abort message
+        end
+      end
+
       def load_seed
         if seed_loader
           seed_loader.load_seed

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
 
@@ -98,8 +98,8 @@ module ActiveRecord
       timestamp_attributes_for_create + timestamp_attributes_for_update
     end
 
-    def max_updated_column_timestamp
-      if (timestamps = timestamp_attributes_for_update.map { |attr| self[attr] }.compact).present?
+    def max_updated_column_timestamp(timestamp_names = timestamp_attributes_for_update)
+      if (timestamps = timestamp_names.map { |attr| self[attr] }.compact).present?
         timestamps.map { |ts| ts.to_time }.max
       end
     end

data/lib/active_record/transactions.rb

@@ -10,7 +10,9 @@ module ActiveRecord
     end
 
     included do
-      define_callbacks :commit, :rollback, :terminator => "result == false", :scope => [:kind, :name]
+      define_callbacks :commit, :rollback,
+                       terminator: ->(_, result) { result == false },
+                       scope: [:kind, :name]
     end
 
     # = Active Record Transactions
@@ -275,10 +277,6 @@ module ActiveRecord
       with_transaction_returning_status { super }
     end
 
-    def touch(*) #:nodoc:
-      with_transaction_returning_status { super }
-    end
-
     # Reset id and @new_record if the transaction rolls back.
     def rollback_active_record_state!
       remember_transaction_record_state
@@ -297,7 +295,7 @@ module ActiveRecord
     def committed! #:nodoc:
       run_callbacks :commit if destroyed? || persisted?
     ensure
-      @_start_transaction_state.clear
+      clear_transaction_record_state
     end
 
     # Call the +after_rollback+ callbacks. The +force_restore_state+ argument indicates if the record
@@ -306,6 +304,7 @@ module ActiveRecord
       run_callbacks :rollback
     ensure
       restore_transaction_record_state(force_restore_state)
+      clear_transaction_record_state
     end
 
     # Add the record to the current transaction so that the +after_rollback+ and +after_commit+ callbacks
@@ -362,21 +361,20 @@ module ActiveRecord
     # Restore the new record state and id of a record that was previously saved by a call to save_record_state.
     def restore_transaction_record_state(force = false) #:nodoc:
       unless @_start_transaction_state.empty?
-        @_start_transaction_state[:level] = (@_start_transaction_state[:level] || 0) - 1
-        if @_start_transaction_state[:level] < 1 || force
+        transaction_level = (@_start_transaction_state[:level] || 0) - 1
+        if transaction_level < 1 || force
           restore_state = @_start_transaction_state
           was_frozen = restore_state[:frozen?]
           @attributes = @attributes.dup if @attributes.frozen?
           @new_record = restore_state[:new_record]
           @destroyed  = restore_state[:destroyed]
           if restore_state.has_key?(:id)
-            write_attribute(self.class.primary_key, restore_state[:id])
+            self.id = restore_state[:id]
           else
             @attributes.delete(self.class.primary_key)
             @attributes_cache.delete(self.class.primary_key)
           end
           @attributes.freeze if was_frozen
-          @_start_transaction_state.clear
         end
       end
     end

data/lib/active_record/validations/presence.rb

@@ -5,7 +5,7 @@ module ActiveRecord
         super
         attributes.each do |attribute|
           next unless record.class.reflect_on_association(attribute)
-          associated_records = Array.wrap(record.send(attribute))
+          associated_records = Array(record.send(attribute))
 
           # Superclass validates presence. Ensure present records aren't about to be destroyed.
           if associated_records.present? && associated_records.all? { |r| r.marked_for_destruction? }

data/lib/active_record/validations/uniqueness.rb

@@ -7,11 +7,7 @@ module ActiveRecord
                                "Pass a callable instead: `conditions: -> { where(approved: true) }`"
         end
         super({ case_sensitive: true }.merge!(options))
-      end
-
-      # Unfortunately, we have to tie Uniqueness validators to a class.
-      def setup(klass)
-        @klass = klass
+        @klass = options[:class]
       end
 
       def validate_each(record, attribute, value)
@@ -34,7 +30,6 @@ module ActiveRecord
       end
 
     protected
-
       # The check for an existing value should be run from a class that
       # isn't abstract. This means working down from the current class
       # (self), to the first non-abstract class. Since classes don't know

data/lib/active_record/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   # Returns the version of the currently loaded ActiveRecord as a Gem::Version
   def self.version
-    Gem::Version.new "4.0.13"
+    Gem::Version.new "4.1.0.beta1"
   end
 
   module VERSION #:nodoc:

data/lib/rails/generators/active_record.rb

@@ -1,23 +1,17 @@
 require 'rails/generators/named_base'
-require 'rails/generators/migration'
 require 'rails/generators/active_model'
+require 'rails/generators/active_record/migration'
 require 'active_record'
 
 module ActiveRecord
   module Generators # :nodoc:
     class Base < Rails::Generators::NamedBase # :nodoc:
-      include Rails::Generators::Migration
+      include ActiveRecord::Generators::Migration
 
       # Set the current directory as base for the inherited generators.
       def self.base_root
         File.dirname(__FILE__)
       end
-
-      # Implement the required interface for Rails::Generators::Migration.
-      def self.next_migration_number(dirname)
-        next_migration_number = current_migration_number(dirname) + 1
-        ActiveRecord::Migration.next_migration_number(next_migration_number)
-      end
     end
   end
 end

data/lib/rails/generators/active_record/migration.rb

@@ -0,0 +1,18 @@
+require 'rails/generators/migration'
+
+module ActiveRecord
+  module Generators # :nodoc:
+    module Migration
+      extend ActiveSupport::Concern
+      include Rails::Generators::Migration
+
+      module ClassMethods
+        # Implement the required interface for Rails::Generators::Migration.
+        def next_migration_number(dirname)
+          next_migration_number = current_migration_number(dirname) + 1
+          ActiveRecord::Migration.next_migration_number(next_migration_number)
+        end
+      end
+    end
+  end
+end

data/lib/rails/generators/active_record/migration/migration_generator.rb

@@ -14,6 +14,10 @@ module ActiveRecord
       protected
       attr_reader :migration_action, :join_tables
 
+      # sets the default migration template that is being used for the generation of the migration
+      # depending on the arguments which would be sent out in the command line, the migration template 
+      # and the table name instance variables are setup.
+
       def set_local_assigns!
         @migration_template = "migration.rb"
         case file_name

data/lib/rails/generators/active_record/model/model_generator.rb

@@ -12,6 +12,9 @@ module ActiveRecord
       class_option :parent,     :type => :string, :desc => "The parent class for the generated model"
       class_option :indexes,    :type => :boolean, :default => true, :desc => "Add indexes for references and belongs_to columns"
 
+      
+      # creates the migration file for the model.
+
       def create_migration_file
         return unless options[:migration] && options[:parent].nil?
         attributes.each { |a| a.attr_options.delete(:index) if a.reference? && !a.has_index? } if options[:indexes] == false
@@ -39,6 +42,7 @@ module ActiveRecord
 
       protected
 
+        # Used by the migration template to determine the parent name of the model
         def parent_class_name
           options[:parent] || "ActiveRecord::Base"
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 4.0.13
+  version: 4.1.0.beta1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,56 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 4.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 4.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 4.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 4.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: activerecord-deprecated_finders
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 5.0.0
 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.
@@ -80,10 +66,8 @@ 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
@@ -98,31 +82,29 @@ files:
 - lib/active_record/associations/builder/singular_association.rb
 - lib/active_record/associations/collection_association.rb
 - lib/active_record/associations/collection_proxy.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/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
-- lib/active_record/associations/preloader/has_and_belongs_to_many.rb
 - lib/active_record/associations/preloader/has_many.rb
 - lib/active_record/associations/preloader/has_many_through.rb
 - lib/active_record/associations/preloader/has_one.rb
 - 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
@@ -131,6 +113,7 @@ 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
@@ -140,6 +123,8 @@ files:
 - lib/active_record/connection_adapters/abstract/database_statements.rb
 - lib/active_record/connection_adapters/abstract/query_cache.rb
 - lib/active_record/connection_adapters/abstract/quoting.rb
+- lib/active_record/connection_adapters/abstract/savepoints.rb
+- lib/active_record/connection_adapters/abstract/schema_creation.rb
 - lib/active_record/connection_adapters/abstract/schema_definitions.rb
 - lib/active_record/connection_adapters/abstract/schema_dumper.rb
 - lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -165,6 +150,7 @@ files:
 - lib/active_record/core.rb
 - lib/active_record/counter_cache.rb
 - lib/active_record/dynamic_matchers.rb
+- lib/active_record/enum.rb
 - lib/active_record/errors.rb
 - lib/active_record/explain.rb
 - lib/active_record/explain_registry.rb
@@ -177,11 +163,12 @@ 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
 - lib/active_record/null_relation.rb
 - lib/active_record/persistence.rb
 - lib/active_record/query_cache.rb
@@ -193,74 +180,74 @@ 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/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
 - lib/active_record/store.rb
 - lib/active_record/tasks/database_tasks.rb
-- lib/active_record/tasks/firebird_database_tasks.rb
 - lib/active_record/tasks/mysql_database_tasks.rb
-- lib/active_record/tasks/oracle_database_tasks.rb
 - lib/active_record/tasks/postgresql_database_tasks.rb
 - lib/active_record/tasks/sqlite_database_tasks.rb
-- lib/active_record/tasks/sqlserver_database_tasks.rb
-- lib/active_record/test_case.rb
 - 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/rails/generators/active_record.rb
+- lib/active_record.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
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).