normalizes indentation and whitespace across the project

20 files changed, 186 insertions, 186 deletions

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 6178147ee4..9c150965bf 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -522,15 +522,15 @@ module Rails
 
     private
 
-    def build_request(env)
-      req = super
-      env["ORIGINAL_FULLPATH"] = req.fullpath
-      env["ORIGINAL_SCRIPT_NAME"] = req.script_name
-      req
-    end
+      def build_request(env)
+        req = super
+        env["ORIGINAL_FULLPATH"] = req.fullpath
+        env["ORIGINAL_SCRIPT_NAME"] = req.script_name
+        req
+      end
 
-    def build_middleware
-      config.app_middleware + super
-    end
+      def build_middleware
+        config.app_middleware + super
+      end
   end
 end
diff --git a/railties/lib/rails/application_controller.rb b/railties/lib/rails/application_controller.rb
index b0f3c3946d..f8394b8e0a 100644
--- a/railties/lib/rails/application_controller.rb
+++ b/railties/lib/rails/application_controller.rb
@@ -4,13 +4,13 @@ class Rails::ApplicationController < ActionController::Base # :nodoc:
 
   protected
 
-  def require_local!
-    unless local_request?
-      render html: "<p>For security purposes, this information is only available to local requests.</p>".html_safe, status: :forbidden
+    def require_local!
+      unless local_request?
+        render html: "<p>For security purposes, this information is only available to local requests.</p>".html_safe, status: :forbidden
+      end
     end
-  end
 
-  def local_request?
-    Rails.application.config.consider_all_requests_local || request.local?
-  end
+    def local_request?
+      Rails.application.config.consider_all_requests_local || request.local?
+    end
 end
diff --git a/railties/lib/rails/commands/console_helper.rb b/railties/lib/rails/commands/console_helper.rb
index 48c489740e..0b7f1c4249 100644
--- a/railties/lib/rails/commands/console_helper.rb
+++ b/railties/lib/rails/commands/console_helper.rb
@@ -8,7 +8,7 @@ module Rails
       def start(*args)
         new(*args).start
       end
-      
+
       private
         def set_options_env(arguments, options)
           if arguments.first && arguments.first[0] != "-"
@@ -24,11 +24,11 @@ module Rails
 
         def available_environments
           Dir["config/environments/*.rb"].map { |fname| File.basename(fname, ".*") }
-        end  
+        end
     end
 
     def environment
       ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
     end
   end
-end
\ No newline at end of file
+end
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb
index 95cd1fe528..d79a88b025 100644
--- a/railties/lib/rails/commands/dbconsole.rb
+++ b/railties/lib/rails/commands/dbconsole.rb
@@ -21,7 +21,7 @@ module Rails
 
           opt.on("--mode [MODE]", ["html", "list", "line", "column"],
             "Automatically put the sqlite3 database in the specified mode (html, list, line, column).") do |mode|
-              options["mode"] = mode
+            options["mode"] = mode
           end
 
           opt.on("--header") do |h|
diff --git a/railties/lib/rails/commands/plugin.rb b/railties/lib/rails/commands/plugin.rb
index ee5abdf880..6404748fca 100644
--- a/railties/lib/rails/commands/plugin.rb
+++ b/railties/lib/rails/commands/plugin.rb
@@ -5,7 +5,7 @@ else
   unless ARGV.delete("--no-rc")
     customrc = ARGV.index{ |x| x.include?("--rc=") }
     railsrc = if customrc
-                File.expand_path(ARGV.delete_at(customrc).gsub(/--rc=/, ""))
+      File.expand_path(ARGV.delete_at(customrc).gsub(/--rc=/, ""))
               else
                 File.join(File.expand_path("~"), ".railsrc")
               end
diff --git a/railties/lib/rails/commands/runner.rb b/railties/lib/rails/commands/runner.rb
index 38c749151c..11ef1d10e2 100644
--- a/railties/lib/rails/commands/runner.rb
+++ b/railties/lib/rails/commands/runner.rb
@@ -22,14 +22,14 @@ ARGV.clone.options do |opts|
   opts.on("-h", "--help",
           "Show this help message.") { $stdout.puts opts; exit }
 
-    opts.separator ""
-    opts.separator "Examples: "
+  opts.separator ""
+  opts.separator "Examples: "
 
-    opts.separator "    rails runner 'puts Rails.env'"
-    opts.separator "        This runs the code `puts Rails.env` after loading the app"
-    opts.separator ""
-    opts.separator "    rails runner path/to/filename.rb"
-    opts.separator "        This runs the Ruby file located at `path/to/filename.rb` after loading the app"
+  opts.separator "    rails runner 'puts Rails.env'"
+  opts.separator "        This runs the code `puts Rails.env` after loading the app"
+  opts.separator ""
+  opts.separator "    rails runner path/to/filename.rb"
+  opts.separator "        This runs the Ruby file located at `path/to/filename.rb` after loading the app"
 
   if RbConfig::CONFIG["host_os"] !~ /mswin|mingw/
     opts.separator ""
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 28941fd704..bf8ae0a5ee 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -21,31 +21,31 @@ module Rails
 
       private
 
-      def option_parser(options)
-        OptionParser.new do |opts|
-          opts.banner = "Usage: rails server [mongrel, thin etc] [options]"
-          opts.on("-p", "--port=port", Integer,
-                  "Runs Rails on the specified port.", "Default: 3000") { |v| options[:Port] = v }
-          opts.on("-b", "--binding=IP", String,
-                  "Binds Rails to the specified IP.", "Default: localhost") { |v| options[:Host] = v }
-          opts.on("-c", "--config=file", String,
-                  "Uses a custom rackup configuration.") { |v| options[:config] = v }
-          opts.on("-d", "--daemon", "Runs server as a Daemon.") { options[:daemonize] = true }
-          opts.on("-e", "--environment=name", String,
-                  "Specifies the environment to run this server under (test/development/production).",
-                  "Default: development") { |v| options[:environment] = v }
-          opts.on("-P", "--pid=pid", String,
-                  "Specifies the PID file.",
-                  "Default: tmp/pids/server.pid") { |v| options[:pid] = v }
-          opts.on("-C", "--[no-]dev-caching",
-                  "Specifies whether to perform caching in development.",
-                  "true or false") { |v| options[:caching] = v }
-
-          opts.separator ""
-
-          opts.on("-h", "--help", "Shows this help message.") { puts opts; exit }
+        def option_parser(options)
+          OptionParser.new do |opts|
+            opts.banner = "Usage: rails server [mongrel, thin etc] [options]"
+            opts.on("-p", "--port=port", Integer,
+                    "Runs Rails on the specified port.", "Default: 3000") { |v| options[:Port] = v }
+            opts.on("-b", "--binding=IP", String,
+                    "Binds Rails to the specified IP.", "Default: localhost") { |v| options[:Host] = v }
+            opts.on("-c", "--config=file", String,
+                    "Uses a custom rackup configuration.") { |v| options[:config] = v }
+            opts.on("-d", "--daemon", "Runs server as a Daemon.") { options[:daemonize] = true }
+            opts.on("-e", "--environment=name", String,
+                    "Specifies the environment to run this server under (test/development/production).",
+                    "Default: development") { |v| options[:environment] = v }
+            opts.on("-P", "--pid=pid", String,
+                    "Specifies the PID file.",
+                    "Default: tmp/pids/server.pid") { |v| options[:pid] = v }
+            opts.on("-C", "--[no-]dev-caching",
+                    "Specifies whether to perform caching in development.",
+                    "true or false") { |v| options[:caching] = v }
+
+            opts.separator ""
+
+            opts.on("-h", "--help", "Shows this help message.") { puts opts; exit }
+          end
         end
-      end
     end
 
     def initialize(*)
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index b8a9cac6d0..bcd1a66921 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -643,62 +643,62 @@ module Rails
 
     protected
 
-    def load_config_initializer(initializer)
-      ActiveSupport::Notifications.instrument("load_config_initializer.railties", initializer: initializer) do
-        load(initializer)
+      def load_config_initializer(initializer)
+        ActiveSupport::Notifications.instrument("load_config_initializer.railties", initializer: initializer) do
+          load(initializer)
+        end
       end
-    end
 
-    def run_tasks_blocks(*) #:nodoc:
-      super
-      paths["lib/tasks"].existent.sort.each { |ext| load(ext) }
-    end
+      def run_tasks_blocks(*) #:nodoc:
+        super
+        paths["lib/tasks"].existent.sort.each { |ext| load(ext) }
+      end
 
-    def has_migrations? #:nodoc:
-      paths["db/migrate"].existent.any?
-    end
+      def has_migrations? #:nodoc:
+        paths["db/migrate"].existent.any?
+      end
 
-    def self.find_root_with_flag(flag, root_path, default=nil) #:nodoc:
+      def self.find_root_with_flag(flag, root_path, default=nil) #:nodoc:
 
-      while root_path && File.directory?(root_path) && !File.exist?("#{root_path}/#{flag}")
-        parent = File.dirname(root_path)
-        root_path = parent != root_path && parent
-      end
+        while root_path && File.directory?(root_path) && !File.exist?("#{root_path}/#{flag}")
+          parent = File.dirname(root_path)
+          root_path = parent != root_path && parent
+        end
 
-      root = File.exist?("#{root_path}/#{flag}") ? root_path : default
-      raise "Could not find root path for #{self}" unless root
+        root = File.exist?("#{root_path}/#{flag}") ? root_path : default
+        raise "Could not find root path for #{self}" unless root
 
-      Pathname.new File.realpath root
-    end
+        Pathname.new File.realpath root
+      end
 
-    def default_middleware_stack #:nodoc:
-      ActionDispatch::MiddlewareStack.new
-    end
+      def default_middleware_stack #:nodoc:
+        ActionDispatch::MiddlewareStack.new
+      end
 
-    def _all_autoload_once_paths #:nodoc:
-      config.autoload_once_paths
-    end
+      def _all_autoload_once_paths #:nodoc:
+        config.autoload_once_paths
+      end
 
-    def _all_autoload_paths #:nodoc:
-      @_all_autoload_paths ||= (config.autoload_paths + config.eager_load_paths + config.autoload_once_paths).uniq
-    end
+      def _all_autoload_paths #:nodoc:
+        @_all_autoload_paths ||= (config.autoload_paths + config.eager_load_paths + config.autoload_once_paths).uniq
+      end
 
-    def _all_load_paths #:nodoc:
-      @_all_load_paths ||= (config.paths.load_paths + _all_autoload_paths).uniq
-    end
+      def _all_load_paths #:nodoc:
+        @_all_load_paths ||= (config.paths.load_paths + _all_autoload_paths).uniq
+      end
 
     private
 
-    def build_request(env)
-      env.merge!(env_config)
-      req = ActionDispatch::Request.new env
-      req.routes = routes
-      req.engine_script_name = req.script_name
-      req
-    end
+      def build_request(env)
+        env.merge!(env_config)
+        req = ActionDispatch::Request.new env
+        req.routes = routes
+        req.engine_script_name = req.script_name
+        req
+      end
 
-    def build_middleware
-      config.middleware
-    end
+      def build_middleware
+        config.middleware
+      end
   end
 end
diff --git a/railties/lib/rails/generators/actions/create_migration.rb b/railties/lib/rails/generators/actions/create_migration.rb
index a5e624b5d1..46f376a38e 100644
--- a/railties/lib/rails/generators/actions/create_migration.rb
+++ b/railties/lib/rails/generators/actions/create_migration.rb
@@ -40,30 +40,30 @@ module Rails
 
         protected
 
-        def on_conflict_behavior
-          options = base.options.merge(config)
-          if identical?
-            say_status :identical, :blue, relative_existing_migration
-          elsif options[:force]
-            say_status :remove, :green, relative_existing_migration
-            say_status :create, :green
-            unless pretend?
-              ::FileUtils.rm_rf(existing_migration)
-              yield
+          def on_conflict_behavior
+            options = base.options.merge(config)
+            if identical?
+              say_status :identical, :blue, relative_existing_migration
+            elsif options[:force]
+              say_status :remove, :green, relative_existing_migration
+              say_status :create, :green
+              unless pretend?
+                ::FileUtils.rm_rf(existing_migration)
+                yield
+              end
+            elsif options[:skip]
+              say_status :skip, :yellow
+            else
+              say_status :conflict, :red
+              raise Error, "Another migration is already named #{migration_file_name}: " +
+                "#{existing_migration}. Use --force to replace this migration " +
+                "or --skip to ignore conflicted file."
             end
-          elsif options[:skip]
-            say_status :skip, :yellow
-          else
-            say_status :conflict, :red
-            raise Error, "Another migration is already named #{migration_file_name}: " +
-              "#{existing_migration}. Use --force to replace this migration " +
-              "or --skip to ignore conflicted file."
           end
-        end
 
-        def say_status(status, color, message = relative_destination)
-          base.shell.say_status(status, message, color) if config[:verbose]
-        end
+          def say_status(status, color, message = relative_destination)
+            base.shell.say_status(status, message, color) if config[:verbose]
+          end
       end
     end
   end
diff --git a/railties/lib/rails/generators/erb.rb b/railties/lib/rails/generators/erb.rb
index 99d8a0b786..d01502002f 100644
--- a/railties/lib/rails/generators/erb.rb
+++ b/railties/lib/rails/generators/erb.rb
@@ -5,21 +5,21 @@ module Erb # :nodoc:
     class Base < Rails::Generators::NamedBase #:nodoc:
       protected
 
-      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
diff --git a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
index 1207cdad69..f150240908 100644
--- a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
+++ b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
@@ -28,13 +28,13 @@ module Erb # :nodoc:
 
       protected
 
-      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
diff --git a/railties/lib/rails/generators/rails/assets/assets_generator.rb b/railties/lib/rails/generators/rails/assets/assets_generator.rb
index 6f4b86e708..265dada2ca 100644
--- a/railties/lib/rails/generators/rails/assets/assets_generator.rb
+++ b/railties/lib/rails/generators/rails/assets/assets_generator.rb
@@ -9,17 +9,17 @@ module Rails
 
       protected
 
-      def asset_name
-        file_name
-      end
+        def asset_name
+          file_name
+        end
 
-      hook_for :javascript_engine do |javascript_engine|
-        invoke javascript_engine, [name] if options[:javascripts]
-      end
+        hook_for :javascript_engine do |javascript_engine|
+          invoke javascript_engine, [name] if options[:javascripts]
+        end
 
-      hook_for :stylesheet_engine do |stylesheet_engine|
-        invoke stylesheet_engine, [name] if options[:stylesheets]
-      end
+        hook_for :stylesheet_engine do |stylesheet_engine|
+          invoke stylesheet_engine, [name] if options[:stylesheets]
+        end
     end
   end
 end
diff --git a/railties/lib/rails/info.rb b/railties/lib/rails/info.rb
index 5cc747592d..d69cbbc001 100644
--- a/railties/lib/rails/info.rb
+++ b/railties/lib/rails/info.rb
@@ -42,7 +42,7 @@ module Rails
           properties.each do |(name, value)|
             table << %(<tr><td class="name">#{CGI.escapeHTML(name.to_s)}</td>)
             formatted_value = if value.kind_of?(Array)
-                  "<ul>" + value.map { |v| "<li>#{CGI.escapeHTML(v.to_s)}</li>" }.join + "</ul>"
+              "<ul>" + value.map { |v| "<li>#{CGI.escapeHTML(v.to_s)}</li>" }.join + "</ul>"
                 else
                   CGI.escapeHTML(value.to_s)
                 end
diff --git a/railties/lib/rails/info_controller.rb b/railties/lib/rails/info_controller.rb
index db9a32c9c2..f5aa074703 100644
--- a/railties/lib/rails/info_controller.rb
+++ b/railties/lib/rails/info_controller.rb
@@ -32,13 +32,13 @@ class Rails::InfoController < Rails::ApplicationController # :nodoc:
 
   private
 
-  def match_route
-    _routes.routes.select {|route|
-      yield route.path
-    }.map {|route| route.path.spec.to_s }
-  end
+    def match_route
+      _routes.routes.select {|route|
+        yield route.path
+      }.map {|route| route.path.spec.to_s }
+    end
 
-  def with_leading_slash(path)
-    ("/" + path).squeeze("/")
-  end
+    def with_leading_slash(path)
+      ("/" + path).squeeze("/")
+    end
 end
diff --git a/railties/lib/rails/rack/logger.rb b/railties/lib/rails/rack/logger.rb
index b8684971fc..e3fee75603 100644
--- a/railties/lib/rails/rack/logger.rb
+++ b/railties/lib/rails/rack/logger.rb
@@ -67,14 +67,14 @@ module Rails
 
       private
 
-      def finish(request)
-        instrumenter = ActiveSupport::Notifications.instrumenter
-        instrumenter.finish "request.action_dispatch", request: request
-      end
+        def finish(request)
+          instrumenter = ActiveSupport::Notifications.instrumenter
+          instrumenter.finish "request.action_dispatch", request: request
+        end
 
-      def logger
-        Rails.logger
-      end
+        def logger
+          Rails.logger
+        end
     end
   end
 end
diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
index 8718f6db2d..eb3f5d4ee9 100644
--- a/railties/lib/rails/railtie.rb
+++ b/railties/lib/rails/railtie.rb
@@ -222,31 +222,31 @@ module Rails
 
     protected
 
-    def run_console_blocks(app) #:nodoc:
-      each_registered_block(:console) { |block| block.call(app) }
-    end
+      def run_console_blocks(app) #:nodoc:
+        each_registered_block(:console) { |block| block.call(app) }
+      end
 
-    def run_generators_blocks(app) #:nodoc:
-      each_registered_block(:generators) { |block| block.call(app) }
-    end
+      def run_generators_blocks(app) #:nodoc:
+        each_registered_block(:generators) { |block| block.call(app) }
+      end
 
-    def run_runner_blocks(app) #:nodoc:
-      each_registered_block(:runner) { |block| block.call(app) }
-    end
+      def run_runner_blocks(app) #:nodoc:
+        each_registered_block(:runner) { |block| block.call(app) }
+      end
 
-    def run_tasks_blocks(app) #:nodoc:
-      extend Rake::DSL
-      each_registered_block(:rake_tasks) { |block| instance_exec(app, &block) }
-    end
+      def run_tasks_blocks(app) #:nodoc:
+        extend Rake::DSL
+        each_registered_block(:rake_tasks) { |block| instance_exec(app, &block) }
+      end
 
     private
 
-    def each_registered_block(type, &block)
-      klass = self.class
-      while klass.respond_to?(type)
-        klass.public_send(type).each(&block)
-        klass = klass.superclass
+      def each_registered_block(type, &block)
+        klass = self.class
+        while klass.respond_to?(type)
+          klass.public_send(type).each(&block)
+          klass = klass.superclass
+        end
       end
-    end
   end
 end
diff --git a/railties/lib/rails/railtie/configurable.rb b/railties/lib/rails/railtie/configurable.rb
index 257c4df894..d6040785a0 100644
--- a/railties/lib/rails/railtie/configurable.rb
+++ b/railties/lib/rails/railtie/configurable.rb
@@ -26,9 +26,9 @@ module Rails
 
         protected
 
-        def method_missing(*args, &block)
-          instance.send(*args, &block)
-        end
+          def method_missing(*args, &block)
+            instance.send(*args, &block)
+          end
       end
     end
   end
diff --git a/railties/lib/rails/tasks/annotations.rake b/railties/lib/rails/tasks/annotations.rake
index 61dd4a1a37..9a69eb9934 100644
--- a/railties/lib/rails/tasks/annotations.rake
+++ b/railties/lib/rails/tasks/annotations.rake
@@ -17,4 +17,4 @@ namespace :notes do
   task :custom do
     SourceAnnotationExtractor.enumerate ENV["ANNOTATION"]
   end
-end
\ No newline at end of file
+end
diff --git a/railties/lib/rails/tasks/log.rake b/railties/lib/rails/tasks/log.rake
index 31acbdcb84..c376234fee 100644
--- a/railties/lib/rails/tasks/log.rake
+++ b/railties/lib/rails/tasks/log.rake
@@ -1,8 +1,8 @@
 namespace :log do
-  
-  ## 
+
+  ##
   # Truncates all/specified log files
-  # ENV['LOGS'] 
+  # ENV['LOGS']
   #   - defaults to standard environment log files i.e. 'development,test,production'
   #   - ENV['LOGS']=all truncates all files i.e. log/*.log
   #   - ENV['LOGS']='test,development' truncates only specified files
@@ -28,7 +28,7 @@ namespace :log do
         .map    { |file| "log/#{file.strip}.log" }
         .select { |file| File.exist?(file) }
   end
-  
+
   def clear_log_file(file)
     f = File.open(file, "w")
     f.close
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index d172106302..91ff7f4be7 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -8,7 +8,7 @@ desc "Runs all tests in test folder"
 task :test do
   $: << "test"
   pattern = if ENV.key?("TEST")
-               ENV["TEST"]
+    ENV["TEST"]
              else
                "test"
              end