lib/action_controller.rb in actionpack-3.0.20 vs lib/action_controller.rb in actionpack-3.1.0.beta1

@@ -11,18 +11,21 @@
 
   autoload_under "metal" do
     autoload :Compatibility
     autoload :ConditionalGet
     autoload :Cookies
+    autoload :DataStreaming
     autoload :Flash
+    autoload :ForceSSL
     autoload :Head
     autoload :Helpers
     autoload :HideActions
     autoload :HttpAuthentication
     autoload :ImplicitRender
     autoload :Instrumentation
     autoload :MimeResponds
+    autoload :ParamsWrapper
     autoload :RackDelegation
     autoload :Redirecting
     autoload :Renderers
     autoload :Rendering
     autoload :RequestForgeryProtection
@@ -32,16 +35,14 @@
     autoload :Streaming
     autoload :Testing
     autoload :UrlFor
   end
 
-  autoload :Dispatcher,      'action_controller/deprecated/dispatcher'
-  autoload :UrlWriter,       'action_controller/deprecated/url_writer'
-  autoload :UrlRewriter,     'action_controller/deprecated/url_writer'
   autoload :Integration,     'action_controller/deprecated/integration_test'
   autoload :IntegrationTest, 'action_controller/deprecated/integration_test'
   autoload :PerformanceTest, 'action_controller/deprecated/performance_test'
+  autoload :UrlWriter,       'action_controller/deprecated'
   autoload :Routing,         'action_controller/deprecated'
   autoload :TestCase,        'action_controller/test_case'
 
   eager_autoload do
     autoload :RecordIdentifier
@@ -72,6 +73,7 @@
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/load_error'
 require 'active_support/core_ext/module/attr_internal'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/name_error'
+require 'active_support/core_ext/uri'
 require 'active_support/inflector'