railties 3.2.22.5 → 4.0.0.beta1

data/lib/rails/generators/css/assets/assets_generator.rb

@@ -1,8 +1,8 @@
 require "rails/generators/named_base"
 
-module Css
-  module Generators
-    class AssetsGenerator < Rails::Generators::NamedBase
+module Css # :nodoc:
+  module Generators # :nodoc:
+    class AssetsGenerator < Rails::Generators::NamedBase # :nodoc:
       source_root File.expand_path("../templates", __FILE__)
 
       def copy_stylesheet

data/lib/rails/generators/css/scaffold/scaffold_generator.rb

@@ -1,8 +1,8 @@
 require "rails/generators/named_base"
 
-module Css
-  module Generators
-    class ScaffoldGenerator < Rails::Generators::NamedBase
+module Css # :nodoc:
+  module Generators # :nodoc:
+    class ScaffoldGenerator < Rails::Generators::NamedBase # :nodoc:
       # In order to allow the Sass generators to pick up the default Rails CSS and
       # transform it, we leave it in a standard location for the CSS stylesheet
       # generators to handle. For the simple, default case, just copy it over.

data/lib/rails/generators/erb.rb

@@ -1,7 +1,7 @@
 require 'rails/generators/named_base'
 
-module Erb
-  module Generators
+module Erb # :nodoc:
+  module Generators # :nodoc:
     class Base < Rails::Generators::NamedBase #:nodoc:
       protected
 

data/lib/rails/generators/erb/controller/controller_generator.rb

@@ -1,9 +1,9 @@
 require 'rails/generators/erb'
 
-module Erb
-  module Generators
-    class ControllerGenerator < Base
-      argument :actions, :type => :array, :default => [], :banner => "action action"
+module Erb # :nodoc:
+  module Generators # :nodoc:
+    class ControllerGenerator < Base # :nodoc:
+      argument :actions, type: :array, default: [], banner: "action action"
 
       def copy_view_files
         base_path = File.join("app/views", class_path, file_name)

data/lib/rails/generators/erb/mailer/mailer_generator.rb

@@ -1,8 +1,8 @@
 require 'rails/generators/erb/controller/controller_generator'
 
-module Erb
-  module Generators
-    class MailerGenerator < ControllerGenerator
+module Erb # :nodoc:
+  module Generators # :nodoc:
+    class MailerGenerator < ControllerGenerator # :nodoc:
       protected
 
       def format

data/lib/rails/generators/erb/scaffold/scaffold_generator.rb

@@ -1,12 +1,12 @@
 require 'rails/generators/erb'
 require 'rails/generators/resource_helpers'
 
-module Erb
-  module Generators
-    class ScaffoldGenerator < Base
+module Erb # :nodoc:
+  module Generators # :nodoc:
+    class ScaffoldGenerator < Base # :nodoc:
       include Rails::Generators::ResourceHelpers
 
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+      argument :attributes, type: :array, default: [], banner: "field:type field:type"
 
       def create_root_folder
         empty_directory File.join("app/views", controller_file_path)

data/lib/rails/generators/erb/scaffold/templates/index.html.erb

@@ -1,25 +1,29 @@
 <h1>Listing <%= plural_table_name %></h1>
 
 <table>
-  <tr>
+  <thead>
+    <tr>
 <% attributes.each do |attribute| -%>
-    <th><%= attribute.human_name %></th>
+      <th><%= attribute.human_name %></th>
 <% end -%>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
+      <th></th>
+      <th></th>
+      <th></th>
+    </tr>
+  </thead>
 
-<%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
-  <tr>
+  <tbody>
+    <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
+    <tr>
 <% attributes.each do |attribute| -%>
-    <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
+      <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
 <% end -%>
-    <td><%%= link_to 'Show', <%= singular_table_name %> %></td>
-    <td><%%= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>) %></td>
-    <td><%%= link_to 'Destroy', <%= singular_table_name %>, <%= key_value :method, ":delete" %>, <%= key_value :data, "{ #{key_value :confirm, "'Are you sure?'"} }" %> %></td>
-  </tr>
-<%% end %>
+      <td><%%= link_to 'Show', <%= singular_table_name %> %></td>
+      <td><%%= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>) %></td>
+      <td><%%= link_to 'Destroy', <%= singular_table_name %>, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+    </tr>
+    <%% end %>
+  </tbody>
 </table>
 
 <br />

data/lib/rails/generators/erb/scaffold/templates/show.html.erb

@@ -2,7 +2,7 @@
 
 <% attributes.each do |attribute| -%>
 <p>
-  <b><%= attribute.human_name %>:</b>
+  <strong><%= attribute.human_name %>:</strong>
   <%%= @<%= singular_table_name %>.<%= attribute.name %> %>
 </p>
 

data/lib/rails/generators/generated_attribute.rb

@@ -1,12 +1,14 @@
 require 'active_support/time'
-require 'active_support/core_ext/object/inclusion'
-require 'active_support/core_ext/object/blank'
 
 module Rails
   module Generators
-    class GeneratedAttribute
+    class GeneratedAttribute # :nodoc:
+      INDEX_OPTIONS = %w(index uniq)
+      UNIQ_INDEX_OPTIONS = %w(uniq)
+
       attr_accessor :name, :type
       attr_reader   :attr_options
+      attr_writer   :index_name
 
       class << self
         def parse(column_definition)
@@ -15,22 +17,35 @@ module Rails
           # if user provided "name:index" instead of "name:string:index"
           # type should be set blank so GeneratedAttribute's constructor
           # could set it to :string
-          has_index, type = type, nil if %w(index uniq).include?(type)
+          has_index, type = type, nil if INDEX_OPTIONS.include?(type)
 
           type, attr_options = *parse_type_and_options(type)
+          type = type.to_sym if type
+
+          if type && reference?(type)
+            references_index = UNIQ_INDEX_OPTIONS.include?(has_index) ? { unique: true } : true
+            attr_options[:index] = references_index
+          end
+
           new(name, type, has_index, attr_options)
         end
 
+        def reference?(type)
+          [:references, :belongs_to].include? type
+        end
+
         private
 
-        # parse possible attribute options like :limit for string/text/binary/integer or :precision/:scale for decimals
+        # parse possible attribute options like :limit for string/text/binary/integer, :precision/:scale for decimals or :polymorphic for references/belongs_to
         # when declaring options curly brackets should be used
         def parse_type_and_options(type)
           case type
           when /(string|text|binary|integer)\{(\d+)\}/
-            return $1, :limit => $2.to_i
-          when /decimal\{(\d+)(,|\.|\-)(\d+)\}/
-            return :decimal, :precision => $1.to_i, :scale => $3.to_i
+            return $1, limit: $2.to_i
+          when /decimal\{(\d+)[,.-](\d+)\}/
+            return :decimal, precision: $1.to_i, scale: $2.to_i
+          when /(references|belongs_to)\{polymorphic\}/
+            return $1, polymorphic: true
           else
             return type, {}
           end
@@ -39,9 +54,9 @@ module Rails
 
       def initialize(name, type=nil, index_type=false, attr_options={})
         @name           = name
-        @type           = (type.presence || :string).to_sym
-        @has_index      = %w(index uniq).include?(index_type)
-        @has_uniq_index = %w(uniq).include?(index_type)
+        @type           = type || :string
+        @has_index      = INDEX_OPTIONS.include?(index_type)
+        @has_uniq_index = UNIQ_INDEX_OPTIONS.include?(index_type)
         @attr_options   = attr_options
       end
 
@@ -75,16 +90,36 @@ module Rails
         end
       end
 
+      def plural_name
+        name.sub(/_id$/, '').pluralize
+      end
+
       def human_name
-        name.to_s.humanize
+        name.humanize
       end
 
       def index_name
-        reference? ? "#{name}_id" : name
+        @index_name ||= if polymorphic?
+          %w(id type).map { |t| "#{name}_#{t}" }
+        else
+          column_name
+        end
+      end
+
+      def column_name
+        @column_name ||= reference? ? "#{name}_id" : name
+      end
+
+      def foreign_key?
+        !!(name =~ /_id$/)
       end
 
       def reference?
-        self.type.in?([:references, :belongs_to])
+        self.class.reference?(type)
+      end
+
+      def polymorphic?
+        self.attr_options.has_key?(:polymorphic)
       end
 
       def has_index?
@@ -96,11 +131,11 @@ module Rails
       end
 
       def inject_options
-        "".tap { |s| @attr_options.each { |k,v| s << ", :#{k} => #{v.inspect}" } }
+        "".tap { |s| @attr_options.each { |k,v| s << ", #{k}: #{v.inspect}" } }
       end
 
       def inject_index_options
-        has_uniq_index? ? ", :unique => true" : ''
+        has_uniq_index? ? ", unique: true" : ""
       end
     end
   end

data/lib/rails/generators/js/assets/assets_generator.rb

@@ -1,8 +1,8 @@
 require "rails/generators/named_base"
 
-module Js
-  module Generators
-    class AssetsGenerator < Rails::Generators::NamedBase
+module Js # :nodoc:
+  module Generators # :nodoc:
+    class AssetsGenerator < Rails::Generators::NamedBase # :nodoc:
       source_root File.expand_path("../templates", __FILE__)
 
       def copy_javascript

data/lib/rails/generators/migration.rb

@@ -3,7 +3,6 @@ module Rails
     # Holds common methods for migrations. It assumes that migrations has the
     # [0-9]*_name format and can be used by another frameworks (like Sequel)
     # just by implementing the next migration version method.
-    #
     module Migration
       attr_reader :migration_number, :migration_file_name, :migration_class_name
 
@@ -38,10 +37,7 @@ module Rails
       # The migration version, migration file name, migration class name are
       # available as instance variables in the template to be rendered.
       #
-      # ==== Examples
-      #
       #   migration_template "migration.rb", "db/migrate/add_foo_to_bar.rb"
-      #
       def migration_template(source, destination=nil, config={})
         destination = File.expand_path(destination || source, self.destination_root)
 
@@ -56,7 +52,7 @@ module Rails
           if destination && options.force?
             remove_file(destination)
           elsif destination
-            raise Error, "Another migration is already named #{@migration_file_name}: #{destination}"
+            raise Error, "Another migration is already named #{@migration_file_name}: #{destination}. Use --force to remove the old migration file and replace it."
           end
           destination = File.join(migration_dir, "#{@migration_number}_#{@migration_file_name}.rb")
         end

data/lib/rails/generators/named_base.rb

@@ -5,12 +5,9 @@ require 'rails/generators/generated_attribute'
 module Rails
   module Generators
     class NamedBase < Base
-      argument :name, :type => :string
-      class_option :skip_namespace, :type => :boolean, :default => false,
-                                    :desc => "Skip namespace (affects only isolated applications)"
-
-      class_option :old_style_hash, :type => :boolean, :default => false,
-                                    :desc => "Force using old style hash (:foo => 'bar') on Ruby >= 1.9"
+      argument :name, type: :string
+      class_option :skip_namespace, type: :boolean, default: false,
+                                    desc: "Skip namespace (affects only isolated applications)"
 
       def initialize(args, *options) #:nodoc:
         @inside_template = nil
@@ -43,7 +40,7 @@ module Rails
 
         def indent(content, multiplier = 2)
           spaces = " " * multiplier
-          content = content.each_line.map {|line| "#{spaces}#{line}" }.join
+          content = content.each_line.map {|line| line.blank? ? line : "#{spaces}#{line}" }.join
         end
 
         def wrap_with_namespace(content)
@@ -87,10 +84,11 @@ module Rails
         end
 
         def namespaced_class_path
-          @namespaced_class_path ||= begin
-            namespace_path = namespace.name.split("::").map {|m| m.underscore }
-            namespace_path + @class_path
-          end
+          @namespaced_class_path ||= [namespaced_path] + @class_path
+        end
+
+        def namespaced_path
+          @namespaced_path ||= namespace.name.split("::").map {|m| m.underscore }[0]
         end
 
         def class_name
@@ -106,7 +104,7 @@ module Rails
         end
 
         def i18n_scope
-          @i18n_scope ||= file_path.gsub('/', '.')
+          @i18n_scope ||= file_path.tr('/', '.')
         end
 
         def table_name
@@ -137,7 +135,7 @@ module Rails
         end
 
         def route_url
-          @route_url ||= class_path.collect{|dname| "/" + dname  }.join('') + "/" + plural_file_name
+          @route_url ||= class_path.collect {|dname| "/" + dname }.join + "/" + plural_file_name
         end
 
         # Tries to retrieve the application name or simple return application.
@@ -162,6 +160,13 @@ module Rails
           end
         end
 
+        def attributes_names
+          @attributes_names ||= attributes.each_with_object([]) do |a, names|
+            names << a.column_name
+            names << "#{a.name}_type" if a.polymorphic?
+          end
+        end
+
         def pluralize_table_names?
           !defined?(ActiveRecord::Base) || ActiveRecord::Base.pluralize_table_names
         end
@@ -171,10 +176,10 @@ module Rails
         #
         # ==== Examples
         #
-        #   check_class_collision :suffix => "Observer"
+        #   check_class_collision suffix: "Decorator"
         #
         # If the generator is invoked with class name Admin, it will check for
-        # the presence of "AdminObserver".
+        # the presence of "AdminDecorator".
         #
         def self.check_class_collision(options={})
           define_method :check_class_collision do
@@ -187,16 +192,6 @@ module Rails
             class_collisions "#{options[:prefix]}#{name}#{options[:suffix]}"
           end
         end
-
-        # Returns Ruby 1.9 style key-value pair if current code is running on
-        # Ruby 1.9.x. Returns the old-style (with hash rocket) otherwise.
-        def key_value(key, value)
-          if options[:old_style_hash] || RUBY_VERSION < '1.9'
-            ":#{key} => #{value}"
-          else
-            "#{key}: #{value}"
-          end
-        end
     end
   end
 end

data/lib/rails/generators/rails/app/app_generator.rb

@@ -1,7 +1,7 @@
 require 'rails/generators/app_base'
 
 module Rails
-  module ActionMethods
+  module ActionMethods # :nodoc:
     attr_reader :options
 
     def initialize(generator)
@@ -11,7 +11,7 @@ module Rails
 
     private
       %w(template copy_file directory empty_directory inside
-         empty_directory_with_gitkeep create_file chmod shebang).each do |method|
+         empty_directory_with_keep_file create_file chmod shebang).each do |method|
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
           def #{method}(*args, &block)
             @generator.send(:#{method}, *args, &block)
@@ -38,7 +38,7 @@ module Rails
     end
 
     def readme
-      copy_file "README", "README.rdoc"
+      copy_file "README.rdoc", "README.rdoc"
     end
 
     def gemfile
@@ -55,8 +55,19 @@ module Rails
 
     def app
       directory 'app'
-      git_keep  'app/mailers'
-      git_keep  'app/models'
+
+      keep_file  'app/mailers'
+      keep_file  'app/models'
+
+      keep_file  'app/controllers/concerns'
+      keep_file  'app/models/concerns'
+    end
+
+    def bin
+      directory "bin" do |content|
+        "#{shebang}\n" + content
+      end
+      chmod "bin", 0755, verbose: false
     end
 
     def config
@@ -81,39 +92,29 @@ module Rails
       directory "db"
     end
 
-    def doc
-      directory "doc"
-    end
-
     def lib
-      empty_directory "lib"
-      empty_directory_with_gitkeep "lib/tasks"
-      empty_directory_with_gitkeep "lib/assets"
+      empty_directory 'lib'
+      empty_directory_with_keep_file 'lib/tasks'
+      empty_directory_with_keep_file 'lib/assets'
     end
 
     def log
-      empty_directory_with_gitkeep "log"
+      empty_directory_with_keep_file 'log'
     end
 
     def public_directory
-      directory "public", "public", :recursive => false
-    end
-
-    def script
-      directory "script" do |content|
-        "#{shebang}\n" + content
-      end
-      chmod "script", 0755 & ~File.umask, :verbose => false
+      directory "public", "public", recursive: false
     end
 
     def test
-      empty_directory_with_gitkeep "test/fixtures"
-      empty_directory_with_gitkeep "test/functional"
-      empty_directory_with_gitkeep "test/integration"
-      empty_directory_with_gitkeep "test/unit"
-
-      template "test/performance/browsing_test.rb"
-      template "test/test_helper.rb"
+      empty_directory_with_keep_file 'test/fixtures'
+      empty_directory_with_keep_file 'test/controllers'
+      empty_directory_with_keep_file 'test/mailers'
+      empty_directory_with_keep_file 'test/models'
+      empty_directory_with_keep_file 'test/helpers'
+      empty_directory_with_keep_file 'test/integration'
+
+      template 'test/test_helper.rb'
     end
 
     def tmp
@@ -124,19 +125,14 @@ module Rails
     def vendor
       vendor_javascripts
       vendor_stylesheets
-      vendor_plugins
     end
 
     def vendor_javascripts
-      empty_directory_with_gitkeep "vendor/assets/javascripts"
+      empty_directory_with_keep_file 'vendor/assets/javascripts'
     end
 
     def vendor_stylesheets
-      empty_directory_with_gitkeep "vendor/assets/stylesheets"
-    end
-
-    def vendor_plugins
-      empty_directory_with_gitkeep "vendor/plugins"
+      empty_directory_with_keep_file 'vendor/assets/stylesheets'
     end
   end
 
@@ -144,14 +140,14 @@ module Rails
     # We need to store the RAILS_DEV_PATH in a constant, otherwise the path
     # can change in Ruby 1.8.7 when we FileUtils.cd.
     RAILS_DEV_PATH = File.expand_path("../../../../../..", File.dirname(__FILE__))
-    RESERVED_NAMES = %w[application destroy benchmarker profiler plugin runner test]
+    RESERVED_NAMES = %w[application destroy plugin runner test]
 
-    class AppGenerator < AppBase
+    class AppGenerator < AppBase # :nodoc:
       add_shared_options_for "application"
 
       # Add bin/rails options
-      class_option :version, :type => :boolean, :aliases => "-v", :group => :rails,
-                             :desc => "Show Rails version number and quit"
+      class_option :version, type: :boolean, aliases: "-v", group: :rails,
+                             desc: "Show Rails version number and quit"
 
       def initialize(*args)
         raise Error, "Options should be given after the application name. For details run: rails --help" if args[0].blank?
@@ -177,6 +173,10 @@ module Rails
         build(:app)
       end
 
+      def create_bin_files
+        build(:bin)
+      end
+
       def create_config_files
         build(:config)
       end
@@ -194,10 +194,6 @@ module Rails
         build(:db)
       end
 
-      def create_doc_files
-        build(:doc)
-      end
-
       def create_lib_files
         build(:lib)
       end
@@ -210,10 +206,6 @@ module Rails
         build(:public_directory)
       end
 
-      def create_script_files
-        build(:script)
-      end
-
       def create_test_files
         build(:test) unless options[:skip_test_unit]
       end
@@ -244,7 +236,7 @@ module Rails
       end
 
       def app_name
-        @app_name ||= defined_app_const_base? ? defined_app_name : File.basename(destination_root)
+        @app_name ||= (defined_app_const_base? ? defined_app_name : File.basename(destination_root)).tr(".", "_")
       end
 
       def defined_app_name