提交 b480da5c 编写于 作者: J Joshua Peek

Coerce all out going body parts to Strings

上级 570f055c
......@@ -39,6 +39,7 @@ module ActionDispatch
autoload :Rescue, 'action_dispatch/middleware/rescue'
autoload :ShowExceptions, 'action_dispatch/middleware/show_exceptions'
autoload :Static, 'action_dispatch/middleware/static'
autoload :StringCoercion, 'action_dispatch/middleware/string_coercion'
autoload :Assertions, 'action_dispatch/testing/assertions'
autoload :Integration, 'action_dispatch/testing/integration'
......
module ActionDispatch
class StringCoercion
class UglyBody < ActiveSupport::BasicObject
def initialize(body)
@body = body
end
def each
@body.each do |part|
yield part.to_s
end
end
private
def method_missing(*args, &block)
@body.__send__(*args, &block)
end
end
def initialize(app)
@app = app
end
def call(env)
status, headers, body = @app.call(env)
[status, headers, UglyBody.new(body)]
end
end
end
......@@ -93,6 +93,7 @@ class ActiveSupport::TestCase
class ActionController::IntegrationTest < ActiveSupport::TestCase
def self.build_app(routes = nil)
ActionDispatch::MiddlewareStack.new { |middleware|
middleware.use "ActionDispatch::StringCoercion"
middleware.use "ActionDispatch::ShowExceptions"
middleware.use "ActionDispatch::Callbacks"
middleware.use "ActionDispatch::ParamsParser"
......
require 'abstract_unit'
class StringCoercionTest < ActiveSupport::TestCase
test "body responds to each" do
original_body = []
body = ActionDispatch::StringCoercion::UglyBody.new(original_body)
assert original_body.respond_to?(:each)
assert body.respond_to?(:each)
end
test "body responds to to_path" do
original_body = []
def original_body.to_path; end
body = ActionDispatch::StringCoercion::UglyBody.new(original_body)
assert original_body.respond_to?(:to_path)
assert body.respond_to?(:to_path)
end
test "body does not responds to to_path" do
original_body = []
body = ActionDispatch::StringCoercion::UglyBody.new(original_body)
assert !original_body.respond_to?(:to_path)
assert !body.respond_to?(:to_path)
end
test "calls to_s on body parts" do
app = lambda { |env|
[200, {'Content-Type' => 'html'}, [1, 2, 3]]
}
app = ActionDispatch::StringCoercion.new(app)
parts = []
status, headers, body = app.call({})
body.each { |part| parts << part }
assert_equal %w( 1 2 3 ), parts
end
end
......@@ -271,6 +271,7 @@ def self.run(initializer = nil, config = nil)
configuration.middleware.use(ActionDispatch::ParamsParser)
configuration.middleware.use(::Rack::MethodOverride)
configuration.middleware.use(::Rack::Head)
configuration.middleware.use(ActionDispatch::StringCoercion)
end
end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册