From 289c9a24fcd27665f5544c4d647f3a60ae9c790e Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sat, 12 Dec 2009 19:41:58 -0600
Subject: [PATCH] Nearly all AC modules can be deferred

---
 actionpack/lib/action_controller.rb | 84 +++++++++++++++--------------
 1 file changed, 44 insertions(+), 40 deletions(-)

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index f830223058..2113d791f5 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -3,51 +3,55 @@
 module ActionController
   extend ActiveSupport::Autoload
 
-  autoload :Base
-  autoload :Caching
-  autoload :PolymorphicRoutes
-  autoload :RecordIdentifier
-  autoload :UrlRewriter
-  autoload :Translation
-  autoload :Metal
-  autoload :Middleware
+  deferrable do
+    autoload :Base
+    autoload :Caching
+    autoload :PolymorphicRoutes
+    autoload :Translation
+    autoload :Metal
+    autoload :Middleware
 
-  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
+    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 :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'
   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 :RecordIdentifier
+  autoload :UrlRewriter
   autoload :UrlWriter,                'action_controller/url_rewriter'
 
+  # TODO: Don't autoload exceptions, setup explicit
+  # requires for files that need them
   autoload_at "action_controller/metal/exceptions" do
     autoload :ActionControllerError
     autoload :RenderError