mirror of
https://github.com/sinatra/sinatra
synced 2023-03-27 23:18:01 -04:00
2128dcfb31
Historically, Sinatra::Response defaults to a text/html Content-Type. However, in practice, Sinatra immediately clears this attribute after instantiating a new Sinatra::Response object, so this default is some- what suspect. Let's break this behavior and have Sinatra::Response be Content-Type-less by default, and update the tests to reflect this. Next, let's introduce a new default_content_type setting that will be applied (instead of text/html) if the Content-Type is not set before the response is finalized. This will be great for e.g. JSON API developers. Let's also make it nil-able to indicate that a default Content-Type should never be applied. Wherever Sinatra is emitting HTML, e.g. in error pages, force the Content-Type to text/html. Finally, clean up the error-handling logic to behave as follows: * Set the X-Cascade header as early as possible. * If an error block matches and returns a value, stop processing and return that value. * If we have a not found or bad request error, inspect the exception (if any) for an error message and present it as the response body if it exists, or present a default error message. The remaining logic is the same otherwise. This should make error handlers simpler to write and behave more consistently by not polluting the body with a default message when none may be necessary.
76 lines
2.3 KiB
Ruby
76 lines
2.3 KiB
Ruby
# encoding: utf-8
|
|
|
|
require File.expand_path('../helper', __FILE__)
|
|
|
|
class ResponseTest < Minitest::Test
|
|
setup { @response = Sinatra::Response.new([], 200, { 'Content-Type' => 'text/html' }) }
|
|
|
|
def assert_same_body(a, b)
|
|
assert_equal a.to_enum(:each).to_a, b.to_enum(:each).to_a
|
|
end
|
|
|
|
it "initializes with 200, text/html, and empty body" do
|
|
assert_equal 200, @response.status
|
|
assert_equal 'text/html', @response['Content-Type']
|
|
assert_equal [], @response.body
|
|
end
|
|
|
|
it 'uses case insensitive headers' do
|
|
@response['content-type'] = 'application/foo'
|
|
assert_equal 'application/foo', @response['Content-Type']
|
|
assert_equal 'application/foo', @response['CONTENT-TYPE']
|
|
end
|
|
|
|
it 'writes to body' do
|
|
@response.body = 'Hello'
|
|
@response.write ' World'
|
|
assert_equal 'Hello World', @response.body.join
|
|
end
|
|
|
|
[204, 304].each do |status_code|
|
|
it "removes the Content-Type header and body when response status is #{status_code}" do
|
|
@response.status = status_code
|
|
@response.body = ['Hello World']
|
|
assert_equal [status_code, {}, []], @response.finish
|
|
end
|
|
end
|
|
|
|
[200, 201, 202, 301, 302, 400, 401, 403, 404, 500].each do |status_code|
|
|
it "will not removes the Content-Type header and body when response status
|
|
is #{status_code}" do
|
|
@response.status = status_code
|
|
@response.body = ['Hello World']
|
|
assert_equal [
|
|
status_code,
|
|
{ 'Content-Type' => 'text/html', 'Content-Length' => '11' },
|
|
['Hello World']
|
|
], @response.finish
|
|
end
|
|
end
|
|
|
|
it 'Calculates the Content-Length using the bytesize of the body' do
|
|
@response.body = ['Hello', 'World!', '✈']
|
|
_, headers, body = @response.finish
|
|
assert_equal '14', headers['Content-Length']
|
|
assert_same_body @response.body, body
|
|
end
|
|
|
|
it 'does not call #to_ary or #inject on the body' do
|
|
object = Object.new
|
|
def object.inject(*) fail 'called' end
|
|
def object.to_ary(*) fail 'called' end
|
|
def object.each(*) end
|
|
@response.body = object
|
|
assert @response.finish
|
|
end
|
|
|
|
it 'does not nest a Sinatra::Response' do
|
|
@response.body = Sinatra::Response.new ["foo"]
|
|
assert_same_body @response.body, ["foo"]
|
|
end
|
|
|
|
it 'does not nest a Rack::Response' do
|
|
@response.body = Rack::Response.new ["foo"]
|
|
assert_same_body @response.body, ["foo"]
|
|
end
|
|
end
|