Rename RackRequest to Request

6 files changed, 11 insertions, 11 deletions

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index a69ef42954..8dc01ba792 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -38,7 +38,7 @@ module ActionController
   # TODO: Review explicit to see if they will automatically be handled by
   # the initilizer if they are really needed.
   def self.load_all!
-    [Base, CGIHandler, CgiRequest, RackRequest, RackRequest, Http::Headers, UrlRewriter, UrlWriter]
+    [Base, CGIHandler, CgiRequest, Request, Response, Http::Headers, UrlRewriter, UrlWriter]
   end
 
   autoload :AbstractRequest, 'action_controller/request'
@@ -59,7 +59,7 @@ module ActionController
   autoload :MiddlewareStack, 'action_controller/middleware_stack'
   autoload :MimeResponds, 'action_controller/mime_responds'
   autoload :PolymorphicRoutes, 'action_controller/polymorphic_routes'
-  autoload :RackRequest, 'action_controller/request'
+  autoload :Request, 'action_controller/request'
   autoload :RecordIdentifier, 'action_controller/record_identifier'
   autoload :Response, 'action_controller/response'
   autoload :RequestForgeryProtection, 'action_controller/request_forgery_protection'
diff --git a/actionpack/lib/action_controller/dispatcher.rb b/actionpack/lib/action_controller/dispatcher.rb
index ae9f117e3f..4dc76e1b49 100644
--- a/actionpack/lib/action_controller/dispatcher.rb
+++ b/actionpack/lib/action_controller/dispatcher.rb
@@ -83,7 +83,7 @@ module ActionController
     end
 
     def _call(env)
-      @request = RackRequest.new(env)
+      @request = Request.new(env)
       @response = Response.new
       dispatch
     end
diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb
index d952c3489b..701b464c99 100644
--- a/actionpack/lib/action_controller/integration.rb
+++ b/actionpack/lib/action_controller/integration.rb
@@ -371,7 +371,7 @@ module ActionController
             "SERVER_PORT"    => https? ? "443" : "80",
             "HTTPS"          => https? ? "on" : "off"
           }
-          UrlRewriter.new(RackRequest.new(env), {})
+          UrlRewriter.new(Request.new(env), {})
         end
 
         def name_with_prefix(prefix, name)
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb
index 7c125df55a..565a2d5d81 100755
--- a/actionpack/lib/action_controller/request.rb
+++ b/actionpack/lib/action_controller/request.rb
@@ -862,7 +862,7 @@ EOM
     include UploadedFile
   end
 
-  class RackRequest < AbstractRequest #:nodoc:
+  class Request < AbstractRequest #:nodoc:
     attr_accessor :session_options
 
     class SessionFixationAttempt < StandardError #:nodoc:
diff --git a/actionpack/test/controller/rack_test.rb b/actionpack/test/controller/rack_test.rb
index 81d103f0f9..f58a9c53e5 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::RackRequest.new(@env)
+    @request = ActionController::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::RackRequest.new(@env.merge({"HTTP_COOKIE"=>"_session_id=c84ace847,96670c052c6ceb2451fb0f2;is_admin=yes"}))
+    @alt_cookie_fmt_request = ActionController::Request.new(@env.merge({"HTTP_COOKIE"=>"_session_id=c84ace847,96670c052c6ceb2451fb0f2;is_admin=yes"}))
   end
 
   def default_test; end
@@ -218,7 +218,7 @@ class RackRequestNeedsRewoundTest < BaseRackTest
     @env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded; charset=utf-8'
 
     # Read the request body by parsing params.
-    request = ActionController::RackRequest.new(@env)
+    request = ActionController::Request.new(@env)
     request.request_parameters
 
     # Should have rewound the body.
diff --git a/actionpack/test/controller/request_test.rb b/actionpack/test/controller/request_test.rb
index 71da50fab0..694771dfe8 100644
--- a/actionpack/test/controller/request_test.rb
+++ b/actionpack/test/controller/request_test.rb
@@ -856,7 +856,7 @@ class XmlParamsParsingTest < ActiveSupport::TestCase
       env = { 'rack.input'     => StringIO.new(body),
               'CONTENT_TYPE'   => 'application/xml',
               'CONTENT_LENGTH' => body.size.to_s }
-      ActionController::RackRequest.new(env).request_parameters
+      ActionController::Request.new(env).request_parameters
     end
 end
 
@@ -866,7 +866,7 @@ class LegacyXmlParamsParsingTest < XmlParamsParsingTest
       env = { 'rack.input'              => StringIO.new(body),
               'HTTP_X_POST_DATA_FORMAT' => 'xml',
               'CONTENT_LENGTH'          => body.size.to_s }
-      ActionController::RackRequest.new(env).request_parameters
+      ActionController::Request.new(env).request_parameters
     end
 end
 
@@ -888,6 +888,6 @@ class JsonParamsParsingTest < ActiveSupport::TestCase
       env = { 'rack.input'     => StringIO.new(body),
               'CONTENT_TYPE'   => content_type,
               'CONTENT_LENGTH' => body.size.to_s }
-      ActionController::RackRequest.new(env).request_parameters
+      ActionController::Request.new(env).request_parameters
     end
 end