Reorganize autoloads:

  * A new module (ActiveSupport::Autoload) is provide that extends
    autoloading with new behavior.
  * All autoloads in modules that have extended ActiveSupport::Autoload
    will be eagerly required in threadsafe environments
  * Autoloads can optionally leave off the path if the path is the same
    as full_constant_name.underscore
  * It is possible to specify that a group of autoloads live under an
    additional path. For instance, all of ActionDispatch's middlewares
    are ActionDispatch::MiddlewareName, but they live under 
    "action_dispatch/middlewares/middleware_name"
  * It is possible to specify that a group of autoloads are all found
    at the same path. For instance, a number of exceptions might all
    be declared there.
  * One consequence of this is that testing-related constants are not
    autoloaded. To get the testing helpers for a given component,
    require "component_name/test_case". For instance, "action_controller/test_case".
  * test_help.rb, which is automatically required by a Rails application's
    test helper, requires the test_case.rb for all active components, so
    this change will not be disruptive in existing or new applications.

1 files changed, 61 insertions, 55 deletions

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 03a40e4fce..f830223058 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -1,66 +1,72 @@
+require "active_support"
+
 module ActionController
-  autoload :Base,                 "action_controller/base"
-  autoload :Benchmarking,         "action_controller/metal/benchmarking"
-  autoload :ConditionalGet,       "action_controller/metal/conditional_get"
-  autoload :Configuration,        "action_controller/metal/configuration"
-  autoload :Head,                 "action_controller/metal/head"
-  autoload :Helpers,              "action_controller/metal/helpers"
-  autoload :HideActions,          "action_controller/metal/hide_actions"
-  autoload :Layouts,              "action_controller/metal/layouts"
-  autoload :Metal,                "action_controller/metal"
-  autoload :Middleware,           "action_controller/middleware"
-  autoload :RackConvenience,      "action_controller/metal/rack_convenience"
-  autoload :Rails2Compatibility,  "action_controller/metal/compatibility"
-  autoload :Redirector,           "action_controller/metal/redirector"
-  autoload :RenderingController,  "action_controller/metal/rendering_controller"
-  autoload :RenderOptions,        "action_controller/metal/render_options"
-  autoload :Rescue,               "action_controller/metal/rescuable"
-  autoload :Responder,            "action_controller/metal/responder"
-  autoload :Session,              "action_controller/metal/session"
-  autoload :Testing,              "action_controller/metal/testing"
-  autoload :UrlFor,               "action_controller/metal/url_for"
+  extend ActiveSupport::Autoload
 
-  autoload :Caching,           'action_controller/caching'
-  autoload :Dispatcher,        'action_controller/dispatch/dispatcher'
-  autoload :Integration,       'action_controller/deprecated/integration_test'
-  autoload :IntegrationTest,   'action_controller/deprecated/integration_test'
-  autoload :MimeResponds,      'action_controller/metal/mime_responds'
-  autoload :PerformanceTest,   'action_controller/deprecated/performance_test'
-  autoload :PolymorphicRoutes, 'action_controller/polymorphic_routes'
-  autoload :RecordIdentifier,  'action_controller/record_identifier'
-  autoload :Routing,           'action_controller/deprecated'
-  autoload :SessionManagement, 'action_controller/metal/session_management'
-  autoload :TestCase,          'action_controller/testing/test_case'
-  autoload :TestProcess,       'action_controller/testing/process'
-  autoload :UrlRewriter,       'action_controller/url_rewriter'
-  autoload :UrlWriter,         'action_controller/url_rewriter'
+  autoload :Base
+  autoload :Caching
+  autoload :PolymorphicRoutes
+  autoload :RecordIdentifier
+  autoload :UrlRewriter
+  autoload :Translation
+  autoload :Metal
+  autoload :Middleware
 
-  autoload :Verification,             'action_controller/metal/verification'
-  autoload :Flash,                    'action_controller/metal/flash'
-  autoload :RequestForgeryProtection, 'action_controller/metal/request_forgery_protection'
-  autoload :Streaming,                'action_controller/metal/streaming'
-  autoload :HttpAuthentication,       'action_controller/metal/http_authentication'
-  autoload :FilterParameterLogging,   'action_controller/metal/filter_parameter_logging'
-  autoload :Translation,              'action_controller/translation'
-  autoload :Cookies,                  'action_controller/metal/cookies'
+  autoload_under "metal" do
+    autoload :Benchmarking
+    autoload :ConditionalGet
+    autoload :Configuration
+    autoload :Head
+    autoload :Helpers
+    autoload :HideActions
+    autoload :Layouts
+    autoload :MimeResponds
+    autoload :RackConvenience
+    autoload :Compatibility
+    autoload :Redirector
+    autoload :RenderingController
+    autoload :RenderOptions
+    autoload :Rescue
+    autoload :Responder
+    autoload :Session
+    autoload :SessionManagement
+    autoload :UrlFor
+    autoload :Verification
+    autoload :Flash
+    autoload :RequestForgeryProtection
+    autoload :Streaming
+    autoload :HttpAuthentication
+    autoload :FilterParameterLogging
+    autoload :Cookies
+  end
 
-  autoload :ActionControllerError,    'action_controller/metal/exceptions'
-  autoload :RenderError,              'action_controller/metal/exceptions'
-  autoload :RoutingError,             'action_controller/metal/exceptions'
-  autoload :MethodNotAllowed,         'action_controller/metal/exceptions'
-  autoload :NotImplemented,           'action_controller/metal/exceptions'
-  autoload :UnknownController,        'action_controller/metal/exceptions'
-  autoload :MissingFile,              'action_controller/metal/exceptions'
-  autoload :RenderError,              'action_controller/metal/exceptions'
-  autoload :SessionOverflowError,     'action_controller/metal/exceptions'
-  autoload :UnknownHttpMethod,        'action_controller/metal/exceptions'
-end
+  autoload :Dispatcher,               'action_controller/dispatch/dispatcher'
+  autoload :PerformanceTest,          'action_controller/deprecated/performance_test'
+  autoload :Routing,                  'action_controller/deprecated'
+  autoload :Integration,              'action_controller/deprecated/integration_test'
+  autoload :IntegrationTest,          'action_controller/deprecated/integration_test'
 
-autoload :HTML, 'action_controller/vendor/html-scanner'
-autoload :AbstractController, 'abstract_controller'
+  autoload :UrlWriter,                'action_controller/url_rewriter'
+
+  autoload_at "action_controller/metal/exceptions" do
+    autoload :ActionControllerError
+    autoload :RenderError
+    autoload :RoutingError
+    autoload :MethodNotAllowed
+    autoload :NotImplemented
+    autoload :UnknownController
+    autoload :MissingFile
+    autoload :RenderError
+    autoload :SessionOverflowError
+    autoload :UnknownHttpMethod
+  end
+end
 
+# All of these simply register additional autoloads
+require 'abstract_controller'
 require 'action_dispatch'
 require 'action_view'
+require 'action_controller/vendor/html-scanner'
 
 # Common ActiveSupport usage in ActionController
 require "active_support/concern"