aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/new_base/rack_convenience.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-05-28 09:49:02 -0500
committerJoshua Peek <josh@joshpeek.com>2009-05-28 09:49:02 -0500
commitde203245afd2bbf7f93f3241fcf3a71a88101d47 (patch)
tree3fbae223e10f0e50da6d9fdfc2c70a742c34ac26 /actionpack/lib/action_controller/new_base/rack_convenience.rb
parentdd98280e38d640f5724887cf8a715b79f0439d2d (diff)
downloadrails-de203245afd2bbf7f93f3241fcf3a71a88101d47.tar.gz
rails-de203245afd2bbf7f93f3241fcf3a71a88101d47.tar.bz2
rails-de203245afd2bbf7f93f3241fcf3a71a88101d47.zip
Revert "Revert "Whitespace!""
This reverts commit 0cac68d3bed3e6bf8ec2eb994858e4a179046941.
Diffstat (limited to 'actionpack/lib/action_controller/new_base/rack_convenience.rb')
-rw-r--r--actionpack/lib/action_controller/new_base/rack_convenience.rb15
1 files changed, 7 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/new_base/rack_convenience.rb b/actionpack/lib/action_controller/new_base/rack_convenience.rb
index 0422ab2f14..e465acca6e 100644
--- a/actionpack/lib/action_controller/new_base/rack_convenience.rb
+++ b/actionpack/lib/action_controller/new_base/rack_convenience.rb
@@ -1,34 +1,33 @@
module ActionController
module RackConvenience
extend ActiveSupport::DependencyModule
-
+
included do
- delegate :headers, :status=, :location=,
+ delegate :headers, :status=, :location=,
:status, :location, :content_type, :to => "@_response"
attr_internal :request, :response
end
-
+
def call(name, env)
@_request = ActionDispatch::Request.new(env)
@_response = ActionDispatch::Response.new
@_response.request = request
super
end
-
+
def params
@_params ||= @_request.parameters
end
-
+
# :api: private
def to_rack
@_response.prepare!
@_response.to_a
end
-
+
def response_body=(body)
response.body = body if response
super
end
-
end
-end \ No newline at end of file
+end