1 files changed, 40 insertions, 30 deletions
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index 259814a322..feed6a8e25 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -21,6 +21,10 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
+activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
+$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
+require 'active_support'
+
 require 'rack'
 
 module Rack
@@ -28,43 +32,49 @@ module Rack
 end
 
 module ActionDispatch
-  autoload :Request, 'action_dispatch/http/request'
-  autoload :Response, 'action_dispatch/http/response'
-  autoload :StatusCodes, 'action_dispatch/http/status_codes'
-  autoload :Utils, 'action_dispatch/http/utils'
+  extend ActiveSupport::Autoload
 
-  autoload :Callbacks, 'action_dispatch/middleware/callbacks'
-  autoload :MiddlewareStack, 'action_dispatch/middleware/stack'
-  autoload :ParamsParser, 'action_dispatch/middleware/params_parser'
-  autoload :Rescue, 'action_dispatch/middleware/rescue'
-  autoload :ShowExceptions, 'action_dispatch/middleware/show_exceptions'
-  autoload :Static, 'action_dispatch/middleware/static'
-  autoload :StringCoercion, 'action_dispatch/middleware/string_coercion'
+  autoload_under 'http' do
+    autoload :Request
+    autoload :Response
+    autoload :StatusCodes
+    autoload :Utils
+  end
 
-  autoload :Routing, 'action_dispatch/routing'
+  deferrable do
+    autoload_under 'middleware' do
+      autoload :Callbacks
+      autoload :ParamsParser
+      autoload :Rescue
+      autoload :ShowExceptions
+      autoload :Static
+      autoload :StringCoercion
+    end
 
-  autoload :Assertions, 'action_dispatch/testing/assertions'
-  autoload :Integration, 'action_dispatch/testing/integration'
-  autoload :IntegrationTest, 'action_dispatch/testing/integration'
-  autoload :PerformanceTest, 'action_dispatch/testing/performance_test'
-  autoload :TestRequest, 'action_dispatch/testing/test_request'
-  autoload :TestResponse, 'action_dispatch/testing/test_response'
+    autoload :MiddlewareStack, 'action_dispatch/middleware/stack'
+    autoload :Routing
 
-  autoload :HTML, 'action_controller/vendor/html-scanner'
+    module Http
+      autoload :Headers, 'action_dispatch/http/headers'
+    end
 
-  module Http
-    autoload :Headers, 'action_dispatch/http/headers'
-  end
+    module Session
+      autoload :AbstractStore, 'action_dispatch/middleware/session/abstract_store'
+      autoload :CookieStore,   'action_dispatch/middleware/session/cookie_store'
+      autoload :MemCacheStore, 'action_dispatch/middleware/session/mem_cache_store'
+    end
 
-  module Session
-    autoload :AbstractStore, 'action_dispatch/middleware/session/abstract_store'
-    autoload :CookieStore, 'action_dispatch/middleware/session/cookie_store'
-    autoload :MemCacheStore, 'action_dispatch/middleware/session/mem_cache_store'
+    autoload_under 'testing' do
+      autoload :Assertions
+      autoload :Integration
+      autoload :PerformanceTest
+      autoload :TestProcess
+      autoload :TestRequest
+      autoload :TestResponse
+    end
   end
+
+  autoload :HTML, 'action_controller/vendor/html-scanner'
 end
 
 autoload :Mime, 'action_dispatch/http/mime_type'
-
-activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
-$:.unshift activesupport_path if File.directory?(activesupport_path)
-require 'active_support'