railties 5.0.7.2 → 5.1.0.beta1

data/lib/rails/generators/base.rb

@@ -1,5 +1,5 @@
 begin
-  require 'thor/group'
+  require "thor/group"
 rescue LoadError
   puts "Thor is not available.\nIf you ran this command from a git checkout " \
        "of Rails, please make sure thor is installed,\nand run this command " \
@@ -20,14 +20,14 @@ module Rails
       strict_args_position!
 
       # Returns the source root for this generator using default_source_root as default.
-      def self.source_root(path=nil)
+      def self.source_root(path = nil)
         @_source_root = path if path
         @_source_root ||= default_source_root
       end
 
       # Tries to get the description from a USAGE file one folder above the source
       # root otherwise uses a default description.
-      def self.desc(description=nil)
+      def self.desc(description = nil)
         return super if description
 
         @desc ||= if usage_path
@@ -40,15 +40,15 @@ module Rails
       # Convenience method to get the namespace from the class name. It's the
       # same as Thor default except that the Generator at the end of the class
       # is removed.
-      def self.namespace(name=nil)
+      def self.namespace(name = nil)
         return super if name
-        @namespace ||= super.sub(/_generator$/, '').sub(/:generators:/, ':')
+        @namespace ||= super.sub(/_generator$/, "").sub(/:generators:/, ":")
       end
 
       # Convenience method to hide this generator from the available ones when
       # running rails generator command.
       def self.hide!
-        Rails::Generators.hide_namespace self.namespace
+        Rails::Generators.hide_namespace(namespace)
       end
 
       # Invoke a generator based on the value supplied by the user to the
@@ -168,7 +168,7 @@ module Rails
         names.each do |name|
           unless class_options.key?(name)
             defaults = if options[:type] == :boolean
-              { }
+              {}
             elsif [true, false].include?(default_value_for_option(name, options))
               { banner: "" }
             else
@@ -195,7 +195,7 @@ module Rails
       end
 
       # Make class option aware of Rails::Generators.options and Rails::Generators.aliases.
-      def self.class_option(name, options={}) #:nodoc:
+      def self.class_option(name, options = {}) #:nodoc:
         options[:desc]    = "Indicates when to generate #{name.to_s.humanize.downcase}" unless options.key?(:desc)
         options[:aliases] = default_aliases_for_option(name, options)
         options[:default] = default_value_for_option(name, options)
@@ -208,7 +208,7 @@ module Rails
       def self.default_source_root
         return unless base_name && generator_name
         return unless default_generator_root
-        path = File.join(default_generator_root, 'templates')
+        path = File.join(default_generator_root, "templates")
         path if File.exist?(path)
       end
 
@@ -230,7 +230,7 @@ module Rails
           Rails::Generators.subclasses << base
 
           Rails::Generators.templates_path.each do |path|
-            if base.name.include?('::')
+            if base.name.include?("::")
               base.source_paths << File.join(path, base.base_name, base.generator_name)
             else
               base.source_paths << File.join(path, base.generator_name)
@@ -239,11 +239,11 @@ module Rails
         end
       end
 
-      protected
+      private
 
         # Check whether the given class names are already taken by user
         # application or Ruby on Rails.
-        def class_collisions(*class_names) #:nodoc:
+        def class_collisions(*class_names)
           return unless behavior == :invoke
 
           class_names.flatten.each do |class_name|
@@ -251,20 +251,20 @@ module Rails
             next if class_name.strip.empty?
 
             # Split the class from its module nesting
-            nesting = class_name.split('::')
+            nesting = class_name.split("::")
             last_name = nesting.pop
             last = extract_last_module(nesting)
 
             if last && last.const_defined?(last_name.camelize, false)
-              raise Error, "The name '#{class_name}' is either already used in your application " <<
-                           "or reserved by Ruby on Rails. Please choose an alternative and run "  <<
+              raise Error, "The name '#{class_name}' is either already used in your application " \
+                           "or reserved by Ruby on Rails. Please choose an alternative and run "  \
                            "this generator again."
             end
           end
         end
 
         # Takes in an array of nested modules and extracts the last module
-        def extract_last_module(nesting)
+        def extract_last_module(nesting) # :doc:
           nesting.inject(Object) do |last_module, nest|
             break unless last_module.const_defined?(nest, false)
             last_module.const_get(nest)
@@ -272,14 +272,14 @@ module Rails
         end
 
         # Use Rails default banner.
-        def self.banner
-          "rails generate #{namespace.sub(/^rails:/,'')} #{self.arguments.map(&:usage).join(' ')} [options]".gsub(/\s+/, ' ')
+        def self.banner # :doc:
+          "rails generate #{namespace.sub(/^rails:/, '')} #{arguments.map(&:usage).join(' ')} [options]".gsub(/\s+/, " ")
         end
 
         # Sets the base_name taking into account the current class namespace.
-        def self.base_name
+        def self.base_name # :doc:
           @base_name ||= begin
-            if base = name.to_s.split('::').first
+            if base = name.to_s.split("::").first
               base.underscore
             end
           end
@@ -287,10 +287,10 @@ module Rails
 
         # Removes the namespaces and get the generator name. For example,
         # Rails::Generators::ModelGenerator will return "model" as generator name.
-        def self.generator_name
+        def self.generator_name # :doc:
           @generator_name ||= begin
-            if generator = name.to_s.split('::').last
-              generator.sub!(/Generator$/, '')
+            if generator = name.to_s.split("::").last
+              generator.sub!(/Generator$/, "")
               generator.underscore
             end
           end
@@ -298,21 +298,21 @@ module Rails
 
         # Returns the default value for the option name given doing a lookup in
         # Rails::Generators.options.
-        def self.default_value_for_option(name, options)
+        def self.default_value_for_option(name, options) # :doc:
           default_for_option(Rails::Generators.options, name, options, options[:default])
         end
 
         # Returns default aliases for the option name given doing a lookup in
         # Rails::Generators.aliases.
-        def self.default_aliases_for_option(name, options)
+        def self.default_aliases_for_option(name, options) # :doc:
           default_for_option(Rails::Generators.aliases, name, options, options[:aliases])
         end
 
         # Returns default for the option name given doing a lookup in config.
-        def self.default_for_option(config, name, options, default)
-          if generator_name and c = config[generator_name.to_sym] and c.key?(name)
+        def self.default_for_option(config, name, options, default) # :doc:
+          if generator_name && (c = config[generator_name.to_sym]) && c.key?(name)
             c[name]
-          elsif base_name and c = config[base_name.to_sym] and c.key?(name)
+          elsif base_name && (c = config[base_name.to_sym]) && c.key?(name)
             c[name]
           elsif config[:rails].key?(name)
             config[:rails][name]
@@ -331,7 +331,7 @@ module Rails
         def self.prepare_for_invocation(name, value) #:nodoc:
           return super unless value.is_a?(String) || value.is_a?(Symbol)
 
-          if value && constants = self.hooks[name]
+          if value && constants = hooks[name]
             value = name if TrueClass === value
             Rails::Generators.find_by_namespace(value, *constants)
           elsif klass = Rails::Generators.find_by_namespace(value)
@@ -343,7 +343,7 @@ module Rails
 
         # Small macro to add ruby as an option to the generator with proper
         # default value plus an instance helper method called shebang.
-        def self.add_shebang_option!
+        def self.add_shebang_option! # :doc:
           class_option :ruby, type: :string, aliases: "-r", default: Thor::Util.ruby_command,
                               desc: "Path to the Ruby binary of your choice", banner: "PATH"
 
@@ -361,7 +361,7 @@ module Rails
           }
         end
 
-        def self.usage_path
+        def self.usage_path # :doc:
           paths = [
             source_root && File.expand_path("../USAGE", source_root),
             default_generator_root && File.join(default_generator_root, "USAGE")
@@ -369,11 +369,10 @@ module Rails
           paths.compact.detect { |path| File.exist? path }
         end
 
-        def self.default_generator_root
+        def self.default_generator_root # :doc:
           path = File.expand_path(File.join(base_name, generator_name), base_root)
           path if File.exist?(path)
         end
-
     end
   end
 end

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

@@ -6,7 +6,7 @@ module Css # :nodoc:
       source_root File.expand_path("../templates", __FILE__)
 
       def copy_stylesheet
-        copy_file "stylesheet.css", File.join('app/assets/stylesheets', class_path, "#{file_name}.css")
+        copy_file "stylesheet.css", File.join("app/assets/stylesheets", class_path, "#{file_name}.css")
       end
     end
   end

data/lib/rails/generators/erb.rb

@@ -1,25 +1,25 @@
-require 'rails/generators/named_base'
+require "rails/generators/named_base"
 
 module Erb # :nodoc:
   module Generators # :nodoc:
     class Base < Rails::Generators::NamedBase #:nodoc:
-      protected
+      private
 
-      def formats
-        [format]
-      end
+        def formats
+          [format]
+        end
 
-      def format
-        :html
-      end
+        def format
+          :html
+        end
 
-      def handler
-        :erb
-      end
+        def handler
+          :erb
+        end
 
-      def filename_with_extensions(name, format = self.format)
-        [name, format, handler].compact.join(".")
-      end
+        def filename_with_extensions(name, format = self.format)
+          [name, format, handler].compact.join(".")
+        end
     end
   end
 end

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

@@ -1,4 +1,4 @@
-require 'rails/generators/erb'
+require "rails/generators/erb"
 
 module Erb # :nodoc:
   module Generators # :nodoc:

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

@@ -1,4 +1,4 @@
-require 'rails/generators/erb'
+require "rails/generators/erb"
 
 module Erb # :nodoc:
   module Generators # :nodoc:
@@ -6,13 +6,13 @@ module Erb # :nodoc:
       argument :actions, type: :array, default: [], banner: "method method"
 
       def copy_view_files
-        view_base_path = File.join("app/views", class_path, file_name + '_mailer')
+        view_base_path = File.join("app/views", class_path, file_name + "_mailer")
         empty_directory view_base_path
 
-        if self.behavior == :invoke
+        if behavior == :invoke
           formats.each do |format|
-            layout_path = File.join('app/views/layouts', class_path, filename_with_extensions('mailer', format))
-            template filename_with_extensions(:layout, format), layout_path
+            layout_path = File.join("app/views/layouts", class_path, filename_with_extensions("mailer", format))
+            template filename_with_extensions(:layout, format), layout_path unless File.exist?(layout_path)
           end
         end
 
@@ -26,15 +26,15 @@ module Erb # :nodoc:
         end
       end
 
-      protected
+      private
 
-      def formats
-        [:text, :html]
-      end
+        def formats
+          [:text, :html]
+        end
 
-      def file_name
-        @_file_name ||= super.gsub(/_mailer/i, '')
-      end
+        def file_name
+          @_file_name ||= super.gsub(/_mailer/i, "")
+        end
     end
   end
 end

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

@@ -1,5 +1,5 @@
-require 'rails/generators/erb'
-require 'rails/generators/resource_helpers'
+require "rails/generators/erb"
+require "rails/generators/resource_helpers"
 
 module Erb # :nodoc:
   module Generators # :nodoc:
@@ -21,7 +21,7 @@ module Erb # :nodoc:
         end
       end
 
-    protected
+    private
 
       def available_views
         %w(index edit show new _form)

data/lib/rails/generators/generated_attribute.rb

@@ -1,4 +1,4 @@
-require 'active_support/time'
+require "active_support/time"
 
 module Rails
   module Generators
@@ -12,7 +12,7 @@ module Rails
 
       class << self
         def parse(column_definition)
-          name, type, has_index = column_definition.split(':')
+          name, type, has_index = column_definition.split(":")
 
           # if user provided "name:index" instead of "name:string:index"
           # type should be set blank so GeneratedAttribute's constructor
@@ -56,7 +56,7 @@ module Rails
         end
       end
 
-      def initialize(name, type=nil, index_type=false, attr_options={})
+      def initialize(name, type = nil, index_type = false, attr_options = {})
         @name           = name
         @type           = type || :string
         @has_index      = INDEX_OPTIONS.include?(index_type)
@@ -66,40 +66,40 @@ module Rails
 
       def field_type
         @field_type ||= case type
-          when :integer              then :number_field
-          when :float, :decimal      then :text_field
-          when :time                 then :time_select
-          when :datetime, :timestamp then :datetime_select
-          when :date                 then :date_select
-          when :text                 then :text_area
-          when :boolean              then :check_box
+                        when :integer              then :number_field
+                        when :float, :decimal      then :text_field
+                        when :time                 then :time_select
+                        when :datetime, :timestamp then :datetime_select
+                        when :date                 then :date_select
+                        when :text                 then :text_area
+                        when :boolean              then :check_box
           else
-            :text_field
+                          :text_field
         end
       end
 
       def default
         @default ||= case type
-          when :integer                     then 1
-          when :float                       then 1.5
-          when :decimal                     then "9.99"
-          when :datetime, :timestamp, :time then Time.now.to_s(:db)
-          when :date                        then Date.today.to_s(:db)
-          when :string                      then name == "type" ? "" : "MyString"
-          when :text                        then "MyText"
-          when :boolean                     then false
-          when :references, :belongs_to     then nil
+                     when :integer                     then 1
+                     when :float                       then 1.5
+                     when :decimal                     then "9.99"
+                     when :datetime, :timestamp, :time then Time.now.to_s(:db)
+                     when :date                        then Date.today.to_s(:db)
+                     when :string                      then name == "type" ? "" : "MyString"
+                     when :text                        then "MyText"
+                     when :boolean                     then false
+                     when :references, :belongs_to     then nil
           else
-            ""
+                       ""
         end
       end
 
       def plural_name
-        name.sub(/_id$/, '').pluralize
+        name.sub(/_id$/, "").pluralize
       end
 
       def singular_name
-        name.sub(/_id$/, '').singularize
+        name.sub(/_id$/, "").singularize
       end
 
       def human_name
@@ -127,11 +127,11 @@ module Rails
       end
 
       def polymorphic?
-        self.attr_options[:polymorphic]
+        attr_options[:polymorphic]
       end
 
       def required?
-        self.attr_options[:required]
+        attr_options[:required]
       end
 
       def has_index?
@@ -143,7 +143,7 @@ module Rails
       end
 
       def password_digest?
-        name == 'password' && type == :digest
+        name == "password" && type == :digest
       end
 
       def token?
@@ -151,7 +151,7 @@ module Rails
       end
 
       def inject_options
-        "".tap { |s| options_for_migration.each { |k,v| s << ", #{k}: #{v.inspect}" } }
+        "".tap { |s| options_for_migration.each { |k, v| s << ", #{k}: #{v.inspect}" } }
       end
 
       def inject_index_options

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

@@ -6,7 +6,7 @@ module Js # :nodoc:
       source_root File.expand_path("../templates", __FILE__)
 
       def copy_javascript
-        copy_file "javascript.js", File.join('app/assets/javascripts', class_path, "#{file_name}.js")
+        copy_file "javascript.js", File.join("app/assets/javascripts", class_path, "#{file_name}.js")
       end
     end
   end