activerecord 3.0.0 → 4.0.0

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

@@ -1,25 +1,62 @@
 require 'rails/generators/active_record'
 
 module ActiveRecord
-  module Generators
-    class MigrationGenerator < Base
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+  module Generators # :nodoc:
+    class MigrationGenerator < Base # :nodoc:
+      argument :attributes, :type => :array, :default => [], :banner => "field[:type][:index] field[:type][:index]"
 
       def create_migration_file
         set_local_assigns!
-        migration_template "migration.rb", "db/migrate/#{file_name}.rb"
+        validate_file_name!
+        migration_template @migration_template, "db/migrate/#{file_name}.rb"
       end
 
       protected
-        attr_reader :migration_action
+      attr_reader :migration_action, :join_tables
 
-        def set_local_assigns!
-          if file_name =~ /^(add|remove)_.*_(?:to|from)_(.*)/
-            @migration_action = $1
-            @table_name       = $2.pluralize
+      def set_local_assigns!
+        @migration_template = "migration.rb"
+        case file_name
+        when /^(add|remove)_.*_(?:to|from)_(.*)/
+          @migration_action = $1
+          @table_name       = $2.pluralize
+        when /join_table/
+          if attributes.length == 2
+            @migration_action = 'join'
+            @join_tables      = attributes.map(&:plural_name)
+
+            set_index_names
           end
+        when /^create_(.+)/
+          @table_name = $1.pluralize
+          @migration_template = "create_table_migration.rb"
         end
+      end
+
+      def set_index_names
+        attributes.each_with_index do |attr, i|
+          attr.index_name = [attr, attributes[i - 1]].map{ |a| index_name_for(a) }
+        end
+      end
 
+      def index_name_for(attribute)
+        if attribute.foreign_key?
+          attribute.name
+        else
+          attribute.name.singularize.foreign_key
+        end.to_sym
+      end
+
+      private
+        def attributes_with_index
+          attributes.select { |a| !a.reference? && a.has_index? }
+        end
+        
+        def validate_file_name!
+          unless file_name =~ /^[_a-z0-9]+$/
+            raise IllegalMigrationNameError.new(file_name)
+          end
+        end
     end
   end
 end

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

@@ -0,0 +1,19 @@
+class <%= migration_class_name %> < ActiveRecord::Migration
+  def change
+    create_table :<%= table_name %> do |t|
+<% attributes.each do |attribute| -%>
+<% if attribute.password_digest? -%>
+      t.string :password_digest<%= attribute.inject_options %>
+<% else -%>
+      t.<%= attribute.type %> :<%= attribute.name %><%= attribute.inject_options %>
+<% end -%>
+<% end -%>
+<% if options[:timestamps] %>
+      t.timestamps
+<% end -%>
+    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/migration/templates/migration.rb

@@ -1,17 +1,39 @@
 class <%= migration_class_name %> < ActiveRecord::Migration
-  def self.up
+<%- if migration_action == 'add' -%>
+  def change
 <% attributes.each do |attribute| -%>
-  <%- if migration_action -%>
-    <%= migration_action %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'add' %>, :<%= attribute.type %><% end %>
+  <%- if attribute.reference? -%>
+    add_reference :<%= table_name %>, :<%= attribute.name %><%= attribute.inject_options %>
+  <%- else -%>
+    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 -%>
   end
-
-  def self.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 %>
+<%- elsif migration_action == 'join' -%>
+  def change
+    create_join_table :<%= join_tables.first %>, :<%= join_tables.second %> do |t|
+    <%- attributes.each do |attribute| -%>
+      <%= '# ' unless attribute.has_index? -%>t.index <%= attribute.index_name %><%= attribute.inject_index_options %>
+    <%- end -%>
+    end
+  end
+<%- else -%>
+  def change
+<% attributes.each do |attribute| -%>
+<%- if migration_action -%>
+  <%- if attribute.reference? -%>
+    remove_reference :<%= table_name %>, :<%= attribute.name %><%= attribute.inject_options %>
+  <%- else -%>
+    <%- if attribute.has_index? -%>
+    remove_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
+    <%- end -%>
+    remove_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %><%= attribute.inject_options %>
   <%- end -%>
+<%- end -%>
 <%- end -%>
   end
+<%- end -%>
 end

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

@@ -1,19 +1,21 @@
 require 'rails/generators/active_record'
 
 module ActiveRecord
-  module Generators
-    class ModelGenerator < Base
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+  module Generators # :nodoc:
+    class ModelGenerator < Base # :nodoc:
+      argument :attributes, :type => :array, :default => [], :banner => "field[:type][:index] field[:type][:index]"
 
       check_class_collision
 
       class_option :migration,  :type => :boolean
       class_option :timestamps, :type => :boolean
       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"
 
       def create_migration_file
         return unless options[:migration] && options[:parent].nil?
-        migration_template "migration.rb", "db/migrate/create_#{table_name}.rb"
+        attributes.each { |a| a.attr_options.delete(:index) if a.reference? && !a.has_index? } if options[:indexes] == false
+        migration_template "../../migration/templates/create_table_migration.rb", "db/migrate/create_#{table_name}.rb"
       end
 
       def create_model_file
@@ -21,10 +23,18 @@ module ActiveRecord
       end
 
       def create_module_file
-        return if class_path.empty?
+        return if regular_class_path.empty?
         template 'module.rb', File.join('app/models', "#{class_path.join('/')}.rb") if behavior == :invoke
       end
 
+      def attributes_with_index
+        attributes.select { |a| !a.reference? && a.has_index? }
+      end
+
+      def accessible_attributes
+        attributes.reject(&:reference?)
+      end
+
       hook_for :test_framework
 
       protected

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

@@ -1,5 +1,10 @@
+<% module_namespacing do -%>
 class <%= class_name %> < <%= parent_class_name.classify %>
-<% attributes.select {|attr| attr.reference? }.each do |attribute| -%>
-  belongs_to :<%= attribute.name %>
+<% attributes.select(&:reference?).each do |attribute| -%>
+  belongs_to :<%= attribute.name %><%= ', polymorphic: true' if attribute.polymorphic? %>
+<% end -%>
+<% if attributes.any?(&:password_digest?) -%>
+  has_secure_password
 <% end -%>
 end
+<% end -%>

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

@@ -1,5 +1,7 @@
+<% module_namespacing do -%>
 module <%= class_path.map(&:camelize).join('::') %>
   def self.table_name_prefix
-    '<%= class_path.join('_') %>_'
+    '<%= namespaced? ? namespaced_class_path.join('_') : class_path.join('_') %>_'
   end
 end
+<% end -%>

data/lib/rails/generators/active_record.rb

@@ -4,8 +4,8 @@ require 'rails/generators/active_model'
 require 'active_record'
 
 module ActiveRecord
-  module Generators
-    class Base < Rails::Generators::NamedBase #:nodoc:
+  module Generators # :nodoc:
+    class Base < Rails::Generators::NamedBase # :nodoc:
       include Rails::Generators::Migration
 
       # Set the current directory as base for the inherited generators.
@@ -14,13 +14,9 @@ module ActiveRecord
       end
 
       # Implement the required interface for Rails::Generators::Migration.
-      def self.next_migration_number(dirname) #:nodoc:
+      def self.next_migration_number(dirname)
         next_migration_number = current_migration_number(dirname) + 1
-        if ActiveRecord::Base.timestamped_migrations
-          [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
-        else
-          "%.3d" % next_migration_number
-        end
+        ActiveRecord::Migration.next_migration_number(next_migration_number)
       end
     end
   end

metadata

@@ -1,224 +1,266 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: activerecord
-version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
-  segments: 
-  - 3
-  - 0
-  - 0
-  version: 3.0.0
+version: !ruby/object:Gem::Version
+  version: 4.0.0
 platform: ruby
-authors: 
+authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-08-29 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-06-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activemodel
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: arel
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: arel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: tzinfo
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  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 
-        hash: 61
-        segments: 
-        - 0
-        - 3
-        - 23
-        version: 0.3.23
+      - !ruby/object:Gem::Version
+        version: 1.0.2
   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.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+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: 
-- CHANGELOG
+files:
+- CHANGELOG.md
+- MIT-LICENSE
 - README.rdoc
-- examples/associations.png
 - examples/performance.rb
 - examples/simple.rb
 - 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/alias_tracker.rb
+- lib/active_record/associations/association.rb
+- lib/active_record/associations/association_scope.rb
 - lib/active_record/associations/belongs_to_association.rb
 - lib/active_record/associations/belongs_to_polymorphic_association.rb
+- lib/active_record/associations/builder/association.rb
+- lib/active_record/associations/builder/belongs_to.rb
+- lib/active_record/associations/builder/collection_association.rb
+- lib/active_record/associations/builder/has_and_belongs_to_many.rb
+- lib/active_record/associations/builder/has_many.rb
+- lib/active_record/associations/builder/has_one.rb
+- 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/through_association_scope.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/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/before_type_cast.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
 - lib/active_record/autosave_association.rb
 - lib/active_record/base.rb
 - lib/active_record/callbacks.rb
+- lib/active_record/coders/yaml_column.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/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/schema_definitions.rb
+- lib/active_record/connection_adapters/abstract/schema_dumper.rb
 - lib/active_record/connection_adapters/abstract/schema_statements.rb
+- lib/active_record/connection_adapters/abstract/transaction.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/connection_specification.rb
+- lib/active_record/connection_adapters/mysql2_adapter.rb
 - lib/active_record/connection_adapters/mysql_adapter.rb
+- lib/active_record/connection_adapters/postgresql/array_parser.rb
+- lib/active_record/connection_adapters/postgresql/cast.rb
+- lib/active_record/connection_adapters/postgresql/database_statements.rb
+- lib/active_record/connection_adapters/postgresql/oid.rb
+- lib/active_record/connection_adapters/postgresql/quoting.rb
+- lib/active_record/connection_adapters/postgresql/referential_integrity.rb
+- lib/active_record/connection_adapters/postgresql/schema_statements.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/connection_handling.rb
+- lib/active_record/core.rb
 - lib/active_record/counter_cache.rb
-- lib/active_record/dynamic_finder_match.rb
-- lib/active_record/dynamic_scope_match.rb
+- lib/active_record/dynamic_matchers.rb
 - lib/active_record/errors.rb
+- lib/active_record/explain.rb
+- lib/active_record/explain_registry.rb
+- lib/active_record/explain_subscriber.rb
+- lib/active_record/fixture_set/file.rb
 - lib/active_record/fixtures.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/join_table.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/null_relation.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/merger.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/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/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/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/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/model/model_generator.rb
-- lib/rails/generators/active_record/model/templates/migration.rb
 - lib/rails/generators/active_record/model/templates/model.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
-has_rdoc: true
 homepage: http://www.rubyonrails.org
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
-      version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+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'
 requirements: []
-
-rubyforge_project: activerecord
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Object-relational mapper framework (part of Rails).
 test_files: []
-