From ba9887c9c02a3671c3d1d893cbee9f360ea2df2d Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Thu, 30 Apr 2009 13:45:12 -0500
Subject: Switch to action_dispatch rack namespace

---
 actionpack/lib/action_controller/testing/process.rb        | 2 +-
 actionpack/lib/action_dispatch/http/request.rb             | 4 ++--
 actionpack/lib/action_dispatch/middleware/params_parser.rb | 2 +-
 actionpack/test/dispatch/request_test.rb                   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/actionpack/lib/action_controller/testing/process.rb b/actionpack/lib/action_controller/testing/process.rb
index 16a8f66bc4..a2bb9afaa5 100644
--- a/actionpack/lib/action_controller/testing/process.rb
+++ b/actionpack/lib/action_controller/testing/process.rb
@@ -109,7 +109,7 @@ module ActionController #:nodoc:
     end
 
     def recycle!
-      @env["action_controller.request.request_parameters"] = {}
+      @env["action_dispatch.request.request_parameters"] = {}
       self.query_parameters   = {}
       self.path_parameters    = {}
       @headers, @request_method, @accepts, @content_type = nil, nil, nil, nil
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 2602b344ca..9f0361a874 100755
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -437,13 +437,13 @@ EOM
 
     # Override Rack's GET method to support indifferent access
     def GET
-      @env["action_controller.request.query_parameters"] ||= normalize_parameters(super)
+      @env["action_dispatch.request.query_parameters"] ||= normalize_parameters(super)
     end
     alias_method :query_parameters, :GET
 
     # Override Rack's POST method to support indifferent access
     def POST
-      @env["action_controller.request.request_parameters"] ||= normalize_parameters(super)
+      @env["action_dispatch.request.request_parameters"] ||= normalize_parameters(super)
     end
     alias_method :request_parameters, :POST
 
diff --git a/actionpack/lib/action_dispatch/middleware/params_parser.rb b/actionpack/lib/action_dispatch/middleware/params_parser.rb
index abaee2829e..58d527a6e7 100644
--- a/actionpack/lib/action_dispatch/middleware/params_parser.rb
+++ b/actionpack/lib/action_dispatch/middleware/params_parser.rb
@@ -11,7 +11,7 @@ module ActionDispatch
 
     def call(env)
       if params = parse_formatted_parameters(env)
-        env["action_controller.request.request_parameters"] = params
+        env["action_dispatch.request.request_parameters"] = params
       end
 
       @app.call(env)
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index d57a2a611f..3a85db8aa5 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -307,7 +307,7 @@ class RequestTest < ActiveSupport::TestCase
   test "restrict method hacking" do
     [:get, :put, :delete].each do |method|
       request = stub_request 'REQUEST_METHOD' => method.to_s.upcase,
-        'action_controller.request.request_parameters' => { :_method => 'put' }
+        'action_dispatch.request.request_parameters' => { :_method => 'put' }
       assert_equal method, request.method
     end
   end
-- 
cgit v1.2.3