Move HTTP libs and middleware into ActionDispatch component

10 files changed, 23 insertions, 23 deletions

diff --git a/actionpack/test/controller/dispatcher_test.rb b/actionpack/test/controller/dispatcher_test.rb
index 7cd4e71aa1..6b409c9ae2 100644
--- a/actionpack/test/controller/dispatcher_test.rb
+++ b/actionpack/test/controller/dispatcher_test.rb
@@ -46,7 +46,7 @@ class DispatcherTest < Test::Unit::TestCase
 
   def test_failsafe_response
     Dispatcher.any_instance.expects(:dispatch).raises('b00m')
-    ActionController::Failsafe.any_instance.expects(:log_failsafe_exception)
+    ActionDispatch::Failsafe.any_instance.expects(:log_failsafe_exception)
 
     assert_nothing_raised do
       assert_equal [
diff --git a/actionpack/test/controller/header_test.rb b/actionpack/test/controller/header_test.rb
index 33c14a187c..4f13ea00be 100644
--- a/actionpack/test/controller/header_test.rb
+++ b/actionpack/test/controller/header_test.rb
@@ -2,7 +2,7 @@ require 'abstract_unit'
 
 class HeaderTest < Test::Unit::TestCase
   def setup
-    @headers = ActionController::Http::Headers.new("HTTP_CONTENT_TYPE"=>"text/plain")
+    @headers = ActionDispatch::Http::Headers.new("HTTP_CONTENT_TYPE"=>"text/plain")
   end
   
   def test_content_type_works
diff --git a/actionpack/test/controller/middleware_stack_test.rb b/actionpack/test/controller/middleware_stack_test.rb
index 2a141697da..e5496c848b 100644
--- a/actionpack/test/controller/middleware_stack_test.rb
+++ b/actionpack/test/controller/middleware_stack_test.rb
@@ -6,7 +6,7 @@ class MiddlewareStackTest < ActiveSupport::TestCase
   class BazMiddleware; end
 
   def setup
-    @stack = ActionController::MiddlewareStack.new
+    @stack = ActionDispatch::MiddlewareStack.new
     @stack.use FooMiddleware
     @stack.use BarMiddleware
   end
diff --git a/actionpack/test/controller/rack_test.rb b/actionpack/test/controller/rack_test.rb
index 8ad42614b4..c29902c722 100644
--- a/actionpack/test/controller/rack_test.rb
+++ b/actionpack/test/controller/rack_test.rb
@@ -43,10 +43,10 @@ class BaseRackTest < Test::Unit::TestCase
       "REDIRECT_STATUS" => "200",
       "REQUEST_METHOD" => "GET"
     }
-    @request = ActionController::Request.new(@env)
+    @request = ActionDispatch::Request.new(@env)
     # some Nokia phone browsers omit the space after the semicolon separator.
     # some developers have grown accustomed to using comma in cookie values.
-    @alt_cookie_fmt_request = ActionController::Request.new(@env.merge({"HTTP_COOKIE"=>"_session_id=c84ace847,96670c052c6ceb2451fb0f2;is_admin=yes"}))
+    @alt_cookie_fmt_request = ActionDispatch::Request.new(@env.merge({"HTTP_COOKIE"=>"_session_id=c84ace847,96670c052c6ceb2451fb0f2;is_admin=yes"}))
   end
 
   def default_test; end
@@ -195,7 +195,7 @@ class RackRequestNeedsRewoundTest < BaseRackTest
     @env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded; charset=utf-8'
 
     # Read the request body by parsing params.
-    request = ActionController::Request.new(@env)
+    request = ActionDispatch::Request.new(@env)
     request.request_parameters
 
     # Should have rewound the body.
@@ -206,7 +206,7 @@ end
 class RackResponseTest < BaseRackTest
   def setup
     super
-    @response = ActionController::Response.new
+    @response = ActionDispatch::Response.new
   end
 
   def test_simple_output
@@ -252,7 +252,7 @@ end
 class RackResponseHeadersTest < BaseRackTest
   def setup
     super
-    @response = ActionController::Response.new
+    @response = ActionDispatch::Response.new
     @response.status = "200 OK"
   end
 
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 11b502a564..a339bb524c 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -1223,7 +1223,7 @@ class RenderTest < ActionController::TestCase
     assert !@response.headers.include?('Content-Length')
     assert_response :no_content
 
-    ActionController::StatusCodes::SYMBOL_TO_STATUS_CODE.each do |status, code|
+    ActionDispatch::StatusCodes::SYMBOL_TO_STATUS_CODE.each do |status, code|
       get :head_with_symbolic_status, :status => status.to_s
       assert_equal code, @response.response_code
       assert_response status
@@ -1231,7 +1231,7 @@ class RenderTest < ActionController::TestCase
   end
 
   def test_head_with_integer_status
-    ActionController::StatusCodes::STATUS_CODES.each do |code, message|
+    ActionDispatch::StatusCodes::STATUS_CODES.each do |code, message|
       get :head_with_integer_status, :status => code.to_s
       assert_equal message, @response.message
     end
diff --git a/actionpack/test/controller/request/multipart_params_parsing_test.rb b/actionpack/test/controller/request/multipart_params_parsing_test.rb
index 054519d0d2..5b9728cc42 100644
--- a/actionpack/test/controller/request/multipart_params_parsing_test.rb
+++ b/actionpack/test/controller/request/multipart_params_parsing_test.rb
@@ -215,7 +215,7 @@ class MultipartParamsParsingTest < ActionController::IntegrationTest
     def with_muck_middleware
       original_middleware = ActionController::Dispatcher.middleware
       middleware = original_middleware.dup
-      middleware.insert_after ActionController::RewindableInput, MuckMiddleware
+      middleware.insert_after ActionDispatch::RewindableInput, MuckMiddleware
       ActionController::Dispatcher.middleware = middleware
       yield
       ActionController::Dispatcher.middleware = original_middleware
diff --git a/actionpack/test/controller/request/url_encoded_params_parsing_test.rb b/actionpack/test/controller/request/url_encoded_params_parsing_test.rb
index 89239687de..9f0535bbcc 100644
--- a/actionpack/test/controller/request/url_encoded_params_parsing_test.rb
+++ b/actionpack/test/controller/request/url_encoded_params_parsing_test.rb
@@ -195,7 +195,7 @@ class UrlEncodedParamsParsingTest < ActionController::IntegrationTest
     def with_muck_middleware
       original_middleware = ActionController::Dispatcher.middleware
       middleware = original_middleware.dup
-      middleware.insert_after ActionController::RewindableInput, MuckMiddleware
+      middleware.insert_after ActionDispatch::RewindableInput, MuckMiddleware
       ActionController::Dispatcher.middleware = middleware
       yield
       ActionController::Dispatcher.middleware = original_middleware
diff --git a/actionpack/test/controller/rescue_test.rb b/actionpack/test/controller/rescue_test.rb
index 9f6b45f065..a2a2a3ee29 100644
--- a/actionpack/test/controller/rescue_test.rb
+++ b/actionpack/test/controller/rescue_test.rb
@@ -393,7 +393,7 @@ class RescueControllerTest < ActionController::TestCase
   def test_rescue_dispatcher_exceptions_without_request_set
     @request.env['REQUEST_URI'] = '/no_way'
     response = RescueController.call_with_exception(@request.env, ActionController::RoutingError.new("Route not found"))
-    assert_kind_of ActionController::Response, response
+    assert_kind_of ActionDispatch::Response, response
     assert_equal "no way", response.body
   end
 
diff --git a/actionpack/test/controller/session/cookie_store_test.rb b/actionpack/test/controller/session/cookie_store_test.rb
index b6a38f47aa..d77be31c9a 100644
--- a/actionpack/test/controller/session/cookie_store_test.rb
+++ b/actionpack/test/controller/session/cookie_store_test.rb
@@ -6,7 +6,7 @@ class CookieStoreTest < ActionController::IntegrationTest
   SessionSecret = 'b3c631c314c0bbca50c1b2843150fe33'
 
   DispatcherApp = ActionController::Dispatcher.new
-  CookieStoreApp = ActionController::Session::CookieStore.new(DispatcherApp,
+  CookieStoreApp = ActionDispatch::Session::CookieStore.new(DispatcherApp,
                      :key => SessionKey, :secret => SessionSecret)
 
   Verifier = ActiveSupport::MessageVerifier.new(SessionSecret, 'SHA1')
@@ -51,41 +51,41 @@ class CookieStoreTest < ActionController::IntegrationTest
 
   def test_raises_argument_error_if_missing_session_key
     assert_raise(ArgumentError, nil.inspect) {
-      ActionController::Session::CookieStore.new(nil,
+      ActionDispatch::Session::CookieStore.new(nil,
         :key => nil, :secret => SessionSecret)
     }
 
     assert_raise(ArgumentError, ''.inspect) {
-      ActionController::Session::CookieStore.new(nil,
+      ActionDispatch::Session::CookieStore.new(nil,
         :key => '', :secret => SessionSecret)
     }
   end
 
   def test_raises_argument_error_if_missing_secret
     assert_raise(ArgumentError, nil.inspect) {
-      ActionController::Session::CookieStore.new(nil,
+      ActionDispatch::Session::CookieStore.new(nil,
        :key => SessionKey, :secret => nil)
     }
 
     assert_raise(ArgumentError, ''.inspect) {
-      ActionController::Session::CookieStore.new(nil,
+      ActionDispatch::Session::CookieStore.new(nil,
        :key => SessionKey, :secret => '')
     }
   end
 
   def test_raises_argument_error_if_secret_is_probably_insecure
     assert_raise(ArgumentError, "password".inspect) {
-      ActionController::Session::CookieStore.new(nil,
+      ActionDispatch::Session::CookieStore.new(nil,
        :key => SessionKey, :secret => "password")
     }
 
     assert_raise(ArgumentError, "secret".inspect) {
-      ActionController::Session::CookieStore.new(nil,
+      ActionDispatch::Session::CookieStore.new(nil,
        :key => SessionKey, :secret => "secret")
     }
 
     assert_raise(ArgumentError, "12345678901234567890123456789".inspect) {
-      ActionController::Session::CookieStore.new(nil,
+      ActionDispatch::Session::CookieStore.new(nil,
        :key => SessionKey, :secret => "12345678901234567890123456789")
     }
   end
@@ -119,7 +119,7 @@ class CookieStoreTest < ActionController::IntegrationTest
 
   def test_close_raises_when_data_overflows
     with_test_route_set do
-      assert_raise(ActionController::Session::CookieStore::CookieOverflow) {
+      assert_raise(ActionDispatch::Session::CookieStore::CookieOverflow) {
         get '/raise_data_overflow'
       }
     end
diff --git a/actionpack/test/controller/session/mem_cache_store_test.rb b/actionpack/test/controller/session/mem_cache_store_test.rb
index eb896a344c..2e2bf79148 100644
--- a/actionpack/test/controller/session/mem_cache_store_test.rb
+++ b/actionpack/test/controller/session/mem_cache_store_test.rb
@@ -26,7 +26,7 @@ class MemCacheStoreTest < ActionController::IntegrationTest
 
   begin
     DispatcherApp = ActionController::Dispatcher.new
-    MemCacheStoreApp = ActionController::Session::MemCacheStore.new(
+    MemCacheStoreApp = ActionDispatch::Session::MemCacheStore.new(
                          DispatcherApp, :key => '_session_id')