activerecord 3.1.11 → 3.2.0

data/lib/active_record.rb

@@ -34,10 +34,12 @@ module ActiveRecord
   eager_autoload do
     autoload :ActiveRecordError, 'active_record/errors'
     autoload :ConnectionNotEstablished, 'active_record/errors'
+    autoload :ConnectionAdapters, 'active_record/connection_adapters/abstract_adapter'
 
     autoload :Aggregations
     autoload :Associations
     autoload :AttributeMethods
+    autoload :AttributeAssignment
     autoload :AutosaveAssociation
 
     autoload :Relation
@@ -49,29 +51,42 @@ module ActiveRecord
       autoload :PredicateBuilder
       autoload :SpawnMethods
       autoload :Batches
+      autoload :Explain
+      autoload :Delegation
     end
 
     autoload :Base
     autoload :Callbacks
     autoload :CounterCache
+    autoload :DynamicMatchers
     autoload :DynamicFinderMatch
     autoload :DynamicScopeMatch
+    autoload :Explain
+    autoload :IdentityMap
+    autoload :Inheritance
+    autoload :Integration
     autoload :Migration
     autoload :Migrator, 'active_record/migration'
-    autoload :NamedScope
+    autoload :ModelSchema
     autoload :NestedAttributes
     autoload :Observer
     autoload :Persistence
     autoload :QueryCache
+    autoload :Querying
+    autoload :ReadonlyAttributes
     autoload :Reflection
+    autoload :Result
+    autoload :Sanitization
     autoload :Schema
     autoload :SchemaDumper
+    autoload :Scoping
     autoload :Serialization
     autoload :SessionStore
+    autoload :Store
     autoload :Timestamp
     autoload :Transactions
+    autoload :Translation
     autoload :Validations
-    autoload :IdentityMap
   end
 
   module Coders
@@ -89,6 +104,8 @@ module ActiveRecord
       autoload :Read
       autoload :TimeZoneConversion
       autoload :Write
+      autoload :Serialization
+      autoload :DeprecatedUnderscoreRead
     end
   end
 
@@ -110,6 +127,15 @@ module ActiveRecord
     end
   end
 
+  module Scoping
+    extend ActiveSupport::Autoload
+
+    eager_autoload do
+      autoload :Named
+      autoload :Default
+    end
+  end
+
   autoload :TestCase
   autoload :TestFixtures, 'active_record/fixtures'
 end

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

@@ -3,7 +3,7 @@ require 'rails/generators/active_record'
 module ActiveRecord
   module Generators
     class MigrationGenerator < Base
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+      argument :attributes, :type => :array, :default => [], :banner => "field[:type][:index] field[:type][:index]"
 
       def create_migration_file
         set_local_assigns!

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

@@ -2,14 +2,20 @@ class <%= migration_class_name %> < ActiveRecord::Migration
 <%- if migration_action == 'add' -%>
   def change
 <% attributes.each do |attribute| -%>
-    add_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %>
+    add_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %><%= attribute.inject_options %>
+    <%- if attribute.has_index? -%>
+    add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
+    <%- end %>
 <%- end -%>
   end
 <%- else -%>
   def up
 <% attributes.each do |attribute| -%>
   <%- if migration_action -%>
-    <%= migration_action %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'add' %>, :<%= attribute.type %><% end %>
+    <%= migration_action %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'add' %>, :<%= attribute.type %><%= attribute.inject_options %><% end %>
+    <% if attribute.has_index? && migration_action == 'add' %>
+    add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
+    <% end -%>
   <%- end -%>
 <%- end -%>
   end
@@ -17,7 +23,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration
   def down
 <% attributes.reverse.each do |attribute| -%>
   <%- if migration_action -%>
-    <%= migration_action == 'add' ? 'remove' : 'add' %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'remove' %>, :<%= attribute.type %><% end %>
+    <%= migration_action == 'add' ? 'remove' : 'add' %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'remove' %>, :<%= attribute.type %><%= attribute.inject_options %><% end %>
   <%- end -%>
 <%- end -%>
   end

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

@@ -3,7 +3,7 @@ require 'rails/generators/active_record'
 module ActiveRecord
   module Generators
     class ModelGenerator < Base
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+      argument :attributes, :type => :array, :default => [], :banner => "field[:type][:index] field[:type][:index]"
 
       check_class_collision
 
@@ -26,6 +26,10 @@ module ActiveRecord
         template 'module.rb', File.join('app/models', "#{class_path.join('/')}.rb") if behavior == :invoke
       end
 
+      def attributes_with_index
+        attributes.select { |a| a.has_index? || (a.reference? && options[:indexes]) }
+      end
+
       hook_for :test_framework
 
       protected

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

@@ -2,16 +2,14 @@ class <%= migration_class_name %> < ActiveRecord::Migration
   def change
     create_table :<%= table_name %> do |t|
 <% attributes.each do |attribute| -%>
-      t.<%= attribute.type %> :<%= attribute.name %>
+      t.<%= attribute.type %> :<%= attribute.name %><%= attribute.inject_options %>
 <% end -%>
 <% if options[:timestamps] %>
       t.timestamps
 <% end -%>
     end
-<% if options[:indexes] -%>
-<% attributes.select {|attr| attr.reference? }.each do |attribute| -%>
-    add_index :<%= table_name %>, :<%= attribute.name %>_id
-<% end -%>
+<% attributes_with_index.each do |attribute| -%>
+    add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
 <% end -%>
   end
 end

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

@@ -1,5 +1,5 @@
 class <%= migration_class_name %> < ActiveRecord::Migration
-  def up
+  def change
     create_table :<%= session_table_name %> do |t|
       t.string :session_id, :null => false
       t.text :data
@@ -9,8 +9,4 @@ class <%= migration_class_name %> < ActiveRecord::Migration
     add_index :<%= session_table_name %>, :session_id
     add_index :<%= session_table_name %>, :updated_at
   end
-
-  def down
-    drop_table :<%= session_table_name %>
-  end
 end

metadata

@@ -1,71 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 3.1.11
+  version: 3.2.0
+  prerelease: 
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2012-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70230647834700 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
-        version: 3.1.11
+        version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.11
+  version_requirements: *70230647834700
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70230647834260 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
-        version: 3.1.11
+        version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.11
+  version_requirements: *70230647834260
 - !ruby/object:Gem::Dependency
   name: arel
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70230647833760 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.3
+  version_requirements: *70230647833760
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70230647833280 !ruby/object:Gem::Requirement
+    none: false
     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
+  version_requirements: *70230647833280
 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.
@@ -120,11 +109,14 @@ files:
 - 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/before_type_cast.rb
+- lib/active_record/attribute_methods/deprecated_underscore_read.rb
 - lib/active_record/attribute_methods/dirty.rb
 - lib/active_record/attribute_methods/primary_key.rb
 - lib/active_record/attribute_methods/query.rb
 - lib/active_record/attribute_methods/read.rb
+- 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
@@ -141,52 +133,69 @@ files:
 - 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/abstract_mysql_adapter.rb
 - lib/active_record/connection_adapters/column.rb
 - lib/active_record/connection_adapters/mysql2_adapter.rb
 - lib/active_record/connection_adapters/mysql_adapter.rb
 - lib/active_record/connection_adapters/postgresql_adapter.rb
+- lib/active_record/connection_adapters/schema_cache.rb
 - lib/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/active_record/connection_adapters/sqlite_adapter.rb
 - lib/active_record/connection_adapters/statement_pool.rb
 - lib/active_record/counter_cache.rb
 - lib/active_record/dynamic_finder_match.rb
+- lib/active_record/dynamic_matchers.rb
 - lib/active_record/dynamic_scope_match.rb
 - 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/identity_map.rb
+- lib/active_record/inheritance.rb
+- lib/active_record/integration.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/command_recorder.rb
 - lib/active_record/migration.rb
-- lib/active_record/named_scope.rb
+- lib/active_record/model_schema.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/querying.rb
 - lib/active_record/railtie.rb
 - lib/active_record/railties/console_sandbox.rb
 - lib/active_record/railties/controller_runtime.rb
 - lib/active_record/railties/databases.rake
 - lib/active_record/railties/jdbcmysql_error.rb
+- lib/active_record/readonly_attributes.rb
 - lib/active_record/reflection.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/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/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
+- lib/active_record/store.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/associated.rb
 - lib/active_record/validations/uniqueness.rb
 - lib/active_record/validations.rb
@@ -206,27 +215,28 @@ files:
 - lib/rails/generators/active_record.rb
 homepage: http://www.rubyonrails.org
 licenses: []
-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.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 1.8.10
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Object-relational mapper framework (part of Rails).
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: b0b0e3dda9642a618a998223568a92014fd55475
-  data.tar.gz: 719b6bde220e0abd79e27b6457c92d8ce8bb511b
-SHA512:
-  metadata.gz: 53b2dbbc486b8b41dd447b6cdf66d1ca264c44ecc818cf1ef993ccc2e6a3d8b515f074c093f4d6e32908ca89bd6ed74673f97183c2c7310a065a06308b550bb7
-  data.tar.gz: b161018a09558875e58f7773aef6953f8bfeada2f21c98423de067f6c2d97e2680a43e6365426e040e5e79e49dd006687ada6c8941bcc7c214ac11f09ebbf5b7

data/lib/active_record/named_scope.rb

@@ -1,200 +0,0 @@
-require 'active_support/core_ext/array'
-require 'active_support/core_ext/hash/except'
-require 'active_support/core_ext/kernel/singleton_class'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/class/attribute'
-
-module ActiveRecord
-  # = Active Record Named \Scopes
-  module NamedScope
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      # Returns an anonymous \scope.
-      #
-      #   posts = Post.scoped
-      #   posts.size # Fires "select count(*) from  posts" and returns the count
-      #   posts.each {|p| puts p.name } # Fires "select * from posts" and loads post objects
-      #
-      #   fruits = Fruit.scoped
-      #   fruits = fruits.where(:colour => 'red') if options[:red_only]
-      #   fruits = fruits.limit(10) if limited?
-      #
-      # Anonymous \scopes tend to be useful when procedurally generating complex
-      # queries, where passing intermediate values (\scopes) around as first-class
-      # objects is convenient.
-      #
-      # You can define a \scope that applies to all finders using
-      # ActiveRecord::Base.default_scope.
-      def scoped(options = nil)
-        if options
-          scoped.apply_finder_options(options)
-        else
-          if current_scope
-            current_scope.clone
-          else
-            scope = relation.clone
-            scope.default_scoped = true
-            scope
-          end
-        end
-      end
-
-      ##
-      # Collects attributes from scopes that should be applied when creating
-      # an AR instance for the particular class this is called on.
-      def scope_attributes # :nodoc:
-        if current_scope
-          current_scope.scope_for_create
-        else
-          scope = relation.clone
-          scope.default_scoped = true
-          scope.scope_for_create
-        end
-      end
-
-      ##
-      # Are there default attributes associated with this scope?
-      def scope_attributes? # :nodoc:
-        current_scope || default_scopes.any?
-      end
-
-      # Adds a class method for retrieving and querying objects. A \scope represents a narrowing of a database query,
-      # such as <tt>where(:color => :red).select('shirts.*').includes(:washing_instructions)</tt>.
-      #
-      #   class Shirt < ActiveRecord::Base
-      #     scope :red, where(:color => 'red')
-      #     scope :dry_clean_only, joins(:washing_instructions).where('washing_instructions.dry_clean_only = ?', true)
-      #   end
-      #
-      # The above calls to <tt>scope</tt> define class methods Shirt.red and Shirt.dry_clean_only. Shirt.red,
-      # in effect, represents the query <tt>Shirt.where(:color => 'red')</tt>.
-      #
-      # Note that this is simply 'syntactic sugar' for defining an actual class method:
-      #
-      #   class Shirt < ActiveRecord::Base
-      #     def self.red
-      #       where(:color => 'red')
-      #     end
-      #   end
-      #
-      # Unlike <tt>Shirt.find(...)</tt>, however, the object returned by Shirt.red is not an Array; it
-      # resembles the association object constructed by a <tt>has_many</tt> declaration. For instance,
-      # you can invoke <tt>Shirt.red.first</tt>, <tt>Shirt.red.count</tt>, <tt>Shirt.red.where(:size => 'small')</tt>.
-      # Also, just as with the association objects, named \scopes act like an Array, implementing Enumerable;
-      # <tt>Shirt.red.each(&block)</tt>, <tt>Shirt.red.first</tt>, and <tt>Shirt.red.inject(memo, &block)</tt>
-      # all behave as if Shirt.red really was an Array.
-      #
-      # These named \scopes are composable. For instance, <tt>Shirt.red.dry_clean_only</tt> will produce
-      # all shirts that are both red and dry clean only.
-      # Nested finds and calculations also work with these compositions: <tt>Shirt.red.dry_clean_only.count</tt>
-      # returns the number of garments for which these criteria obtain. Similarly with
-      # <tt>Shirt.red.dry_clean_only.average(:thread_count)</tt>.
-      #
-      # All \scopes are available as class methods on the ActiveRecord::Base descendant upon which
-      # the \scopes were defined. But they are also available to <tt>has_many</tt> associations. If,
-      #
-      #   class Person < ActiveRecord::Base
-      #     has_many :shirts
-      #   end
-      #
-      # then <tt>elton.shirts.red.dry_clean_only</tt> will return all of Elton's red, dry clean
-      # only shirts.
-      #
-      # Named \scopes can also be procedural:
-      #
-      #   class Shirt < ActiveRecord::Base
-      #     scope :colored, lambda { |color| where(:color => color) }
-      #   end
-      #
-      # In this example, <tt>Shirt.colored('puce')</tt> finds all puce shirts.
-      #
-      # On Ruby 1.9 you can use the 'stabby lambda' syntax:
-      #
-      #   scope :colored, ->(color) { where(:color => color) }
-      #
-      # Note that scopes defined with \scope will be evaluated when they are defined, rather than
-      # when they are used. For example, the following would be incorrect:
-      #
-      #   class Post < ActiveRecord::Base
-      #     scope :recent, where('published_at >= ?', Time.now - 1.week)
-      #   end
-      #
-      # The example above would be 'frozen' to the <tt>Time.now</tt> value when the <tt>Post</tt>
-      # class was defined, and so the resultant SQL query would always be the same. The correct
-      # way to do this would be via a lambda, which will re-evaluate the scope each time
-      # it is called:
-      #
-      #   class Post < ActiveRecord::Base
-      #     scope :recent, lambda { where('published_at >= ?', Time.now - 1.week) }
-      #   end
-      #
-      # Named \scopes can also have extensions, just as with <tt>has_many</tt> declarations:
-      #
-      #   class Shirt < ActiveRecord::Base
-      #     scope :red, where(:color => 'red') do
-      #       def dom_id
-      #         'red_shirts'
-      #       end
-      #     end
-      #   end
-      #
-      # Scopes can also be used while creating/building a record.
-      #
-      #   class Article < ActiveRecord::Base
-      #     scope :published, where(:published => true)
-      #   end
-      #
-      #   Article.published.new.published    # => true
-      #   Article.published.create.published # => true
-      #
-      # Class methods on your model are automatically available
-      # on scopes. Assuming the following setup:
-      #
-      #   class Article < ActiveRecord::Base
-      #     scope :published, where(:published => true)
-      #     scope :featured, where(:featured => true)
-      #
-      #     def self.latest_article
-      #       order('published_at desc').first
-      #     end
-      #
-      #     def self.titles
-      #       map(&:title)
-      #     end
-      #
-      #   end
-      #
-      # We are able to call the methods like this:
-      #
-      #   Article.published.featured.latest_article
-      #   Article.featured.titles
-
-      def scope(name, scope_options = {})
-        name = name.to_sym
-        valid_scope_name?(name)
-        extension = Module.new(&Proc.new) if block_given?
-
-        scope_proc = lambda do |*args|
-          options = scope_options.respond_to?(:call) ? unscoped { scope_options.call(*args) } : scope_options
-          options = scoped.apply_finder_options(options) if options.is_a?(Hash)
-
-          relation = scoped.merge(options)
-
-          extension ? relation.extending(extension) : relation
-        end
-
-        singleton_class.send(:redefine_method, name, &scope_proc)
-      end
-
-    protected
-
-      def valid_scope_name?(name)
-        if respond_to?(name, true)
-          logger.warn "Creating scope :#{name}. " \
-                      "Overwriting existing method #{self.name}.#{name}."
-        end
-      end
-    end
-  end
-end