Merge branch 'master' of git://github.com/rails/rails

1 files changed, 28 insertions, 0 deletions

diff --git a/actionpack/lib/action_controller/metal/rack_delegation.rb b/actionpack/lib/action_controller/metal/rack_delegation.rb
new file mode 100644
index 0000000000..5141918499
--- /dev/null
+++ b/actionpack/lib/action_controller/metal/rack_delegation.rb
@@ -0,0 +1,28 @@
+module ActionController
+  module RackDelegation
+    extend ActiveSupport::Concern
+
+    included do
+      delegate :session, :reset_session, :to => "@_request"
+      delegate :headers, :status=, :location=, :content_type=,
+               :status, :location, :content_type, :to => "@_response"
+      attr_internal :request
+    end
+
+    def dispatch(action, env)
+      @_request = ActionDispatch::Request.new(env)
+      @_response = ActionDispatch::Response.new
+      @_response.request = request
+      super
+    end
+
+    def params
+      @_params ||= @_request.parameters
+    end
+
+    def response_body=(body)
+      response.body = body if response
+      super
+    end
+  end
+end