normalizes indentation and whitespace across the project

68 files changed, 1227 insertions, 1231 deletions

diff --git a/actionpack/lib/abstract_controller/helpers.rb b/actionpack/lib/abstract_controller/helpers.rb
index e7f5863f1c..cb76898f59 100644
--- a/actionpack/lib/abstract_controller/helpers.rb
+++ b/actionpack/lib/abstract_controller/helpers.rb
@@ -177,19 +177,19 @@ module AbstractController
       # ==== Parameters
       # * <tt>module</tt> - The module to include into the current helper module
       #   for the class
-      def add_template_helper(mod)
-        _helpers.module_eval { include mod }
-      end
+        def add_template_helper(mod)
+          _helpers.module_eval { include mod }
+        end
 
-      def default_helper_module!
-        module_name = name.sub(/Controller$/, "".freeze)
-        module_path = module_name.underscore
-        helper module_path
-      rescue LoadError => e
-        raise e unless e.is_missing? "helpers/#{module_path}_helper"
-      rescue NameError => e
-        raise e unless e.missing_name? "#{module_name}Helper"
-      end
+        def default_helper_module!
+          module_name = name.sub(/Controller$/, "".freeze)
+          module_path = module_name.underscore
+          helper module_path
+        rescue LoadError => e
+          raise e unless e.is_missing? "helpers/#{module_path}_helper"
+        rescue NameError => e
+          raise e unless e.missing_name? "#{module_name}Helper"
+        end
     end
   end
 end
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index 32ad746769..0364500944 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -34,29 +34,29 @@ module ActionController
 
     private
 
-    INCLUDE = ->(list, action) { list.include? action }
-    EXCLUDE = ->(list, action) { !list.include? action }
-    NULL    = ->(list, action) { true }
-
-    def build_middleware(klass, args, block)
-      options = args.extract_options!
-      only   = Array(options.delete(:only)).map(&:to_s)
-      except = Array(options.delete(:except)).map(&:to_s)
-      args << options unless options.empty?
-
-      strategy = NULL
-      list     = nil
-
-      if only.any?
-        strategy = INCLUDE
-        list     = only
-      elsif except.any?
-        strategy = EXCLUDE
-        list     = except
-      end
+      INCLUDE = ->(list, action) { list.include? action }
+      EXCLUDE = ->(list, action) { !list.include? action }
+      NULL    = ->(list, action) { true }
+
+      def build_middleware(klass, args, block)
+        options = args.extract_options!
+        only   = Array(options.delete(:only)).map(&:to_s)
+        except = Array(options.delete(:except)).map(&:to_s)
+        args << options unless options.empty?
+
+        strategy = NULL
+        list     = nil
+
+        if only.any?
+          strategy = INCLUDE
+          list     = only
+        elsif except.any?
+          strategy = EXCLUDE
+          list     = except
+        end
 
-      Middleware.new(get_class(klass), args, list, strategy, block)
-    end
+        Middleware.new(get_class(klass), args, list, strategy, block)
+      end
   end
 
   # <tt>ActionController::Metal</tt> is the simplest possible controller, providing a
diff --git a/actionpack/lib/action_controller/metal/etag_with_template_digest.rb b/actionpack/lib/action_controller/metal/etag_with_template_digest.rb
index e3a7c3b166..49b5f1090e 100644
--- a/actionpack/lib/action_controller/metal/etag_with_template_digest.rb
+++ b/actionpack/lib/action_controller/metal/etag_with_template_digest.rb
@@ -33,24 +33,24 @@ module ActionController
     end
 
     private
-    def determine_template_etag(options)
-      if template = pick_template_for_etag(options)
-        lookup_and_digest_template(template)
+      def determine_template_etag(options)
+        if template = pick_template_for_etag(options)
+          lookup_and_digest_template(template)
+        end
       end
-    end
 
     # Pick the template digest to include in the ETag. If the +:template+ option
     # is present, use the named template. If +:template+ is nil or absent, use
     # the default controller/action template. If +:template+ is false, omit the
     # template digest from the ETag.
-    def pick_template_for_etag(options)
-      unless options[:template] == false
-        options[:template] || "#{controller_path}/#{action_name}"
+      def pick_template_for_etag(options)
+        unless options[:template] == false
+          options[:template] || "#{controller_path}/#{action_name}"
+        end
       end
-    end
 
-    def lookup_and_digest_template(template)
-      ActionView::Digestor.digest name: template, finder: lookup_context
-    end
+      def lookup_and_digest_template(template)
+        ActionView::Digestor.digest name: template, finder: lookup_context
+      end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/head.rb b/actionpack/lib/action_controller/metal/head.rb
index d4344dc7b3..97306b5265 100644
--- a/actionpack/lib/action_controller/metal/head.rb
+++ b/actionpack/lib/action_controller/metal/head.rb
@@ -50,15 +50,15 @@ module ActionController
     end
 
     private
-    def include_content?(status)
-      case status
-      when 100..199
-        false
-      when 204, 205, 304
-        false
-      else
-        true
+      def include_content?(status)
+        case status
+        when 100..199
+          false
+        when 204, 205, 304
+          false
+        else
+          true
+        end
       end
-    end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/helpers.rb b/actionpack/lib/action_controller/metal/helpers.rb
index 295f0cb66f..7257bbfa95 100644
--- a/actionpack/lib/action_controller/metal/helpers.rb
+++ b/actionpack/lib/action_controller/metal/helpers.rb
@@ -109,9 +109,9 @@ module ActionController
 
       private
       # Extract helper names from files in <tt>app/helpers/**/*_helper.rb</tt>
-      def all_application_helpers
-        all_helpers_from_path(helpers_path)
-      end
+        def all_application_helpers
+          all_helpers_from_path(helpers_path)
+        end
     end
 
     # Provides a proxy to access helper methods from outside the view.
diff --git a/actionpack/lib/action_controller/metal/implicit_render.rb b/actionpack/lib/action_controller/metal/implicit_render.rb
index b76291d927..c4a1b00a54 100644
--- a/actionpack/lib/action_controller/metal/implicit_render.rb
+++ b/actionpack/lib/action_controller/metal/implicit_render.rb
@@ -62,7 +62,7 @@ module ActionController
 
     def method_for_action(action_name)
       super || if template_exists?(action_name.to_s, _prefixes)
-        "default_render"
+                 "default_render"
       end
     end
 
diff --git a/actionpack/lib/action_controller/metal/live.rb b/actionpack/lib/action_controller/metal/live.rb
index 1839230ffb..0f74ec25ff 100644
--- a/actionpack/lib/action_controller/metal/live.rb
+++ b/actionpack/lib/action_controller/metal/live.rb
@@ -215,18 +215,18 @@ module ActionController
     class Response < ActionDispatch::Response #:nodoc: all
       private
 
-      def before_committed
-        super
-        jar = request.cookie_jar
-        # The response can be committed multiple times
-        jar.write self unless committed?
-      end
+        def before_committed
+          super
+          jar = request.cookie_jar
+          # The response can be committed multiple times
+          jar.write self unless committed?
+        end
 
-      def build_buffer(response, body)
-        buf = Live::Buffer.new response
-        body.each { |part| buf.write part }
-        buf
-      end
+        def build_buffer(response, body)
+          buf = Live::Buffer.new response
+          body.each { |part| buf.write part }
+          buf
+        end
     end
 
     def process(name)
diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb
index e52a3cd211..745f449a05 100644
--- a/actionpack/lib/action_controller/metal/params_wrapper.rb
+++ b/actionpack/lib/action_controller/metal/params_wrapper.rb
@@ -135,23 +135,23 @@ module ActionController
       #
       # This method also does namespace lookup. Foo::Bar::UsersController will
       # try to find Foo::Bar::User, Foo::User and finally User.
-      def _default_wrap_model #:nodoc:
-        return nil if klass.anonymous?
-        model_name = klass.name.sub(/Controller$/, "").classify
-
-        begin
-          if model_klass = model_name.safe_constantize
-            model_klass
-          else
-            namespaces = model_name.split("::")
-            namespaces.delete_at(-2)
-            break if namespaces.last == model_name
-            model_name = namespaces.join("::")
-          end
-        end until model_klass
+        def _default_wrap_model #:nodoc:
+          return nil if klass.anonymous?
+          model_name = klass.name.sub(/Controller$/, "").classify
+
+          begin
+            if model_klass = model_name.safe_constantize
+              model_klass
+            else
+              namespaces = model_name.split("::")
+              namespaces.delete_at(-2)
+              break if namespaces.last == model_name
+              model_name = namespaces.join("::")
+            end
+          end until model_klass
 
-        model_klass
-      end
+          model_klass
+        end
     end
 
     included do
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index d99486f29b..41b166b346 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -54,37 +54,37 @@ module ActionController
 
     private
 
-    def _render_in_priorities(options)
-      RENDER_FORMATS_IN_PRIORITY.each do |format|
-        return options[format] if options.key?(format)
-      end
+      def _render_in_priorities(options)
+        RENDER_FORMATS_IN_PRIORITY.each do |format|
+          return options[format] if options.key?(format)
+        end
 
-      nil
-    end
+        nil
+      end
 
-    def _set_html_content_type
-      self.content_type = Mime[:html].to_s
-    end
+      def _set_html_content_type
+        self.content_type = Mime[:html].to_s
+      end
 
-    def _set_rendered_content_type(format)
-      unless response.content_type
-        self.content_type = format.to_s
+      def _set_rendered_content_type(format)
+        unless response.content_type
+          self.content_type = format.to_s
+        end
       end
-    end
 
     # Normalize arguments by catching blocks and setting them on :update.
-    def _normalize_args(action=nil, options={}, &blk) #:nodoc:
-      options = super
-      options[:update] = blk if block_given?
-      options
-    end
+      def _normalize_args(action=nil, options={}, &blk) #:nodoc:
+        options = super
+        options[:update] = blk if block_given?
+        options
+      end
 
     # Normalize both text and status options.
-    def _normalize_options(options) #:nodoc:
-      _normalize_text(options)
+      def _normalize_options(options) #:nodoc:
+        _normalize_text(options)
 
-      if options[:text]
-        ActiveSupport::Deprecation.warn <<-WARNING.squish
+        if options[:text]
+          ActiveSupport::Deprecation.warn <<-WARNING.squish
           `render :text` is deprecated because it does not actually render a
           `text/plain` response. Switch to `render plain: 'plain text'` to
           render as `text/plain`, `render html: '<strong>HTML</strong>'` to
@@ -92,41 +92,41 @@ module ActionController
           behavior and render with the default Content-Type, which is
           `text/plain`.
         WARNING
-      end
+        end
 
-      if options[:html]
-        options[:html] = ERB::Util.html_escape(options[:html])
-      end
+        if options[:html]
+          options[:html] = ERB::Util.html_escape(options[:html])
+        end
 
-      if options.delete(:nothing)
-        ActiveSupport::Deprecation.warn("`:nothing` option is deprecated and will be removed in Rails 5.1. Use `head` method to respond with empty response body.")
-        options[:body] = nil
-      end
+        if options.delete(:nothing)
+          ActiveSupport::Deprecation.warn("`:nothing` option is deprecated and will be removed in Rails 5.1. Use `head` method to respond with empty response body.")
+          options[:body] = nil
+        end
 
-      if options[:status]
-        options[:status] = Rack::Utils.status_code(options[:status])
-      end
+        if options[:status]
+          options[:status] = Rack::Utils.status_code(options[:status])
+        end
 
-      super
-    end
+        super
+      end
 
-    def _normalize_text(options)
-      RENDER_FORMATS_IN_PRIORITY.each do |format|
-        if options.key?(format) && options[format].respond_to?(:to_text)
-          options[format] = options[format].to_text
+      def _normalize_text(options)
+        RENDER_FORMATS_IN_PRIORITY.each do |format|
+          if options.key?(format) && options[format].respond_to?(:to_text)
+            options[format] = options[format].to_text
+          end
         end
       end
-    end
 
     # Process controller specific options, as status, content-type and location.
-    def _process_options(options) #:nodoc:
-      status, content_type, location = options.values_at(:status, :content_type, :location)
+      def _process_options(options) #:nodoc:
+        status, content_type, location = options.values_at(:status, :content_type, :location)
 
-      self.status = status if status
-      self.content_type = content_type if content_type
-      self.headers["Location"] = url_for(location) if location
+        self.status = status if status
+        self.content_type = content_type if content_type
+        self.headers["Location"] = url_for(location) if location
 
-      super
-    end
+        super
+      end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
index a6e24ded9e..3d3c121280 100644
--- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb
+++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
@@ -130,11 +130,11 @@ module ActionController #:nodoc:
 
       private
 
-      def protection_method_class(name)
-        ActionController::RequestForgeryProtection::ProtectionMethods.const_get(name.to_s.classify)
-      rescue NameError
-        raise ArgumentError, "Invalid request forgery protection method, use :null_session, :exception, or :reset_session"
-      end
+        def protection_method_class(name)
+          ActionController::RequestForgeryProtection::ProtectionMethods.const_get(name.to_s.classify)
+        rescue NameError
+          raise ArgumentError, "Invalid request forgery protection method, use :null_session, :exception, or :reset_session"
+        end
     end
 
     module ProtectionMethods
@@ -154,26 +154,26 @@ module ActionController #:nodoc:
 
         protected
 
-        class NullSessionHash < Rack::Session::Abstract::SessionHash #:nodoc:
-          def initialize(req)
-            super(nil, req)
-            @data = {}
-            @loaded = true
-          end
+          class NullSessionHash < Rack::Session::Abstract::SessionHash #:nodoc:
+            def initialize(req)
+              super(nil, req)
+              @data = {}
+              @loaded = true
+            end
 
-          # no-op
-          def destroy; end
+            # no-op
+            def destroy; end
 
-          def exists?
-            true
+            def exists?
+              true
+            end
           end
-        end
 
-        class NullCookieJar < ActionDispatch::Cookies::CookieJar #:nodoc:
-          def write(*)
-            # nothing
+          class NullCookieJar < ActionDispatch::Cookies::CookieJar #:nodoc:
+            def write(*)
+              # nothing
+            end
           end
-        end
       end
 
       class ResetSession
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 42c2e111b1..506548db5d 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -152,9 +152,9 @@ module ActionController
 
     private
 
-    def params_parsers
-      super.merge @custom_param_parsers
-    end
+      def params_parsers
+        super.merge @custom_param_parsers
+      end
   end
 
   class LiveTestResponse < Live::Response
@@ -615,37 +615,37 @@ module ActionController
 
       private
 
-      def scrub_env!(env)
-        env.delete_if { |k, v| k =~ /^(action_dispatch|rack)\.request/ }
-        env.delete_if { |k, v| k =~ /^action_dispatch\.rescue/ }
-        env.delete "action_dispatch.request.query_parameters"
-        env.delete "action_dispatch.request.request_parameters"
-        env["rack.input"] = StringIO.new
-        env
-      end
+        def scrub_env!(env)
+          env.delete_if { |k, v| k =~ /^(action_dispatch|rack)\.request/ }
+          env.delete_if { |k, v| k =~ /^action_dispatch\.rescue/ }
+          env.delete "action_dispatch.request.query_parameters"
+          env.delete "action_dispatch.request.request_parameters"
+          env["rack.input"] = StringIO.new
+          env
+        end
 
-      def process_with_kwargs(http_method, action, *args)
-        if kwarg_request?(args)
-          args.first.merge!(method: http_method)
-          process(action, *args)
-        else
-          non_kwarg_request_warning if args.any?
+        def process_with_kwargs(http_method, action, *args)
+          if kwarg_request?(args)
+            args.first.merge!(method: http_method)
+            process(action, *args)
+          else
+            non_kwarg_request_warning if args.any?
 
-          args = args.unshift(http_method)
-          process(action, *args)
+            args = args.unshift(http_method)
+            process(action, *args)
+          end
         end
-      end
 
-      REQUEST_KWARGS = %i(params session flash method body xhr)
-      def kwarg_request?(args)
-        args[0].respond_to?(:keys) && (
-          (args[0].key?(:format) && args[0].keys.size == 1) ||
-          args[0].keys.any? { |k| REQUEST_KWARGS.include?(k) }
-        )
-      end
+        REQUEST_KWARGS = %i(params session flash method body xhr)
+        def kwarg_request?(args)
+          args[0].respond_to?(:keys) && (
+            (args[0].key?(:format) && args[0].keys.size == 1) ||
+            args[0].keys.any? { |k| REQUEST_KWARGS.include?(k) }
+          )
+        end
 
-      def non_kwarg_request_warning
-        ActiveSupport::Deprecation.warn(<<-MSG.strip_heredoc)
+        def non_kwarg_request_warning
+          ActiveSupport::Deprecation.warn(<<-MSG.strip_heredoc)
           ActionController::TestCase HTTP request methods will accept only
           keyword arguments in future Rails versions.
 
@@ -654,26 +654,26 @@ module ActionController
           get :show, params: { id: 1 }, session: { user_id: 1 }
           process :update, method: :post, params: { id: 1 }
         MSG
-      end
+        end
 
-      def document_root_element
-        html_document.root
-      end
+        def document_root_element
+          html_document.root
+        end
 
-      def check_required_ivars
-        # Sanity check for required instance variables so we can give an
-        # understandable error message.
-        [:@routes, :@controller, :@request, :@response].each do |iv_name|
-          if !instance_variable_defined?(iv_name) || instance_variable_get(iv_name).nil?
-            raise "#{iv_name} is nil: make sure you set it in your test's setup method."
+        def check_required_ivars
+          # Sanity check for required instance variables so we can give an
+          # understandable error message.
+          [:@routes, :@controller, :@request, :@response].each do |iv_name|
+            if !instance_variable_defined?(iv_name) || instance_variable_get(iv_name).nil?
+              raise "#{iv_name} is nil: make sure you set it in your test's setup method."
+            end
           end
         end
-      end
 
-      def html_format?(parameters)
-        return true unless parameters.key?(:format)
-        Mime.fetch(parameters[:format]) { Mime["html"] }.html?
-      end
+        def html_format?(parameters)
+          return true unless parameters.key?(:format)
+          Mime.fetch(parameters[:format]) { Mime["html"] }.html?
+        end
     end
 
     include Behavior
diff --git a/actionpack/lib/action_dispatch/http/headers.rb b/actionpack/lib/action_dispatch/http/headers.rb
index 0b0c9e9590..91c45767ef 100644
--- a/actionpack/lib/action_dispatch/http/headers.rb
+++ b/actionpack/lib/action_dispatch/http/headers.rb
@@ -117,14 +117,14 @@ module ActionDispatch
 
       # Converts an HTTP header name to an environment variable name if it is
       # not contained within the headers hash.
-      def env_name(key)
-        key = key.to_s
-        if key =~ HTTP_HEADER
-          key = key.upcase.tr("-", "_")
-          key = "HTTP_" + key unless CGI_VARIABLES.include?(key)
+        def env_name(key)
+          key = key.to_s
+          if key =~ HTTP_HEADER
+            key = key.upcase.tr("-", "_")
+            key = "HTTP_" + key unless CGI_VARIABLES.include?(key)
+          end
+          key
         end
-        key
-      end
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/http/mime_negotiation.rb b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
index d8ee9c6def..d0c9413efa 100644
--- a/actionpack/lib/action_dispatch/http/mime_negotiation.rb
+++ b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
@@ -152,23 +152,23 @@ module ActionDispatch
 
       protected
 
-      BROWSER_LIKE_ACCEPTS = /,\s*\*\/\*|\*\/\*\s*,/
+        BROWSER_LIKE_ACCEPTS = /,\s*\*\/\*|\*\/\*\s*,/
 
-      def valid_accept_header
-        (xhr? && (accept.present? || content_mime_type)) ||
-          (accept.present? && accept !~ BROWSER_LIKE_ACCEPTS)
-      end
+        def valid_accept_header
+          (xhr? && (accept.present? || content_mime_type)) ||
+            (accept.present? && accept !~ BROWSER_LIKE_ACCEPTS)
+        end
 
-      def use_accept_header
-        !self.class.ignore_accept_header
-      end
+        def use_accept_header
+          !self.class.ignore_accept_header
+        end
 
-      def format_from_path_extension
-        path = get_header("action_dispatch.original_path") || get_header("PATH_INFO")
-        if match = path && path.match(/\.(\w+)\z/)
-          Mime[match.captures.first]
+        def format_from_path_extension
+          path = get_header("action_dispatch.original_path") || get_header("PATH_INFO")
+          if match = path && path.match(/\.(\w+)\z/)
+            Mime[match.captures.first]
+          end
         end
-      end
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb
index 3e6cfeb3d0..b9121a577c 100644
--- a/actionpack/lib/action_dispatch/http/mime_type.rb
+++ b/actionpack/lib/action_dispatch/http/mime_type.rb
@@ -306,24 +306,24 @@ module Mime
 
     protected
 
-    attr_reader :string, :synonyms
+      attr_reader :string, :synonyms
 
     private
 
-    def to_ary; end
-    def to_a; end
+      def to_ary; end
+      def to_a; end
 
-    def method_missing(method, *args)
-      if method.to_s.ends_with? "?"
-        method[0..-2].downcase.to_sym == to_sym
-      else
-        super
+      def method_missing(method, *args)
+        if method.to_s.ends_with? "?"
+          method[0..-2].downcase.to_sym == to_sym
+        else
+          super
+        end
       end
-    end
 
-    def respond_to_missing?(method, include_private = false) #:nodoc:
-      method.to_s.ends_with? "?"
-    end
+      def respond_to_missing?(method, include_private = false) #:nodoc:
+        method.to_s.ends_with? "?"
+      end
   end
 
   class AllType < Type
@@ -356,9 +356,9 @@ module Mime
     end
 
     private
-    def method_missing(method, *args)
-      false if method.to_s.ends_with? "?"
-    end
+      def method_missing(method, *args)
+        false if method.to_s.ends_with? "?"
+      end
   end
 end
 
diff --git a/actionpack/lib/action_dispatch/http/parameters.rb b/actionpack/lib/action_dispatch/http/parameters.rb
index 4850ca4404..f25e50f9f3 100644
--- a/actionpack/lib/action_dispatch/http/parameters.rb
+++ b/actionpack/lib/action_dispatch/http/parameters.rb
@@ -64,24 +64,24 @@ module ActionDispatch
 
       private
 
-      def parse_formatted_parameters(parsers)
-        return yield if content_length.zero? || content_mime_type.nil?
+        def parse_formatted_parameters(parsers)
+          return yield if content_length.zero? || content_mime_type.nil?
 
-        strategy = parsers.fetch(content_mime_type.symbol) { return yield }
+          strategy = parsers.fetch(content_mime_type.symbol) { return yield }
 
-        begin
-          strategy.call(raw_post)
-        rescue # JSON or Ruby code block errors
-          my_logger = logger || ActiveSupport::Logger.new($stderr)
-          my_logger.debug "Error occurred while parsing request parameters.\nContents:\n\n#{raw_post}"
+          begin
+            strategy.call(raw_post)
+          rescue # JSON or Ruby code block errors
+            my_logger = logger || ActiveSupport::Logger.new($stderr)
+            my_logger.debug "Error occurred while parsing request parameters.\nContents:\n\n#{raw_post}"
 
-          raise ParamsParser::ParseError
+            raise ParamsParser::ParseError
+          end
         end
-      end
 
-      def params_parsers
-        ActionDispatch::Request.parameter_parsers
-      end
+        def params_parsers
+          ActionDispatch::Request.parameter_parsers
+        end
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index 6483bb3804..9788431943 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -104,7 +104,7 @@ module ActionDispatch # :nodoc:
       def body
         @str_body ||= begin
           buf = ""
-            each { |chunk| buf << chunk }
+          each { |chunk| buf << chunk }
           buf
         end
       end
diff --git a/actionpack/lib/action_dispatch/journey/nfa/dot.rb b/actionpack/lib/action_dispatch/journey/nfa/dot.rb
index 7063b44bb5..0cd71b726a 100644
--- a/actionpack/lib/action_dispatch/journey/nfa/dot.rb
+++ b/actionpack/lib/action_dispatch/journey/nfa/dot.rb
@@ -18,7 +18,7 @@ module ActionDispatch
           #  (memos || []).map { |v| "  #{k} -> #{v.object_id};" }
           #}.uniq
 
-        <<-eodot
+          <<-eodot
 digraph nfa {
   rankdir=LR;
   node [shape = doublecircle];
diff --git a/actionpack/lib/action_dispatch/journey/parser.rb b/actionpack/lib/action_dispatch/journey/parser.rb
index 65805cd51b..9b4707369b 100644
--- a/actionpack/lib/action_dispatch/journey/parser.rb
+++ b/actionpack/lib/action_dispatch/journey/parser.rb
@@ -13,133 +13,133 @@ module ActionDispatch
     class Parser < Racc::Parser
 ##### State transition tables begin ###
 
-racc_action_table = [
-    13,    15,    14,     7,    21,    16,     8,    19,    13,    15,
-    14,     7,    17,    16,     8,    13,    15,    14,     7,    24,
-    16,     8,    13,    15,    14,     7,    19,    16,     8 ]
-
-racc_action_check = [
-     2,     2,     2,     2,    17,     2,     2,     2,     0,     0,
-     0,     0,     1,     0,     0,    19,    19,    19,    19,    20,
-    19,    19,     7,     7,     7,     7,    22,     7,     7 ]
-
-racc_action_pointer = [
-     6,    12,    -2,   nil,   nil,   nil,   nil,    20,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,     4,   nil,    13,
-    13,   nil,    17,   nil,   nil ]
-
-racc_action_default = [
-   -19,   -19,    -2,    -3,    -4,    -5,    -6,   -19,   -10,   -11,
-   -12,   -13,   -14,   -15,   -16,   -17,   -18,   -19,    -1,   -19,
-   -19,    25,    -8,    -9,    -7 ]
-
-racc_goto_table = [
-     1,    22,    18,    23,   nil,   nil,   nil,    20 ]
-
-racc_goto_check = [
-     1,     2,     1,     3,   nil,   nil,   nil,     1 ]
-
-racc_goto_pointer = [
-   nil,     0,   -18,   -16,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil ]
-
-racc_goto_default = [
-   nil,   nil,     2,     3,     4,     5,     6,     9,    10,    11,
-    12 ]
-
-racc_reduce_table = [
-  0, 0, :racc_error,
-  2, 11, :_reduce_1,
-  1, 11, :_reduce_2,
-  1, 11, :_reduce_none,
-  1, 12, :_reduce_none,
-  1, 12, :_reduce_none,
-  1, 12, :_reduce_none,
-  3, 15, :_reduce_7,
-  3, 13, :_reduce_8,
-  3, 13, :_reduce_9,
-  1, 16, :_reduce_10,
-  1, 14, :_reduce_none,
-  1, 14, :_reduce_none,
-  1, 14, :_reduce_none,
-  1, 14, :_reduce_none,
-  1, 19, :_reduce_15,
-  1, 17, :_reduce_16,
-  1, 18, :_reduce_17,
-  1, 20, :_reduce_18 ]
-
-racc_reduce_n = 19
-
-racc_shift_n = 25
-
-racc_token_table = {
-  false => 0,
-  :error => 1,
-  :SLASH => 2,
-  :LITERAL => 3,
-  :SYMBOL => 4,
-  :LPAREN => 5,
-  :RPAREN => 6,
-  :DOT => 7,
-  :STAR => 8,
-  :OR => 9 }
-
-racc_nt_base = 10
-
-racc_use_result_var = false
-
-Racc_arg = [
-  racc_action_table,
-  racc_action_check,
-  racc_action_default,
-  racc_action_pointer,
-  racc_goto_table,
-  racc_goto_check,
-  racc_goto_default,
-  racc_goto_pointer,
-  racc_nt_base,
-  racc_reduce_table,
-  racc_token_table,
-  racc_shift_n,
-  racc_reduce_n,
-  racc_use_result_var ]
-
-Racc_token_to_s_table = [
-  "$end",
-  "error",
-  "SLASH",
-  "LITERAL",
-  "SYMBOL",
-  "LPAREN",
-  "RPAREN",
-  "DOT",
-  "STAR",
-  "OR",
-  "$start",
-  "expressions",
-  "expression",
-  "or",
-  "terminal",
-  "group",
-  "star",
-  "symbol",
-  "literal",
-  "slash",
-  "dot" ]
-
-Racc_debug_parser = false
+      racc_action_table = [
+          13,    15,    14,     7,    21,    16,     8,    19,    13,    15,
+          14,     7,    17,    16,     8,    13,    15,    14,     7,    24,
+          16,     8,    13,    15,    14,     7,    19,    16,     8 ]
+
+      racc_action_check = [
+           2,     2,     2,     2,    17,     2,     2,     2,     0,     0,
+           0,     0,     1,     0,     0,    19,    19,    19,    19,    20,
+          19,    19,     7,     7,     7,     7,    22,     7,     7 ]
+
+      racc_action_pointer = [
+           6,    12,    -2,   nil,   nil,   nil,   nil,    20,   nil,   nil,
+         nil,   nil,   nil,   nil,   nil,   nil,   nil,     4,   nil,    13,
+          13,   nil,    17,   nil,   nil ]
+
+      racc_action_default = [
+         -19,   -19,    -2,    -3,    -4,    -5,    -6,   -19,   -10,   -11,
+         -12,   -13,   -14,   -15,   -16,   -17,   -18,   -19,    -1,   -19,
+         -19,    25,    -8,    -9,    -7 ]
+
+      racc_goto_table = [
+           1,    22,    18,    23,   nil,   nil,   nil,    20 ]
+
+      racc_goto_check = [
+           1,     2,     1,     3,   nil,   nil,   nil,     1 ]
+
+      racc_goto_pointer = [
+         nil,     0,   -18,   -16,   nil,   nil,   nil,   nil,   nil,   nil,
+         nil ]
+
+      racc_goto_default = [
+         nil,   nil,     2,     3,     4,     5,     6,     9,    10,    11,
+          12 ]
+
+      racc_reduce_table = [
+        0, 0, :racc_error,
+        2, 11, :_reduce_1,
+        1, 11, :_reduce_2,
+        1, 11, :_reduce_none,
+        1, 12, :_reduce_none,
+        1, 12, :_reduce_none,
+        1, 12, :_reduce_none,
+        3, 15, :_reduce_7,
+        3, 13, :_reduce_8,
+        3, 13, :_reduce_9,
+        1, 16, :_reduce_10,
+        1, 14, :_reduce_none,
+        1, 14, :_reduce_none,
+        1, 14, :_reduce_none,
+        1, 14, :_reduce_none,
+        1, 19, :_reduce_15,
+        1, 17, :_reduce_16,
+        1, 18, :_reduce_17,
+        1, 20, :_reduce_18 ]
+
+      racc_reduce_n = 19
+
+      racc_shift_n = 25
+
+      racc_token_table = {
+        false => 0,
+        :error => 1,
+        :SLASH => 2,
+        :LITERAL => 3,
+        :SYMBOL => 4,
+        :LPAREN => 5,
+        :RPAREN => 6,
+        :DOT => 7,
+        :STAR => 8,
+        :OR => 9 }
+
+      racc_nt_base = 10
+
+      racc_use_result_var = false
+
+      Racc_arg = [
+        racc_action_table,
+        racc_action_check,
+        racc_action_default,
+        racc_action_pointer,
+        racc_goto_table,
+        racc_goto_check,
+        racc_goto_default,
+        racc_goto_pointer,
+        racc_nt_base,
+        racc_reduce_table,
+        racc_token_table,
+        racc_shift_n,
+        racc_reduce_n,
+        racc_use_result_var ]
+
+      Racc_token_to_s_table = [
+        "$end",
+        "error",
+        "SLASH",
+        "LITERAL",
+        "SYMBOL",
+        "LPAREN",
+        "RPAREN",
+        "DOT",
+        "STAR",
+        "OR",
+        "$start",
+        "expressions",
+        "expression",
+        "or",
+        "terminal",
+        "group",
+        "star",
+        "symbol",
+        "literal",
+        "slash",
+        "dot" ]
+
+      Racc_debug_parser = false
 
 ##### State transition tables end #####
 
 # reduce 0 omitted
 
-def _reduce_1(val, _values)
- Cat.new(val.first, val.last)
-end
+      def _reduce_1(val, _values)
+        Cat.new(val.first, val.last)
+      end
 
-def _reduce_2(val, _values)
- val.first
-end
+      def _reduce_2(val, _values)
+        val.first
+      end
 
 # reduce 3 omitted
 
@@ -149,21 +149,21 @@ end
 
 # reduce 6 omitted
 
-def _reduce_7(val, _values)
- Group.new(val[1])
-end
+      def _reduce_7(val, _values)
+        Group.new(val[1])
+      end
 
-def _reduce_8(val, _values)
- Or.new([val.first, val.last])
-end
+      def _reduce_8(val, _values)
+        Or.new([val.first, val.last])
+      end
 
-def _reduce_9(val, _values)
- Or.new([val.first, val.last])
-end
+      def _reduce_9(val, _values)
+        Or.new([val.first, val.last])
+      end
 
-def _reduce_10(val, _values)
- Star.new(Symbol.new(val.last))
-end
+      def _reduce_10(val, _values)
+        Star.new(Symbol.new(val.last))
+      end
 
 # reduce 11 omitted
 
@@ -173,25 +173,25 @@ end
 
 # reduce 14 omitted
 
-def _reduce_15(val, _values)
- Slash.new("/")
-end
+      def _reduce_15(val, _values)
+        Slash.new("/")
+      end
 
-def _reduce_16(val, _values)
- Symbol.new(val.first)
-end
+      def _reduce_16(val, _values)
+        Symbol.new(val.first)
+      end
 
-def _reduce_17(val, _values)
- Literal.new(val.first)
-end
+      def _reduce_17(val, _values)
+        Literal.new(val.first)
+      end
 
-def _reduce_18(val, _values)
- Dot.new(val.first)
-end
+      def _reduce_18(val, _values)
+        Dot.new(val.first)
+      end
 
-def _reduce_none(val, _values)
-  val[0]
-end
+      def _reduce_none(val, _values)
+        val[0]
+      end
 
     end   # class Parser
     end   # module Journey
diff --git a/actionpack/lib/action_dispatch/journey/route.rb b/actionpack/lib/action_dispatch/journey/route.rb
index b6d9f4737a..f437897522 100644
--- a/actionpack/lib/action_dispatch/journey/route.rb
+++ b/actionpack/lib/action_dispatch/journey/route.rb
@@ -168,13 +168,13 @@ module ActionDispatch
       end
 
       private
-      def verbs
-        @request_method_match.map(&:verb)
-      end
+        def verbs
+          @request_method_match.map(&:verb)
+        end
 
-      def match_verb(request)
-        @request_method_match.any? { |m| m.call request }
-      end
+        def match_verb(request)
+          @request_method_match.any? { |m| m.call request }
+        end
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/journey/visitors.rb b/actionpack/lib/action_dispatch/journey/visitors.rb
index 819accd44a..8476c5d079 100644
--- a/actionpack/lib/action_dispatch/journey/visitors.rb
+++ b/actionpack/lib/action_dispatch/journey/visitors.rb
@@ -166,28 +166,28 @@ module ActionDispatch
       class String < FunctionalVisitor # :nodoc:
         private
 
-        def binary(node, seed)
-          visit(node.right, visit(node.left, seed))
-        end
+          def binary(node, seed)
+            visit(node.right, visit(node.left, seed))
+          end
 
-        def nary(node, seed)
-          last_child = node.children.last
-          node.children.inject(seed) { |s, c|
-            string = visit(c, s)
-            string << "|".freeze unless last_child == c
-            string
-          }
-        end
+          def nary(node, seed)
+            last_child = node.children.last
+            node.children.inject(seed) { |s, c|
+              string = visit(c, s)
+              string << "|".freeze unless last_child == c
+              string
+            }
+          end
 
-        def terminal(node, seed)
-          seed + node.left
-        end
+          def terminal(node, seed)
+            seed + node.left
+          end
 
-        def visit_GROUP(node, seed)
-          visit(node.left, seed << "(".freeze) << ")".freeze
-        end
+          def visit_GROUP(node, seed)
+            visit(node.left, seed << "(".freeze) << ")".freeze
+          end
 
-        INSTANCE = new
+          INSTANCE = new
       end
 
       class Dot < FunctionalVisitor # :nodoc:
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index ddae0c5a8e..bebf220488 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -237,9 +237,9 @@ module ActionDispatch
 
       private
 
-      def upgrade_legacy_signed_cookies?
-        request.secret_token.present? && request.secret_key_base.present?
-      end
+        def upgrade_legacy_signed_cookies?
+          request.secret_token.present? && request.secret_key_base.present?
+        end
     end
 
     # Passing the ActiveSupport::MessageEncryptor::NullSerializer downstream
@@ -420,26 +420,26 @@ module ActionDispatch
 
       private
 
-      def escape(string)
-        ::Rack::Utils.escape(string)
-      end
+        def escape(string)
+          ::Rack::Utils.escape(string)
+        end
 
-      def make_set_cookie_header(header)
-        header = @set_cookies.inject(header) { |m, (k, v)|
-          if write_cookie?(v)
-            ::Rack::Utils.add_cookie_to_header(m, k, v)
-          else
-            m
-          end
-        }
-        @delete_cookies.inject(header) { |m, (k, v)|
-          ::Rack::Utils.add_remove_cookie_to_header(m, k, v)
-        }
-      end
+        def make_set_cookie_header(header)
+          header = @set_cookies.inject(header) { |m, (k, v)|
+            if write_cookie?(v)
+              ::Rack::Utils.add_cookie_to_header(m, k, v)
+            else
+              m
+            end
+          }
+          @delete_cookies.inject(header) { |m, (k, v)|
+            ::Rack::Utils.add_remove_cookie_to_header(m, k, v)
+          }
+        end
 
-      def write_cookie?(cookie)
-        request.ssl? || !cookie[:secure] || always_write_cookie
-      end
+        def write_cookie?(cookie)
+          request.ssl? || !cookie[:secure] || always_write_cookie
+        end
     end
 
     class AbstractCookieJar # :nodoc:
diff --git a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
index 83c095b616..d585e7042e 100644
--- a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
@@ -69,129 +69,129 @@ module ActionDispatch
 
     private
 
-    def render_exception(request, exception)
-      backtrace_cleaner = request.get_header("action_dispatch.backtrace_cleaner")
-      wrapper = ExceptionWrapper.new(backtrace_cleaner, exception)
-      log_error(request, wrapper)
-
-      if request.get_header("action_dispatch.show_detailed_exceptions")
-        content_type = request.formats.first
-
-        if api_request?(content_type)
-          render_for_api_request(content_type, wrapper)
+      def render_exception(request, exception)
+        backtrace_cleaner = request.get_header("action_dispatch.backtrace_cleaner")
+        wrapper = ExceptionWrapper.new(backtrace_cleaner, exception)
+        log_error(request, wrapper)
+
+        if request.get_header("action_dispatch.show_detailed_exceptions")
+          content_type = request.formats.first
+
+          if api_request?(content_type)
+            render_for_api_request(content_type, wrapper)
+          else
+            render_for_browser_request(request, wrapper)
+          end
         else
-          render_for_browser_request(request, wrapper)
+          raise exception
         end
-      else
-        raise exception
       end
-    end
 
-    def render_for_browser_request(request, wrapper)
-      template = create_template(request, wrapper)
-      file = "rescues/#{wrapper.rescue_template}"
+      def render_for_browser_request(request, wrapper)
+        template = create_template(request, wrapper)
+        file = "rescues/#{wrapper.rescue_template}"
 
-      if request.xhr?
-        body = template.render(template: file, layout: false, formats: [:text])
-        format = "text/plain"
-      else
-        body = template.render(template: file, layout: "rescues/layout")
-        format = "text/html"
+        if request.xhr?
+          body = template.render(template: file, layout: false, formats: [:text])
+          format = "text/plain"
+        else
+          body = template.render(template: file, layout: "rescues/layout")
+          format = "text/html"
+        end
+        render(wrapper.status_code, body, format)
       end
-      render(wrapper.status_code, body, format)
-    end
 
-    def render_for_api_request(content_type, wrapper)
-      body = {
-        status: wrapper.status_code,
-        error:  Rack::Utils::HTTP_STATUS_CODES.fetch(
-          wrapper.status_code,
-          Rack::Utils::HTTP_STATUS_CODES[500]
-        ),
-        exception: wrapper.exception.inspect,
-        traces: wrapper.traces
-      }
-
-      to_format = "to_#{content_type.to_sym}"
+      def render_for_api_request(content_type, wrapper)
+        body = {
+          status: wrapper.status_code,
+          error:  Rack::Utils::HTTP_STATUS_CODES.fetch(
+            wrapper.status_code,
+            Rack::Utils::HTTP_STATUS_CODES[500]
+          ),
+          exception: wrapper.exception.inspect,
+          traces: wrapper.traces
+        }
+
+        to_format = "to_#{content_type.to_sym}"
+
+        if content_type && body.respond_to?(to_format)
+          formatted_body = body.public_send(to_format)
+          format = content_type
+        else
+          formatted_body = body.to_json
+          format = Mime[:json]
+        end
 
-      if content_type && body.respond_to?(to_format)
-        formatted_body = body.public_send(to_format)
-        format = content_type
-      else
-        formatted_body = body.to_json
-        format = Mime[:json]
+        render(wrapper.status_code, formatted_body, format)
       end
 
-      render(wrapper.status_code, formatted_body, format)
-    end
+      def create_template(request, wrapper)
+        traces = wrapper.traces
 
-    def create_template(request, wrapper)
-      traces = wrapper.traces
+        trace_to_show = "Application Trace"
+        if traces[trace_to_show].empty? && wrapper.rescue_template != "routing_error"
+          trace_to_show = "Full Trace"
+        end
 
-      trace_to_show = "Application Trace"
-      if traces[trace_to_show].empty? && wrapper.rescue_template != "routing_error"
-        trace_to_show = "Full Trace"
-      end
+        if source_to_show = traces[trace_to_show].first
+          source_to_show_id = source_to_show[:id]
+        end
 
-      if source_to_show = traces[trace_to_show].first
-        source_to_show_id = source_to_show[:id]
+        DebugView.new([RESCUES_TEMPLATE_PATH],
+          request: request,
+          exception: wrapper.exception,
+          traces: traces,
+          show_source_idx: source_to_show_id,
+          trace_to_show: trace_to_show,
+          routes_inspector: routes_inspector(wrapper.exception),
+          source_extracts: wrapper.source_extracts,
+          line_number: wrapper.line_number,
+          file: wrapper.file
+        )
       end
 
-      DebugView.new([RESCUES_TEMPLATE_PATH],
-        request: request,
-        exception: wrapper.exception,
-        traces: traces,
-        show_source_idx: source_to_show_id,
-        trace_to_show: trace_to_show,
-        routes_inspector: routes_inspector(wrapper.exception),
-        source_extracts: wrapper.source_extracts,
-        line_number: wrapper.line_number,
-        file: wrapper.file
-      )
-    end
-
-    def render(status, body, format)
-      [status, {"Content-Type" => "#{format}; charset=#{Response.default_charset}", "Content-Length" => body.bytesize.to_s}, [body]]
-    end
+      def render(status, body, format)
+        [status, {"Content-Type" => "#{format}; charset=#{Response.default_charset}", "Content-Length" => body.bytesize.to_s}, [body]]
+      end
 
-    def log_error(request, wrapper)
-      logger = logger(request)
-      return unless logger
+      def log_error(request, wrapper)
+        logger = logger(request)
+        return unless logger
 
-      exception = wrapper.exception
+        exception = wrapper.exception
 
-      trace = wrapper.application_trace
-      trace = wrapper.framework_trace if trace.empty?
+        trace = wrapper.application_trace
+        trace = wrapper.framework_trace if trace.empty?
 
-      ActiveSupport::Deprecation.silence do
-        logger.fatal "  "
-        logger.fatal "#{exception.class} (#{exception.message}):"
-        log_array logger, exception.annoted_source_code if exception.respond_to?(:annoted_source_code)
-        logger.fatal "  "
-        log_array logger, trace
+        ActiveSupport::Deprecation.silence do
+          logger.fatal "  "
+          logger.fatal "#{exception.class} (#{exception.message}):"
+          log_array logger, exception.annoted_source_code if exception.respond_to?(:annoted_source_code)
+          logger.fatal "  "
+          log_array logger, trace
+        end
       end
-    end
 
-    def log_array(logger, array)
-      array.map { |line| logger.fatal line }
-    end
+      def log_array(logger, array)
+        array.map { |line| logger.fatal line }
+      end
 
-    def logger(request)
-      request.logger || ActionView::Base.logger || stderr_logger
-    end
+      def logger(request)
+        request.logger || ActionView::Base.logger || stderr_logger
+      end
 
-    def stderr_logger
-      @stderr_logger ||= ActiveSupport::Logger.new($stderr)
-    end
+      def stderr_logger
+        @stderr_logger ||= ActiveSupport::Logger.new($stderr)
+      end
 
-    def routes_inspector(exception)
-      if @routes_app.respond_to?(:routes) && (exception.is_a?(ActionController::RoutingError) || exception.is_a?(ActionView::Template::Error))
-        ActionDispatch::Routing::RoutesInspector.new(@routes_app.routes.routes)
+      def routes_inspector(exception)
+        if @routes_app.respond_to?(:routes) && (exception.is_a?(ActionController::RoutingError) || exception.is_a?(ActionView::Template::Error))
+          ActionDispatch::Routing::RoutesInspector.new(@routes_app.routes.routes)
+        end
       end
-    end
 
-    def api_request?(content_type)
-      @response_format == :api && !content_type.html?
-    end
+      def api_request?(content_type)
+        @response_format == :api && !content_type.html?
+      end
   end
 end
diff --git a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
index 5570c229ef..9b44c4483e 100644
--- a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
+++ b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
@@ -100,49 +100,49 @@ module ActionDispatch
 
     private
 
-    def backtrace
-      Array(@exception.backtrace)
-    end
+      def backtrace
+        Array(@exception.backtrace)
+      end
 
-    def original_exception(exception)
-      if @@rescue_responses.has_key?(exception.cause.class.name)
-        exception.cause
-      else
-        exception
+      def original_exception(exception)
+        if @@rescue_responses.has_key?(exception.cause.class.name)
+          exception.cause
+        else
+          exception
+        end
       end
-    end
 
-    def clean_backtrace(*args)
-      if backtrace_cleaner
-        backtrace_cleaner.clean(backtrace, *args)
-      else
-        backtrace
+      def clean_backtrace(*args)
+        if backtrace_cleaner
+          backtrace_cleaner.clean(backtrace, *args)
+        else
+          backtrace
+        end
       end
-    end
 
-    def source_fragment(path, line)
-      return unless Rails.respond_to?(:root) && Rails.root
-      full_path = Rails.root.join(path)
-      if File.exist?(full_path)
-        File.open(full_path, "r") do |file|
-          start = [line - 3, 0].max
-          lines = file.each_line.drop(start).take(6)
-          Hash[*(start+1..(lines.count+start)).zip(lines).flatten]
+      def source_fragment(path, line)
+        return unless Rails.respond_to?(:root) && Rails.root
+        full_path = Rails.root.join(path)
+        if File.exist?(full_path)
+          File.open(full_path, "r") do |file|
+            start = [line - 3, 0].max
+            lines = file.each_line.drop(start).take(6)
+            Hash[*(start+1..(lines.count+start)).zip(lines).flatten]
+          end
         end
       end
-    end
 
-    def extract_file_and_line_number(trace)
-      # Split by the first colon followed by some digits, which works for both
-      # Windows and Unix path styles.
-      file, line = trace.match(/^(.+?):(\d+).*$/, &:captures) || trace
-      [file, line.to_i]
-    end
+      def extract_file_and_line_number(trace)
+        # Split by the first colon followed by some digits, which works for both
+        # Windows and Unix path styles.
+        file, line = trace.match(/^(.+?):(\d+).*$/, &:captures) || trace
+        [file, line.to_i]
+      end
 
-    def expand_backtrace
-      @exception.backtrace.unshift(
-        @exception.to_s.split("\n")
-      ).flatten!
-    end
+      def expand_backtrace
+        @exception.backtrace.unshift(
+          @exception.to_s.split("\n")
+        ).flatten!
+      end
   end
 end
diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index cee005ac10..6900934712 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -277,15 +277,15 @@ module ActionDispatch
       end
 
       protected
-      def now_is_loaded?
-        @now
-      end
+        def now_is_loaded?
+          @now
+        end
 
-      def stringify_array(array)
-        array.map do |item|
-          item.kind_of?(Symbol) ? item.to_s : item
+        def stringify_array(array)
+          array.map do |item|
+            item.kind_of?(Symbol) ? item.to_s : item
+          end
         end
-      end
     end
 
     def self.new(app) app; end
diff --git a/actionpack/lib/action_dispatch/middleware/public_exceptions.rb b/actionpack/lib/action_dispatch/middleware/public_exceptions.rb
index 5f356daba8..e3555ce638 100644
--- a/actionpack/lib/action_dispatch/middleware/public_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/public_exceptions.rb
@@ -27,29 +27,29 @@ module ActionDispatch
 
     private
 
-    def render(status, content_type, body)
-      format = "to_#{content_type.to_sym}" if content_type
-      if format && body.respond_to?(format)
-        render_format(status, content_type, body.public_send(format))
-      else
-        render_html(status)
+      def render(status, content_type, body)
+        format = "to_#{content_type.to_sym}" if content_type
+        if format && body.respond_to?(format)
+          render_format(status, content_type, body.public_send(format))
+        else
+          render_html(status)
+        end
       end
-    end
 
-    def render_format(status, content_type, body)
-      [status, {"Content-Type" => "#{content_type}; charset=#{ActionDispatch::Response.default_charset}",
-                "Content-Length" => body.bytesize.to_s}, [body]]
-    end
+      def render_format(status, content_type, body)
+        [status, {"Content-Type" => "#{content_type}; charset=#{ActionDispatch::Response.default_charset}",
+                  "Content-Length" => body.bytesize.to_s}, [body]]
+      end
 
-    def render_html(status)
-      path = "#{public_path}/#{status}.#{I18n.locale}.html"
-      path = "#{public_path}/#{status}.html" unless (found = File.exist?(path))
+      def render_html(status)
+        path = "#{public_path}/#{status}.#{I18n.locale}.html"
+        path = "#{public_path}/#{status}.html" unless (found = File.exist?(path))
 
-      if found || File.exist?(path)
-        render_format(status, "text/html", File.read(path))
-      else
-        [404, { "X-Cascade" => "pass" }, []]
+        if found || File.exist?(path)
+          render_format(status, "text/html", File.read(path))
+        else
+          [404, { "X-Cascade" => "pass" }, []]
+        end
       end
-    end
   end
 end
diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
index 430258e296..d903338a2b 100644
--- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
@@ -46,9 +46,9 @@ module ActionDispatch
       end
 
       private
-      def make_request(env)
-        ActionDispatch::Request.new env
-      end
+        def make_request(env)
+          ActionDispatch::Request.new env
+        end
     end
 
     module StaleSessionCheck
@@ -94,9 +94,9 @@ module ActionDispatch
 
       private
 
-      def set_cookie(request, session_id, cookie)
-        request.cookie_jar[key] = cookie
-      end
+        def set_cookie(request, session_id, cookie)
+          request.cookie_jar[key] = cookie
+        end
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
index 6148547cef..8409109ede 100644
--- a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
@@ -84,46 +84,46 @@ module ActionDispatch
 
       private
 
-      def extract_session_id(req)
-        stale_session_check! do
-          unpacked_cookie_data(req)["session_id"]
+        def extract_session_id(req)
+          stale_session_check! do
+            unpacked_cookie_data(req)["session_id"]
+          end
         end
-      end
 
-      def unpacked_cookie_data(req)
-        req.fetch_header("action_dispatch.request.unsigned_session_cookie") do |k|
-          v = stale_session_check! do
-            if data = get_cookie(req)
-              data.stringify_keys!
+        def unpacked_cookie_data(req)
+          req.fetch_header("action_dispatch.request.unsigned_session_cookie") do |k|
+            v = stale_session_check! do
+              if data = get_cookie(req)
+                data.stringify_keys!
+              end
+              data || {}
             end
-            data || {}
+            req.set_header k, v
           end
-          req.set_header k, v
         end
-      end
 
-      def persistent_session_id!(data, sid=nil)
-        data ||= {}
-        data["session_id"] ||= sid || generate_sid
-        data
-      end
+        def persistent_session_id!(data, sid=nil)
+          data ||= {}
+          data["session_id"] ||= sid || generate_sid
+          data
+        end
 
-      def write_session(req, sid, session_data, options)
-        session_data["session_id"] = sid
-        session_data
-      end
+        def write_session(req, sid, session_data, options)
+          session_data["session_id"] = sid
+          session_data
+        end
 
-      def set_cookie(request, session_id, cookie)
-        cookie_jar(request)[@key] = cookie
-      end
+        def set_cookie(request, session_id, cookie)
+          cookie_jar(request)[@key] = cookie
+        end
 
-      def get_cookie(req)
-        cookie_jar(req)[@key]
-      end
+        def get_cookie(req)
+          cookie_jar(req)[@key]
+        end
 
-      def cookie_jar(request)
-        request.cookie_jar.signed_or_encrypted
-      end
+        def cookie_jar(request)
+          request.cookie_jar.signed_or_encrypted
+        end
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index 126b627631..5aff130bc3 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -39,22 +39,22 @@ module ActionDispatch
 
     private
 
-    def render_exception(request, exception)
-      backtrace_cleaner = request.get_header "action_dispatch.backtrace_cleaner"
-      wrapper = ExceptionWrapper.new(backtrace_cleaner, exception)
-      status  = wrapper.status_code
-      request.set_header "action_dispatch.exception", wrapper.exception
-      request.set_header "action_dispatch.original_path", request.path_info
-      request.path_info = "/#{status}"
-      response = @exceptions_app.call(request.env)
-      response[1]["X-Cascade"] == "pass" ? pass_response(status) : response
-    rescue Exception => failsafe_error
-      $stderr.puts "Error during failsafe response: #{failsafe_error}\n  #{failsafe_error.backtrace * "\n  "}"
-      FAILSAFE_RESPONSE
-    end
+      def render_exception(request, exception)
+        backtrace_cleaner = request.get_header "action_dispatch.backtrace_cleaner"
+        wrapper = ExceptionWrapper.new(backtrace_cleaner, exception)
+        status  = wrapper.status_code
+        request.set_header "action_dispatch.exception", wrapper.exception
+        request.set_header "action_dispatch.original_path", request.path_info
+        request.path_info = "/#{status}"
+        response = @exceptions_app.call(request.env)
+        response[1]["X-Cascade"] == "pass" ? pass_response(status) : response
+      rescue Exception => failsafe_error
+        $stderr.puts "Error during failsafe response: #{failsafe_error}\n  #{failsafe_error.backtrace * "\n  "}"
+        FAILSAFE_RESPONSE
+      end
 
-    def pass_response(status)
-      [status, {"Content-Type" => "text/html; charset=#{Response.default_charset}", "Content-Length" => "0"}, []]
-    end
+      def pass_response(status)
+        [status, {"Content-Type" => "text/html; charset=#{Response.default_charset}", "Content-Length" => "0"}, []]
+      end
   end
 end
diff --git a/actionpack/lib/action_dispatch/middleware/stack.rb b/actionpack/lib/action_dispatch/middleware/stack.rb
index 0b4bee5462..e49bf54115 100644
--- a/actionpack/lib/action_dispatch/middleware/stack.rb
+++ b/actionpack/lib/action_dispatch/middleware/stack.rb
@@ -102,32 +102,32 @@ module ActionDispatch
 
     private
 
-    def assert_index(index, where)
-      index = get_class index
-      i = index.is_a?(Integer) ? index : middlewares.index { |m| m.klass == index }
-      raise "No such middleware to insert #{where}: #{index.inspect}" unless i
-      i
-    end
+      def assert_index(index, where)
+        index = get_class index
+        i = index.is_a?(Integer) ? index : middlewares.index { |m| m.klass == index }
+        raise "No such middleware to insert #{where}: #{index.inspect}" unless i
+        i
+      end
 
-    def get_class(klass)
-      if klass.is_a?(String) || klass.is_a?(Symbol)
-        classcache = ActiveSupport::Dependencies::Reference
-        converted_klass = classcache[klass.to_s]
-        ActiveSupport::Deprecation.warn <<-eowarn
+      def get_class(klass)
+        if klass.is_a?(String) || klass.is_a?(Symbol)
+          classcache = ActiveSupport::Dependencies::Reference
+          converted_klass = classcache[klass.to_s]
+          ActiveSupport::Deprecation.warn <<-eowarn
 Passing strings or symbols to the middleware builder is deprecated, please change
 them to actual class references.  For example:
 
   "#{klass}" => #{converted_klass}
 
         eowarn
-        converted_klass
-      else
-        klass
+          converted_klass
+        else
+          klass
+        end
       end
-    end
 
-    def build_middleware(klass, args, block)
-      Middleware.new(get_class(klass), args, block)
-    end
+      def build_middleware(klass, args, block)
+        Middleware.new(get_class(klass), args, block)
+      end
   end
 end
diff --git a/actionpack/lib/action_dispatch/request/session.rb b/actionpack/lib/action_dispatch/request/session.rb
index f9d6e94504..b883ca0f61 100644
--- a/actionpack/lib/action_dispatch/request/session.rb
+++ b/actionpack/lib/action_dispatch/request/session.rb
@@ -204,26 +204,26 @@ module ActionDispatch
 
       private
 
-      def load_for_read!
-        load! if !loaded? && exists?
-      end
+        def load_for_read!
+          load! if !loaded? && exists?
+        end
 
-      def load_for_write!
-        load! unless loaded?
-      end
+        def load_for_write!
+          load! unless loaded?
+        end
 
-      def load!
-        id, session = @by.load_session @req
-        options[:id] = id
-        @delegate.replace(stringify_keys(session))
-        @loaded = true
-      end
+        def load!
+          id, session = @by.load_session @req
+          options[:id] = id
+          @delegate.replace(stringify_keys(session))
+          @loaded = true
+        end
 
-      def stringify_keys(other)
-        other.each_with_object({}) { |(key, value), hash|
-          hash[key.to_s] = value
-        }
-      end
+        def stringify_keys(other)
+          other.each_with_object({}) { |(key, value), hash|
+            hash[key.to_s] = value
+          }
+        end
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/request/utils.rb b/actionpack/lib/action_dispatch/request/utils.rb
index bb3df3c311..ba622131e7 100644
--- a/actionpack/lib/action_dispatch/request/utils.rb
+++ b/actionpack/lib/action_dispatch/request/utils.rb
@@ -64,4 +64,3 @@ module ActionDispatch
     end
   end
 end
-
diff --git a/actionpack/lib/action_dispatch/routing/inspector.rb b/actionpack/lib/action_dispatch/routing/inspector.rb
index a66a1d4ca4..b91ffb8419 100644
--- a/actionpack/lib/action_dispatch/routing/inspector.rb
+++ b/actionpack/lib/action_dispatch/routing/inspector.rb
@@ -80,48 +80,48 @@ module ActionDispatch
 
       private
 
-      def normalize_filter(filter)
-        if filter.is_a?(Hash) && filter[:controller]
-          { controller: /#{filter[:controller].downcase.sub(/_?controller\z/, '').sub('::', '/')}/ }
-        elsif filter
-          { controller: /#{filter}/, action: /#{filter}/, verb: /#{filter}/, name: /#{filter}/, path: /#{filter}/ }
+        def normalize_filter(filter)
+          if filter.is_a?(Hash) && filter[:controller]
+            { controller: /#{filter[:controller].downcase.sub(/_?controller\z/, '').sub('::', '/')}/ }
+          elsif filter
+            { controller: /#{filter}/, action: /#{filter}/, verb: /#{filter}/, name: /#{filter}/, path: /#{filter}/ }
+          end
         end
-      end
 
-      def filter_routes(filter)
-        if filter
-          @routes.select do |route|
-            route_wrapper = RouteWrapper.new(route)
-            filter.any? { |default, value| route_wrapper.send(default) =~ value }
+        def filter_routes(filter)
+          if filter
+            @routes.select do |route|
+              route_wrapper = RouteWrapper.new(route)
+              filter.any? { |default, value| route_wrapper.send(default) =~ value }
+            end
+          else
+            @routes
           end
-        else
-          @routes
         end
-      end
 
-      def collect_routes(routes)
-        routes.collect do |route|
-          RouteWrapper.new(route)
-        end.reject(&:internal?).collect do |route|
-          collect_engine_routes(route)
+        def collect_routes(routes)
+          routes.collect do |route|
+            RouteWrapper.new(route)
+          end.reject(&:internal?).collect do |route|
+            collect_engine_routes(route)
 
-          { name: route.name,
-            verb: route.verb,
-            path: route.path,
-            reqs: route.reqs }
+            { name: route.name,
+              verb: route.verb,
+              path: route.path,
+              reqs: route.reqs }
+          end
         end
-      end
 
-      def collect_engine_routes(route)
-        name = route.endpoint
-        return unless route.engine?
-        return if @engines[name]
+        def collect_engine_routes(route)
+          name = route.endpoint
+          return unless route.engine?
+          return if @engines[name]
 
-        routes = route.rack_app.routes
-        if routes.is_a?(ActionDispatch::Routing::RouteSet)
-          @engines[name] = collect_routes(routes.routes)
+          routes = route.rack_app.routes
+          if routes.is_a?(ActionDispatch::Routing::RouteSet)
+            @engines[name] = collect_routes(routes.routes)
+          end
         end
-      end
     end
 
     class ConsoleFormatter
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 7034f25b09..a6b177480d 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1684,7 +1684,7 @@ to this:
           end
 
           as = if !options.fetch(:as, true) # if it's set to nil or false
-                 options.delete(:as)
+            options.delete(:as)
                else
                  name_for_action(options.delete(:as), action)
                end
@@ -1914,24 +1914,24 @@ to this:
           end
         private
 
-        def path_scope(path)
-          @scope = @scope.new(path: merge_path_scope(@scope[:path], path))
-          yield
-        ensure
-          @scope = @scope.parent
-        end
+          def path_scope(path)
+            @scope = @scope.new(path: merge_path_scope(@scope[:path], path))
+            yield
+          ensure
+            @scope = @scope.parent
+          end
 
-        def match_root_route(options)
-          name = has_named_route?(:root) ? nil : :root
-          defaults_option = options.delete(:defaults)
-          args = ["/", { as: name, via: :get }.merge!(options)]
+          def match_root_route(options)
+            name = has_named_route?(:root) ? nil : :root
+            defaults_option = options.delete(:defaults)
+            args = ["/", { as: name, via: :get }.merge!(options)]
 
-          if defaults_option
-            defaults(defaults_option) { match(*args) }
-          else
-            match(*args)
+            if defaults_option
+              defaults(defaults_option) { match(*args) }
+            else
+              match(*args)
+            end
           end
-        end
       end
 
       # Routing Concerns allow you to declare common routes that can be reused
diff --git a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
index a0874d6be3..3e2b21ac72 100644
--- a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
+++ b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
@@ -149,176 +149,176 @@ module ActionDispatch
 
       private
 
-      def polymorphic_url_for_action(action, record_or_hash, options)
-        polymorphic_url(record_or_hash, options.merge(action: action))
-      end
+        def polymorphic_url_for_action(action, record_or_hash, options)
+          polymorphic_url(record_or_hash, options.merge(action: action))
+        end
 
-      def polymorphic_path_for_action(action, record_or_hash, options)
-        polymorphic_path(record_or_hash, options.merge(action: action))
-      end
+        def polymorphic_path_for_action(action, record_or_hash, options)
+          polymorphic_path(record_or_hash, options.merge(action: action))
+        end
 
-      class HelperMethodBuilder # :nodoc:
-        CACHE = { "path" => {}, "url" => {} }
+        class HelperMethodBuilder # :nodoc:
+          CACHE = { "path" => {}, "url" => {} }
 
-        def self.get(action, type)
-          type   = type.to_s
-          CACHE[type].fetch(action) { build action, type }
-        end
+          def self.get(action, type)
+            type   = type.to_s
+            CACHE[type].fetch(action) { build action, type }
+          end
 
-        def self.url;  CACHE["url".freeze][nil]; end
-        def self.path; CACHE["path".freeze][nil]; end
+          def self.url;  CACHE["url".freeze][nil]; end
+          def self.path; CACHE["path".freeze][nil]; end
 
-        def self.build(action, type)
-          prefix = action ? "#{action}_" : ""
-          suffix = type
-          if action.to_s == "new"
-            HelperMethodBuilder.singular prefix, suffix
-          else
-            HelperMethodBuilder.plural prefix, suffix
+          def self.build(action, type)
+            prefix = action ? "#{action}_" : ""
+            suffix = type
+            if action.to_s == "new"
+              HelperMethodBuilder.singular prefix, suffix
+            else
+              HelperMethodBuilder.plural prefix, suffix
+            end
           end
-        end
 
-        def self.singular(prefix, suffix)
-          new(->(name) { name.singular_route_key }, prefix, suffix)
-        end
+          def self.singular(prefix, suffix)
+            new(->(name) { name.singular_route_key }, prefix, suffix)
+          end
 
-        def self.plural(prefix, suffix)
-          new(->(name) { name.route_key }, prefix, suffix)
-        end
+          def self.plural(prefix, suffix)
+            new(->(name) { name.route_key }, prefix, suffix)
+          end
 
-        def self.polymorphic_method(recipient, record_or_hash_or_array, action, type, options)
-          builder = get action, type
+          def self.polymorphic_method(recipient, record_or_hash_or_array, action, type, options)
+            builder = get action, type
+
+            case record_or_hash_or_array
+            when Array
+              record_or_hash_or_array = record_or_hash_or_array.compact
+              if record_or_hash_or_array.empty?
+                raise ArgumentError, "Nil location provided. Can't build URI."
+              end
+              if record_or_hash_or_array.first.is_a?(ActionDispatch::Routing::RoutesProxy)
+                recipient = record_or_hash_or_array.shift
+              end
+
+              method, args = builder.handle_list record_or_hash_or_array
+            when String, Symbol
+              method, args = builder.handle_string record_or_hash_or_array
+            when Class
+              method, args = builder.handle_class record_or_hash_or_array
 
-          case record_or_hash_or_array
-          when Array
-            record_or_hash_or_array = record_or_hash_or_array.compact
-            if record_or_hash_or_array.empty?
+            when nil
               raise ArgumentError, "Nil location provided. Can't build URI."
-            end
-            if record_or_hash_or_array.first.is_a?(ActionDispatch::Routing::RoutesProxy)
-              recipient = record_or_hash_or_array.shift
+            else
+              method, args = builder.handle_model record_or_hash_or_array
             end
 
-            method, args = builder.handle_list record_or_hash_or_array
-          when String, Symbol
-            method, args = builder.handle_string record_or_hash_or_array
-          when Class
-            method, args = builder.handle_class record_or_hash_or_array
 
-          when nil
-            raise ArgumentError, "Nil location provided. Can't build URI."
-          else
-            method, args = builder.handle_model record_or_hash_or_array
+            if options.empty?
+              recipient.send(method, *args)
+            else
+              recipient.send(method, *args, options)
+            end
           end
 
+          attr_reader :suffix, :prefix
 
-          if options.empty?
-            recipient.send(method, *args)
-          else
-            recipient.send(method, *args, options)
+          def initialize(key_strategy, prefix, suffix)
+            @key_strategy = key_strategy
+            @prefix       = prefix
+            @suffix       = suffix
           end
-        end
-
-        attr_reader :suffix, :prefix
-
-        def initialize(key_strategy, prefix, suffix)
-          @key_strategy = key_strategy
-          @prefix       = prefix
-          @suffix       = suffix
-        end
-
-        def handle_string(record)
-          [get_method_for_string(record), []]
-        end
-
-        def handle_string_call(target, str)
-          target.send get_method_for_string str
-        end
 
-        def handle_class(klass)
-          [get_method_for_class(klass), []]
-        end
+          def handle_string(record)
+            [get_method_for_string(record), []]
+          end
 
-        def handle_class_call(target, klass)
-          target.send get_method_for_class klass
-        end
+          def handle_string_call(target, str)
+            target.send get_method_for_string str
+          end
 
-        def handle_model(record)
-          args  = []
+          def handle_class(klass)
+            [get_method_for_class(klass), []]
+          end
 
-          model = record.to_model
-          named_route = if model.persisted?
-                          args << model
-                          get_method_for_string model.model_name.singular_route_key
-                        else
-                          get_method_for_class model
-                        end
+          def handle_class_call(target, klass)
+            target.send get_method_for_class klass
+          end
 
-          [named_route, args]
-        end
+          def handle_model(record)
+            args  = []
 
-        def handle_model_call(target, model)
-          method, args = handle_model model
-          target.send(method, *args)
-        end
+            model = record.to_model
+            named_route = if model.persisted?
+              args << model
+              get_method_for_string model.model_name.singular_route_key
+                          else
+                            get_method_for_class model
+                          end
 
-        def handle_list(list)
-          record_list = list.dup
-          record      = record_list.pop
+            [named_route, args]
+          end
 
-          args = []
+          def handle_model_call(target, model)
+            method, args = handle_model model
+            target.send(method, *args)
+          end
 
-          route  = record_list.map { |parent|
-            case parent
+          def handle_list(list)
+            record_list = list.dup
+            record      = record_list.pop
+
+            args = []
+
+            route  = record_list.map { |parent|
+              case parent
+              when Symbol, String
+                parent.to_s
+              when Class
+                args << parent
+                parent.model_name.singular_route_key
+              else
+                args << parent.to_model
+                parent.to_model.model_name.singular_route_key
+              end
+            }
+
+            route <<
+            case record
             when Symbol, String
-              parent.to_s
+              record.to_s
             when Class
-              args << parent
-              parent.model_name.singular_route_key
+              @key_strategy.call record.model_name
             else
-              args << parent.to_model
-              parent.to_model.model_name.singular_route_key
+              model = record.to_model
+              if model.persisted?
+                args << model
+                model.model_name.singular_route_key
+              else
+                @key_strategy.call model.model_name
+              end
             end
-          }
-
-          route <<
-          case record
-          when Symbol, String
-            record.to_s
-          when Class
-            @key_strategy.call record.model_name
-          else
-            model = record.to_model
-            if model.persisted?
-              args << model
-              model.model_name.singular_route_key
-            else
-              @key_strategy.call model.model_name
-            end
-          end
 
-          route << suffix
+            route << suffix
 
-          named_route = prefix + route.join("_")
-          [named_route, args]
-        end
+            named_route = prefix + route.join("_")
+            [named_route, args]
+          end
 
-        private
+          private
 
-        def get_method_for_class(klass)
-          name   = @key_strategy.call klass.model_name
-          get_method_for_string name
-        end
+            def get_method_for_class(klass)
+              name   = @key_strategy.call klass.model_name
+              get_method_for_string name
+            end
 
-        def get_method_for_string(str)
-          "#{prefix}#{str}_#{suffix}"
-        end
+            def get_method_for_string(str)
+              "#{prefix}#{str}_#{suffix}"
+            end
 
-        [nil, "new", "edit"].each do |action|
-          CACHE["url"][action]  = build action, "url"
-          CACHE["path"][action] = build action, "path"
+            [nil, "new", "edit"].each do |action|
+              CACHE["url"][action]  = build action, "url"
+              CACHE["path"][action] = build action, "path"
+            end
         end
-      end
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index c1ea23e36d..b9eda039a1 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -59,7 +59,7 @@ module ActionDispatch
 
         private
 
-        def controller(_); @controller_class; end
+          def controller(_); @controller_class; end
       end
 
       # A NamedRouteCollection instance is a collection of named routes, and also
@@ -180,40 +180,40 @@ module ActionDispatch
 
             private
 
-            def optimized_helper(args)
-              params = parameterize_args(args) do
-                raise_generation_error(args)
-              end
+              def optimized_helper(args)
+                params = parameterize_args(args) do
+                  raise_generation_error(args)
+                end
 
-              @route.format params
-            end
+                @route.format params
+              end
 
-            def optimize_routes_generation?(t)
-              t.send(:optimize_routes_generation?)
-            end
+              def optimize_routes_generation?(t)
+                t.send(:optimize_routes_generation?)
+              end
 
-            def parameterize_args(args)
-              params = {}
-              @arg_size.times { |i|
-                key = @required_parts[i]
-                value = args[i].to_param
-                yield key if value.nil? || value.empty?
-                params[key] = value
-              }
-              params
-            end
+              def parameterize_args(args)
+                params = {}
+                @arg_size.times { |i|
+                  key = @required_parts[i]
+                  value = args[i].to_param
+                  yield key if value.nil? || value.empty?
+                  params[key] = value
+                }
+                params
+              end
 
-            def raise_generation_error(args)
-              missing_keys = []
-              params = parameterize_args(args) { |missing_key|
-                missing_keys << missing_key
-              }
-              constraints = Hash[@route.requirements.merge(params).sort_by{|k,v| k.to_s}]
-              message = "No route matches #{constraints.inspect}"
-              message << " missing required keys: #{missing_keys.sort.inspect}"
+              def raise_generation_error(args)
+                missing_keys = []
+                params = parameterize_args(args) { |missing_key|
+                  missing_keys << missing_key
+                }
+                constraints = Hash[@route.requirements.merge(params).sort_by{|k,v| k.to_s}]
+                message = "No route matches #{constraints.inspect}"
+                message << " missing required keys: #{missing_keys.sort.inspect}"
 
-              raise ActionController::UrlGenerationError, message
-            end
+                raise ActionController::UrlGenerationError, message
+              end
           end
 
           def initialize(route, options, route_name, url_strategy)
@@ -277,25 +277,25 @@ module ActionDispatch
         #
         #   foo_url(bar, baz, bang, sort_by: 'baz')
         #
-        def define_url_helper(mod, route, name, opts, route_key, url_strategy)
-          helper = UrlHelper.create(route, opts, route_key, url_strategy)
-          mod.module_eval do
-            define_method(name) do |*args|
-              last = args.last
-              options = case last
-                        when Hash
-                          args.pop
-                        when ActionController::Parameters
-                          if last.permitted?
-                            args.pop.to_h
-                          else
-                            raise ArgumentError, ActionDispatch::Routing::INSECURE_URL_PARAMETERS_MESSAGE
+          def define_url_helper(mod, route, name, opts, route_key, url_strategy)
+            helper = UrlHelper.create(route, opts, route_key, url_strategy)
+            mod.module_eval do
+              define_method(name) do |*args|
+                last = args.last
+                options = case last
+                          when Hash
+                            args.pop
+                          when ActionController::Parameters
+                            if last.permitted?
+                              args.pop.to_h
+                            else
+                              raise ArgumentError, ActionDispatch::Routing::INSECURE_URL_PARAMETERS_MESSAGE
+                            end
                           end
-                        end
-              helper.call self, args, options
+                helper.call self, args, options
+              end
             end
           end
-        end
       end
 
       # strategy for building urls to send to the client
diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb
index 5ee138e6c6..a1ac5a2b6c 100644
--- a/actionpack/lib/action_dispatch/routing/url_for.rb
+++ b/actionpack/lib/action_dispatch/routing/url_for.rb
@@ -194,20 +194,20 @@ module ActionDispatch
 
       protected
 
-      def optimize_routes_generation?
-        _routes.optimize_routes_generation? && default_url_options.empty?
-      end
+        def optimize_routes_generation?
+          _routes.optimize_routes_generation? && default_url_options.empty?
+        end
 
-      def _with_routes(routes)
-        old_routes, @_routes = @_routes, routes
-        yield
-      ensure
-        @_routes = old_routes
-      end
+        def _with_routes(routes)
+          old_routes, @_routes = @_routes, routes
+          yield
+        ensure
+          @_routes = old_routes
+        end
 
-      def _routes_context
-        self
-      end
+        def _routes_context
+          self
+        end
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/testing/assertion_response.rb b/actionpack/lib/action_dispatch/testing/assertion_response.rb
index 404b96bbcd..c37726957e 100644
--- a/actionpack/lib/action_dispatch/testing/assertion_response.rb
+++ b/actionpack/lib/action_dispatch/testing/assertion_response.rb
@@ -34,12 +34,12 @@ module ActionDispatch
 
     private
 
-    def code_from_name(name)
-      GENERIC_RESPONSE_CODES[name] || Rack::Utils::SYMBOL_TO_STATUS_CODE[name]
-    end
+      def code_from_name(name)
+        GENERIC_RESPONSE_CODES[name] || Rack::Utils::SYMBOL_TO_STATUS_CODE[name]
+      end
 
-    def name_from_code(code)
-      GENERIC_RESPONSE_CODES.invert[code] || Rack::Utils::HTTP_STATUS_CODES[code]
-    end
+      def name_from_code(code)
+        GENERIC_RESPONSE_CODES.invert[code] || Rack::Utils::HTTP_STATUS_CODES[code]
+      end
   end
 end
diff --git a/actionpack/test/abstract/callbacks_test.rb b/actionpack/test/abstract/callbacks_test.rb
index 14d73e8372..be68dc49bd 100644
--- a/actionpack/test/abstract/callbacks_test.rb
+++ b/actionpack/test/abstract/callbacks_test.rb
@@ -126,14 +126,14 @@ module AbstractController
       end
 
       private
-      def list
-        @list = ["Hello", "World"]
-      end
-
-      def authenticate
-        @list ||= []
-        @authenticated = "true"
-      end
+        def list
+          @list = ["Hello", "World"]
+        end
+
+        def authenticate
+          @list ||= []
+          @authenticated = "true"
+        end
     end
 
     class TestCallbacksWithConditions < ActiveSupport::TestCase
@@ -170,14 +170,14 @@ module AbstractController
       end
 
       private
-      def list
-        @list = ["Hello", "World"]
-      end
-
-      def authenticate
-        @list = []
-        @authenticated = "true"
-      end
+        def list
+          @list = ["Hello", "World"]
+        end
+
+        def authenticate
+          @list = []
+          @authenticated = "true"
+        end
     end
 
     class TestCallbacksWithArrayConditions < ActiveSupport::TestCase
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 075ebd3974..c887b868d2 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -254,11 +254,11 @@ end
 module ActionDispatch
   class DebugExceptions
     private
-    remove_method :stderr_logger
+      remove_method :stderr_logger
     # Silence logger
-    def stderr_logger
-      nil
-    end
+      def stderr_logger
+        nil
+      end
   end
 end
 
@@ -348,9 +348,9 @@ module RoutingTestHelpers
 
     private
 
-    def make_request(env)
-      Request.new super, url_helpers, @block, strict
-    end
+      def make_request(env)
+        Request.new super, url_helpers, @block, strict
+      end
   end
 end
 
@@ -426,18 +426,18 @@ class ForkingExecutor
   end
 
   private
-  def translate_exceptions(result)
-    result.failures.map! { |e|
-      begin
-        Marshal.dump e
-        e
-      rescue TypeError
-        ex = Exception.new e.message
-        ex.set_backtrace e.backtrace
-        Minitest::UnexpectedError.new ex
-      end
-    }
-  end
+    def translate_exceptions(result)
+      result.failures.map! { |e|
+        begin
+          Marshal.dump e
+          e
+        rescue TypeError
+          ex = Exception.new e.message
+          ex.set_backtrace e.backtrace
+          Minitest::UnexpectedError.new ex
+        end
+      }
+    end
 end
 
 if RUBY_ENGINE == "ruby" && PROCESS_COUNT > 0
diff --git a/actionpack/test/controller/api/conditional_get_test.rb b/actionpack/test/controller/api/conditional_get_test.rb
index 330bfac1c9..7b70829101 100644
--- a/actionpack/test/controller/api/conditional_get_test.rb
+++ b/actionpack/test/controller/api/conditional_get_test.rb
@@ -17,9 +17,9 @@ class ConditionalGetApiController < ActionController::API
 
   private
 
-  def handle_last_modified_and_etags
-    fresh_when(last_modified: Time.now.utc.beginning_of_day, etag: [ :foo, 123 ])
-  end
+    def handle_last_modified_and_etags
+      fresh_when(last_modified: Time.now.utc.beginning_of_day, etag: [ :foo, 123 ])
+    end
 end
 
 class ConditionalGetApiTest < ActionController::TestCase
diff --git a/actionpack/test/controller/content_type_test.rb b/actionpack/test/controller/content_type_test.rb
index 47bc8c4983..fcb2632b80 100644
--- a/actionpack/test/controller/content_type_test.rb
+++ b/actionpack/test/controller/content_type_test.rb
@@ -131,13 +131,13 @@ class ContentTypeTest < ActionController::TestCase
 
   private
 
-  def with_default_charset(charset)
-    old_default_charset = ActionDispatch::Response.default_charset
-    ActionDispatch::Response.default_charset = charset
-    yield
-  ensure
-    ActionDispatch::Response.default_charset = old_default_charset
-  end
+    def with_default_charset(charset)
+      old_default_charset = ActionDispatch::Response.default_charset
+      ActionDispatch::Response.default_charset = charset
+      yield
+    ensure
+      ActionDispatch::Response.default_charset = old_default_charset
+    end
 end
 
 class AcceptBasedContentTypeTest < ActionController::TestCase
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb
index 0ddf825864..fc4083d611 100644
--- a/actionpack/test/controller/filters_test.rb
+++ b/actionpack/test/controller/filters_test.rb
@@ -56,14 +56,14 @@ class FilterTest < ActionController::TestCase
     end
 
     protected
-    (1..3).each do |i|
-      define_method "try_#{i}" do
-        instance_variable_set :@try, i
-        if action_name == "fail_#{i}"
-          head(404)
+      (1..3).each do |i|
+        define_method "try_#{i}" do
+          instance_variable_set :@try, i
+          if action_name == "fail_#{i}"
+            head(404)
+          end
         end
       end
-    end
   end
 
   class RenderingController < ActionController::Base
@@ -531,13 +531,13 @@ class FilterTest < ActionController::TestCase
 
     private
 
-    def find_only
-      @only = "Only"
-    end
+      def find_only
+        @only = "Only"
+      end
 
-    def find_except
-      @except = "Except"
-    end
+      def find_except
+        @except = "Except"
+      end
   end
 
   def test_non_yielding_around_actions_do_not_raise
@@ -931,26 +931,26 @@ class ControllerWithAllTypesOfFilters < PostsController
   around_action :around_again
 
   private
-  def before
-    @ran_filter ||= []
-    @ran_filter << "before"
-  end
+    def before
+      @ran_filter ||= []
+      @ran_filter << "before"
+    end
 
-  def around
-    @ran_filter << "around (before yield)"
-    yield
-    @ran_filter << "around (after yield)"
-  end
+    def around
+      @ran_filter << "around (before yield)"
+      yield
+      @ran_filter << "around (after yield)"
+    end
 
-  def after
-    @ran_filter << "after"
-  end
+    def after
+      @ran_filter << "after"
+    end
 
-  def around_again
-    @ran_filter << "around_again (before yield)"
-    yield
-    @ran_filter << "around_again (after yield)"
-  end
+    def around_again
+      @ran_filter << "around_again (before yield)"
+      yield
+      @ran_filter << "around_again (after yield)"
+    end
 end
 
 class ControllerWithTwoLessFilters < ControllerWithAllTypesOfFilters
diff --git a/actionpack/test/controller/http_basic_authentication_test.rb b/actionpack/test/controller/http_basic_authentication_test.rb
index c980d0ed35..d9ae787689 100644
--- a/actionpack/test/controller/http_basic_authentication_test.rb
+++ b/actionpack/test/controller/http_basic_authentication_test.rb
@@ -31,31 +31,31 @@ class HttpBasicAuthenticationTest < ActionController::TestCase
 
     private
 
-    def authenticate
-      authenticate_or_request_with_http_basic do |username, password|
-        username == "lifo" && password == "world"
+      def authenticate
+        authenticate_or_request_with_http_basic do |username, password|
+          username == "lifo" && password == "world"
+        end
       end
-    end
 
-    def authenticate_with_request
-      if authenticate_with_http_basic { |username, password| username == "pretty" && password == "please" }
-        @logged_in = true
-      else
-        request_http_basic_authentication("SuperSecret", "Authentication Failed\n")
+      def authenticate_with_request
+        if authenticate_with_http_basic { |username, password| username == "pretty" && password == "please" }
+          @logged_in = true
+        else
+          request_http_basic_authentication("SuperSecret", "Authentication Failed\n")
+        end
       end
-    end
 
-    def auth_with_special_chars
-      authenticate_or_request_with_http_basic do |username, password|
-        username == 'login!@#$%^&*()_+{}[];"\',./<>?`~ \n\r\t' && password == 'pwd:!@#$%^&*()_+{}[];"\',./<>?`~ \n\r\t'
+      def auth_with_special_chars
+        authenticate_or_request_with_http_basic do |username, password|
+          username == 'login!@#$%^&*()_+{}[];"\',./<>?`~ \n\r\t' && password == 'pwd:!@#$%^&*()_+{}[];"\',./<>?`~ \n\r\t'
+        end
       end
-    end
 
-    def authenticate_long_credentials
-      authenticate_or_request_with_http_basic do |username, password|
-        username == "1234567890123456789012345678901234567890" && password == "1234567890123456789012345678901234567890"
+      def authenticate_long_credentials
+        authenticate_or_request_with_http_basic do |username, password|
+          username == "1234567890123456789012345678901234567890" && password == "1234567890123456789012345678901234567890"
+        end
       end
-    end
   end
 
   AUTH_HEADERS = ["HTTP_AUTHORIZATION", "X-HTTP_AUTHORIZATION", "X_HTTP_AUTHORIZATION", "REDIRECT_X_HTTP_AUTHORIZATION"]
@@ -171,7 +171,7 @@ class HttpBasicAuthenticationTest < ActionController::TestCase
 
   private
 
-  def encode_credentials(username, password)
-    "Basic #{::Base64.encode64("#{username}:#{password}")}"
-  end
+    def encode_credentials(username, password)
+      "Basic #{::Base64.encode64("#{username}:#{password}")}"
+    end
 end
diff --git a/actionpack/test/controller/http_digest_authentication_test.rb b/actionpack/test/controller/http_digest_authentication_test.rb
index 854ec62774..5e9b801f8b 100644
--- a/actionpack/test/controller/http_digest_authentication_test.rb
+++ b/actionpack/test/controller/http_digest_authentication_test.rb
@@ -19,20 +19,20 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
 
     private
 
-    def authenticate
-      authenticate_or_request_with_http_digest("SuperSecret") do |username|
-        # Returns the password
-        USERS[username]
+      def authenticate
+        authenticate_or_request_with_http_digest("SuperSecret") do |username|
+          # Returns the password
+          USERS[username]
+        end
       end
-    end
 
-    def authenticate_with_request
-      if authenticate_with_http_digest("SuperSecret")  { |username| USERS[username] }
-        @logged_in = true
-      else
-        request_http_digest_authentication("SuperSecret", "Authentication Failed")
+      def authenticate_with_request
+        if authenticate_with_http_digest("SuperSecret")  { |username| USERS[username] }
+          @logged_in = true
+        else
+          request_http_digest_authentication("SuperSecret", "Authentication Failed")
+        end
       end
-    end
   end
 
   AUTH_HEADERS = ["HTTP_AUTHORIZATION", "X-HTTP_AUTHORIZATION", "X_HTTP_AUTHORIZATION", "REDIRECT_X_HTTP_AUTHORIZATION"]
@@ -249,32 +249,32 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
 
   private
 
-  def encode_credentials(options)
-    options.reverse_merge!(nc: "00000001", cnonce: "0a4f113b", password_is_ha1: false)
-    password = options.delete(:password)
+    def encode_credentials(options)
+      options.reverse_merge!(nc: "00000001", cnonce: "0a4f113b", password_is_ha1: false)
+      password = options.delete(:password)
 
-    # Perform unauthenticated request to retrieve digest parameters to use on subsequent request
-    method = options.delete(:method) || "GET"
+      # Perform unauthenticated request to retrieve digest parameters to use on subsequent request
+      method = options.delete(:method) || "GET"
 
-    case method.to_s.upcase
-    when "GET"
-      get :index
-    when "POST"
-      post :index
-    end
+      case method.to_s.upcase
+      when "GET"
+        get :index
+      when "POST"
+        post :index
+      end
 
-    assert_response :unauthorized
+      assert_response :unauthorized
 
-    credentials = decode_credentials(@response.headers["WWW-Authenticate"])
-    credentials.merge!(options)
-    path_info = @request.env["PATH_INFO"].to_s
-    uri = options[:uri] || path_info
-    credentials.merge!(uri: uri)
-    @request.env["ORIGINAL_FULLPATH"] = path_info
-    ActionController::HttpAuthentication::Digest.encode_credentials(method, credentials, password, options[:password_is_ha1])
-  end
+      credentials = decode_credentials(@response.headers["WWW-Authenticate"])
+      credentials.merge!(options)
+      path_info = @request.env["PATH_INFO"].to_s
+      uri = options[:uri] || path_info
+      credentials.merge!(uri: uri)
+      @request.env["ORIGINAL_FULLPATH"] = path_info
+      ActionController::HttpAuthentication::Digest.encode_credentials(method, credentials, password, options[:password_is_ha1])
+    end
 
-  def decode_credentials(header)
-    ActionController::HttpAuthentication::Digest.decode_credentials(header)
-  end
+    def decode_credentials(header)
+      ActionController::HttpAuthentication::Digest.decode_credentials(header)
+    end
 end
diff --git a/actionpack/test/controller/http_token_authentication_test.rb b/actionpack/test/controller/http_token_authentication_test.rb
index 206fe18eda..b7a4c550d7 100644
--- a/actionpack/test/controller/http_token_authentication_test.rb
+++ b/actionpack/test/controller/http_token_authentication_test.rb
@@ -20,25 +20,25 @@ class HttpTokenAuthenticationTest < ActionController::TestCase
 
     private
 
-    def authenticate
-      authenticate_or_request_with_http_token do |token, _|
-        token == "lifo"
+      def authenticate
+        authenticate_or_request_with_http_token do |token, _|
+          token == "lifo"
+        end
       end
-    end
 
-    def authenticate_with_request
-      if authenticate_with_http_token { |token, options| token == '"quote" pretty' && options[:algorithm] == "test" }
-        @logged_in = true
-      else
-        request_http_token_authentication("SuperSecret", "Authentication Failed\n")
+      def authenticate_with_request
+        if authenticate_with_http_token { |token, options| token == '"quote" pretty' && options[:algorithm] == "test" }
+          @logged_in = true
+        else
+          request_http_token_authentication("SuperSecret", "Authentication Failed\n")
+        end
       end
-    end
 
-    def authenticate_long_credentials
-      authenticate_or_request_with_http_token do |token, options|
-        token == "1234567890123456789012345678901234567890" && options[:algorithm] == "test"
+      def authenticate_long_credentials
+        authenticate_or_request_with_http_token do |token, options|
+          token == "1234567890123456789012345678901234567890" && options[:algorithm] == "test"
+        end
       end
-    end
   end
 
   AUTH_HEADERS = ["HTTP_AUTHORIZATION", "X-HTTP_AUTHORIZATION", "X_HTTP_AUTHORIZATION", "REDIRECT_X_HTTP_AUTHORIZATION"]
diff --git a/actionpack/test/controller/new_base/render_context_test.rb b/actionpack/test/controller/new_base/render_context_test.rb
index 5df25d136c..40149a41d3 100644
--- a/actionpack/test/controller/new_base/render_context_test.rb
+++ b/actionpack/test/controller/new_base/render_context_test.rb
@@ -29,13 +29,13 @@ module RenderContext
     protected
 
     # 3) Set view_context to self
-    def view_context
-      self
-    end
+      def view_context
+        self
+      end
 
-    def __controller_method__
-      "controller context!"
-    end
+      def __controller_method__
+        "controller context!"
+      end
   end
 
   class RenderContextTest < Rack::TestCase
diff --git a/actionpack/test/controller/new_base/render_template_test.rb b/actionpack/test/controller/new_base/render_template_test.rb
index 13e4bbc1ea..e56cefbda1 100644
--- a/actionpack/test/controller/new_base/render_template_test.rb
+++ b/actionpack/test/controller/new_base/render_template_test.rb
@@ -67,9 +67,9 @@ module RenderTemplate
 
     private
 
-    def show_detailed_exceptions?
-      request.local?
-    end
+      def show_detailed_exceptions?
+        request.local?
+      end
   end
 
   class TestWithoutLayout < Rack::TestCase
diff --git a/actionpack/test/controller/new_base/render_test.rb b/actionpack/test/controller/new_base/render_test.rb
index 57006b2da0..cea3f9b5fd 100644
--- a/actionpack/test/controller/new_base/render_test.rb
+++ b/actionpack/test/controller/new_base/render_test.rb
@@ -36,9 +36,9 @@ module Render
 
     private
 
-    def secretz
-      render plain: "FAIL WHALE!"
-    end
+      def secretz
+        render plain: "FAIL WHALE!"
+      end
   end
 
   class DoubleRenderController < ActionController::Base
diff --git a/actionpack/test/controller/parameters/log_on_unpermitted_params_test.rb b/actionpack/test/controller/parameters/log_on_unpermitted_params_test.rb
index a6e48b8ded..bf2c3d1ed2 100644
--- a/actionpack/test/controller/parameters/log_on_unpermitted_params_test.rb
+++ b/actionpack/test/controller/parameters/log_on_unpermitted_params_test.rb
@@ -47,18 +47,18 @@ class LogOnUnpermittedParamsTest < ActiveSupport::TestCase
 
   private
 
-  def assert_logged(message)
-    old_logger = ActionController::Base.logger
-    log = StringIO.new
-    ActionController::Base.logger = Logger.new(log)
+    def assert_logged(message)
+      old_logger = ActionController::Base.logger
+      log = StringIO.new
+      ActionController::Base.logger = Logger.new(log)
 
-    begin
-      yield
+      begin
+        yield
 
-      log.rewind
-      assert_match message, log.read
-    ensure
-      ActionController::Base.logger = old_logger
+        log.rewind
+        assert_match message, log.read
+      ensure
+        ActionController::Base.logger = old_logger
+      end
     end
-  end
 end
diff --git a/actionpack/test/controller/params_wrapper_test.rb b/actionpack/test/controller/params_wrapper_test.rb
index 7d49e8d114..3b30fb2574 100644
--- a/actionpack/test/controller/params_wrapper_test.rb
+++ b/actionpack/test/controller/params_wrapper_test.rb
@@ -356,11 +356,11 @@ class IrregularInflectionParamsWrapperTest < ActionController::TestCase
 
   private
 
-  def with_dup
-    original = ActiveSupport::Inflector::Inflections.instance_variable_get(:@__instance__)[:en]
-    ActiveSupport::Inflector::Inflections.instance_variable_set(:@__instance__, en: original.dup)
-    yield
-  ensure
-    ActiveSupport::Inflector::Inflections.instance_variable_set(:@__instance__, en: original)
-  end
+    def with_dup
+      original = ActiveSupport::Inflector::Inflections.instance_variable_get(:@__instance__)[:en]
+      ActiveSupport::Inflector::Inflections.instance_variable_set(:@__instance__, en: original.dup)
+      yield
+    ensure
+      ActiveSupport::Inflector::Inflections.instance_variable_set(:@__instance__, en: original)
+    end
 end
diff --git a/actionpack/test/controller/request_forgery_protection_test.rb b/actionpack/test/controller/request_forgery_protection_test.rb
index a0e92c1a4a..e2724ded83 100644
--- a/actionpack/test/controller/request_forgery_protection_test.rb
+++ b/actionpack/test/controller/request_forgery_protection_test.rb
@@ -95,19 +95,19 @@ class PrependProtectForgeryBaseController < ActionController::Base
 
   protected
 
-  def add_called_callback(name)
-    @called_callbacks ||= []
-    @called_callbacks << name
-  end
+    def add_called_callback(name)
+      @called_callbacks ||= []
+      @called_callbacks << name
+    end
 
 
-  def custom_action
-    add_called_callback("custom_action")
-  end
+    def custom_action
+      add_called_callback("custom_action")
+    end
 
-  def verify_authenticity_token
-    add_called_callback("verify_authenticity_token")
-  end
+    def verify_authenticity_token
+      add_called_callback("verify_authenticity_token")
+    end
 end
 
 class FreeCookieController < RequestForgeryProtectionControllerUsingResetSession
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index 36df54e1ff..6cb4b83208 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -770,25 +770,25 @@ class ResourcesTest < ActionController::TestCase
       assert_recognizes({controller: "messages", action: "index"}, "/messages/")
     end
 
-     with_routing do |set|
-        set.draw do
-          resources :messages, path: "reviews"
-        end
-        assert_simply_restful_for :messages, as: "reviews"
-        assert_recognizes({controller: "messages", action: "index"}, "/reviews")
-        assert_recognizes({controller: "messages", action: "index"}, "/reviews/")
-     end
+    with_routing do |set|
+      set.draw do
+        resources :messages, path: "reviews"
+      end
+      assert_simply_restful_for :messages, as: "reviews"
+      assert_recognizes({controller: "messages", action: "index"}, "/reviews")
+      assert_recognizes({controller: "messages", action: "index"}, "/reviews/")
+    end
   end
 
   def test_multiple_with_path_segment_and_controller
     with_routing do |set|
       set.draw do
-       resources :products do
-          resources :product_reviews, path: "reviews", controller: "messages"
-        end
-       resources :tutors do
-          resources :tutor_reviews, path: "reviews", controller: "comments"
-        end
+        resources :products do
+           resources :product_reviews, path: "reviews", controller: "messages"
+         end
+        resources :tutors do
+           resources :tutor_reviews, path: "reviews", controller: "comments"
+         end
       end
 
       assert_simply_restful_for :product_reviews, controller: "messages", as: "reviews", name_prefix: "product_", path_prefix: "products/1/", options: {product_id: "1"}
@@ -1314,7 +1314,7 @@ class ResourcesTest < ActionController::TestCase
       assert_equal expected.length, resource.send("#{action_method}_methods")[method].size, "#{resource.send("#{action_method}_methods")[method].inspect}"
       expected.each do |action|
         assert resource.send("#{action_method}_methods")[method].include?(action)
-          "#{method} not in #{action_method} methods: #{resource.send("#{action_method}_methods")[method].inspect}"
+        "#{method} not in #{action_method} methods: #{resource.send("#{action_method}_methods")[method].inspect}"
       end
     end
 
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 0b2c7b7a4f..192a1540a7 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -739,7 +739,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
 
   def test_named_root_url_generation_with_controller_and_action
     rs.draw do
-       root to: "content#index", as: "home"
+      root to: "content#index", as: "home"
     end
 
     assert_equal "/", url_for(rs, controller: "content", action: "index")
diff --git a/actionpack/test/controller/show_exceptions_test.rb b/actionpack/test/controller/show_exceptions_test.rb
index 9b93afd303..38c601ee81 100644
--- a/actionpack/test/controller/show_exceptions_test.rb
+++ b/actionpack/test/controller/show_exceptions_test.rb
@@ -50,9 +50,9 @@ module ShowExceptions
   class ShowExceptionsOverriddenController < ShowExceptionsController
     private
 
-    def show_detailed_exceptions?
-      params["detailed"] == "1"
-    end
+      def show_detailed_exceptions?
+        params["detailed"] == "1"
+      end
   end
 
   class ShowExceptionsOverriddenTest < ActionDispatch::IntegrationTest
diff --git a/actionpack/test/controller/url_rewriter_test.rb b/actionpack/test/controller/url_rewriter_test.rb
index 81dc230929..d64ff4d6ce 100644
--- a/actionpack/test/controller/url_rewriter_test.rb
+++ b/actionpack/test/controller/url_rewriter_test.rb
@@ -88,4 +88,3 @@ class UrlRewriterTests < ActionController::TestCase
     assert_equal "/foo/bar/3/?query=string", @rewriter.rewrite(@routes, options)
   end
 end
-
diff --git a/actionpack/test/dispatch/request/session_test.rb b/actionpack/test/dispatch/request/session_test.rb
index b599fe5437..cc3c4d48f3 100644
--- a/actionpack/test/dispatch/request/session_test.rb
+++ b/actionpack/test/dispatch/request/session_test.rb
@@ -106,13 +106,13 @@ module ActionDispatch
       end
 
       private
-      def store
-        Class.new {
-          def load_session(env); [1, {}]; end
-          def session_exists?(env); true; end
-          def delete_session(env, id, options); 123; end
-        }.new
-      end
+        def store
+          Class.new {
+            def load_session(env); [1, {}]; end
+            def session_exists?(env); true; end
+            def delete_session(env, id, options); 123; end
+          }.new
+        end
     end
 
     class SessionIntegrationTest < ActionDispatch::IntegrationTest
diff --git a/actionpack/test/dispatch/request_id_test.rb b/actionpack/test/dispatch/request_id_test.rb
index d64ee7607d..793ce67db4 100644
--- a/actionpack/test/dispatch/request_id_test.rb
+++ b/actionpack/test/dispatch/request_id_test.rb
@@ -23,10 +23,10 @@ class RequestIdTest < ActiveSupport::TestCase
 
   private
 
-  def stub_request(env = {})
-    ActionDispatch::RequestId.new(lambda { |environment| [ 200, environment, [] ] }).call(env)
-    ActionDispatch::Request.new(env)
-  end
+    def stub_request(env = {})
+      ActionDispatch::RequestId.new(lambda { |environment| [ 200, environment, [] ] }).call(env)
+      ActionDispatch::Request.new(env)
+    end
 end
 
 class RequestIdResponseTest < ActionDispatch::IntegrationTest
@@ -53,17 +53,17 @@ class RequestIdResponseTest < ActionDispatch::IntegrationTest
 
   private
 
-  def with_test_route_set
-    with_routing do |set|
-      set.draw do
-        get "/", to: ::RequestIdResponseTest::TestController.action(:index)
-      end
+    def with_test_route_set
+      with_routing do |set|
+        set.draw do
+          get "/", to: ::RequestIdResponseTest::TestController.action(:index)
+        end
 
-      @app = self.class.build_app(set) do |middleware|
-        middleware.use ActionDispatch::RequestId
-      end
+        @app = self.class.build_app(set) do |middleware|
+          middleware.use ActionDispatch::RequestId
+        end
 
-      yield
+        yield
+      end
     end
-  end
 end
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 6994c7e897..486c0e162d 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -4781,9 +4781,9 @@ class TestPartialDynamicPathSegments < ActionDispatch::IntegrationTest
 
   private
 
-  def assert_params(params)
-    assert_equal(params, request.path_parameters)
-  end
+    def assert_params(params)
+      assert_equal(params, request.path_parameters)
+    end
 end
 
 class TestPathParameters < ActionDispatch::IntegrationTest
diff --git a/actionpack/test/dispatch/session/abstract_store_test.rb b/actionpack/test/dispatch/session/abstract_store_test.rb
index df81f7d7e3..fd4d359cf8 100644
--- a/actionpack/test/dispatch/session/abstract_store_test.rb
+++ b/actionpack/test/dispatch/session/abstract_store_test.rb
@@ -47,10 +47,10 @@ module ActionDispatch
       end
 
       private
-      def app(&block)
-        @env = nil
-        lambda { |env| @env = env }
-      end
+        def app(&block)
+          @env = nil
+          lambda { |env| @env = env }
+        end
     end
   end
 end
diff --git a/actionpack/test/dispatch/url_generation_test.rb b/actionpack/test/dispatch/url_generation_test.rb
index b5a792b456..0472be0d6a 100644
--- a/actionpack/test/dispatch/url_generation_test.rb
+++ b/actionpack/test/dispatch/url_generation_test.rb
@@ -138,4 +138,3 @@ module TestUrlGeneration
 
   end
 end
-
diff --git a/actionpack/test/fixtures/helpers/fun/games_helper.rb b/actionpack/test/fixtures/helpers/fun/games_helper.rb
index 3b7adce086..2d5e50f5a5 100644
--- a/actionpack/test/fixtures/helpers/fun/games_helper.rb
+++ b/actionpack/test/fixtures/helpers/fun/games_helper.rb
@@ -2,4 +2,4 @@ module Fun
   module GamesHelper
     def stratego() "Iz guuut!" end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/fixtures/helpers/just_me_helper.rb b/actionpack/test/fixtures/helpers/just_me_helper.rb
index b140a7b9b4..9b43fc6d49 100644
--- a/actionpack/test/fixtures/helpers/just_me_helper.rb
+++ b/actionpack/test/fixtures/helpers/just_me_helper.rb
@@ -1,3 +1,3 @@
 module JustMeHelper
   def me() "mine!" end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/fixtures/helpers/me_too_helper.rb b/actionpack/test/fixtures/helpers/me_too_helper.rb
index ce56042143..8e312e7cd0 100644
--- a/actionpack/test/fixtures/helpers/me_too_helper.rb
+++ b/actionpack/test/fixtures/helpers/me_too_helper.rb
@@ -1,3 +1,3 @@
 module MeTooHelper
   def me() "me too!" end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/fixtures/helpers_typo/admin/users_helper.rb b/actionpack/test/fixtures/helpers_typo/admin/users_helper.rb
index 7d2326e04d..64aa1a0476 100644
--- a/actionpack/test/fixtures/helpers_typo/admin/users_helper.rb
+++ b/actionpack/test/fixtures/helpers_typo/admin/users_helper.rb
@@ -2,4 +2,3 @@ module Admin
   module UsersHelpeR
   end
 end
-
diff --git a/actionpack/test/journey/gtg/builder_test.rb b/actionpack/test/journey/gtg/builder_test.rb
index 270bc7d741..5861cd2414 100644
--- a/actionpack/test/journey/gtg/builder_test.rb
+++ b/actionpack/test/journey/gtg/builder_test.rb
@@ -59,20 +59,20 @@ module ActionDispatch
         end
 
         private
-        def ast strings
-          parser = Journey::Parser.new
-          asts   = strings.map { |string|
-            memo = Object.new
-            ast  = parser.parse string
-            ast.each { |n| n.memo = memo }
-            ast
-          }
-          Nodes::Or.new asts
-        end
+          def ast strings
+            parser = Journey::Parser.new
+            asts   = strings.map { |string|
+              memo = Object.new
+              ast  = parser.parse string
+              ast.each { |n| n.memo = memo }
+              ast
+            }
+            Nodes::Or.new asts
+          end
 
-        def tt strings
-          Builder.new(ast(strings)).transition_table
-        end
+          def tt strings
+            Builder.new(ast(strings)).transition_table
+          end
       end
     end
   end
diff --git a/actionpack/test/journey/gtg/transition_table_test.rb b/actionpack/test/journey/gtg/transition_table_test.rb
index 00be1c2da6..566eb4d186 100644
--- a/actionpack/test/journey/gtg/transition_table_test.rb
+++ b/actionpack/test/journey/gtg/transition_table_test.rb
@@ -91,24 +91,24 @@ module ActionDispatch
         end
 
         private
-        def asts paths
-          parser  = Journey::Parser.new
-          paths.map { |x|
-            ast = parser.parse x
-            ast.each { |n| n.memo = ast}
-            ast
-          }
-        end
+          def asts paths
+            parser  = Journey::Parser.new
+            paths.map { |x|
+              ast = parser.parse x
+              ast.each { |n| n.memo = ast}
+              ast
+            }
+          end
 
-        def tt paths
-          x = asts paths
-          builder = GTG::Builder.new Nodes::Or.new x
-          builder.transition_table
-        end
+          def tt paths
+            x = asts paths
+            builder = GTG::Builder.new Nodes::Or.new x
+            builder.transition_table
+          end
 
-        def simulator_for paths
-          GTG::Simulator.new tt(paths)
-        end
+          def simulator_for paths
+            GTG::Simulator.new tt(paths)
+          end
       end
     end
   end
diff --git a/actionpack/test/journey/nfa/transition_table_test.rb b/actionpack/test/journey/nfa/transition_table_test.rb
index 81f9501688..c948880c47 100644
--- a/actionpack/test/journey/nfa/transition_table_test.rb
+++ b/actionpack/test/journey/nfa/transition_table_test.rb
@@ -61,11 +61,11 @@ module ActionDispatch
         end
 
         private
-        def tt string
-          ast     = @parser.parse string
-          builder = Builder.new ast
-          builder.transition_table
-        end
+          def tt string
+            ast     = @parser.parse string
+            builder = Builder.new ast
+            builder.transition_table
+          end
       end
     end
   end
diff --git a/actionpack/test/journey/router_test.rb b/actionpack/test/journey/router_test.rb
index 83cd999352..efe7bef5c5 100644
--- a/actionpack/test/journey/router_test.rb
+++ b/actionpack/test/journey/router_test.rb
@@ -493,41 +493,41 @@ module ActionDispatch
 
       private
 
-      def get *args
-        ActiveSupport::Deprecation.silence do
-          mapper.get(*args)
+        def get *args
+          ActiveSupport::Deprecation.silence do
+            mapper.get(*args)
+          end
         end
-      end
 
-      def match *args
-        ActiveSupport::Deprecation.silence do
-          mapper.match(*args)
+        def match *args
+          ActiveSupport::Deprecation.silence do
+            mapper.match(*args)
+          end
         end
-      end
 
-      def rails_env env, klass = ActionDispatch::Request
-        klass.new(rack_env(env))
-      end
-
-      def rack_env env
-        {
-          "rack.version"      => [1, 1],
-          "rack.input"        => StringIO.new,
-          "rack.errors"       => StringIO.new,
-          "rack.multithread"  => true,
-          "rack.multiprocess" => true,
-          "rack.run_once"     => false,
-          "REQUEST_METHOD"    => "GET",
-          "SERVER_NAME"       => "example.org",
-          "SERVER_PORT"       => "80",
-          "QUERY_STRING"      => "",
-          "PATH_INFO"         => "/content",
-          "rack.url_scheme"   => "http",
-          "HTTPS"             => "off",
-          "SCRIPT_NAME"       => "",
-          "CONTENT_LENGTH"    => "0"
-        }.merge env
-      end
+        def rails_env env, klass = ActionDispatch::Request
+          klass.new(rack_env(env))
+        end
+
+        def rack_env env
+          {
+            "rack.version"      => [1, 1],
+            "rack.input"        => StringIO.new,
+            "rack.errors"       => StringIO.new,
+            "rack.multithread"  => true,
+            "rack.multiprocess" => true,
+            "rack.run_once"     => false,
+            "REQUEST_METHOD"    => "GET",
+            "SERVER_NAME"       => "example.org",
+            "SERVER_PORT"       => "80",
+            "QUERY_STRING"      => "",
+            "PATH_INFO"         => "/content",
+            "rack.url_scheme"   => "http",
+            "HTTPS"             => "off",
+            "SCRIPT_NAME"       => "",
+            "CONTENT_LENGTH"    => "0"
+          }.merge env
+        end
     end
   end
 end