mirror of
https://github.com/sinatra/sinatra
synced 2023-03-27 23:18:01 -04:00
b47ffd392a
Implement HEAD by delegating to GET handlers (when no HEAD handler registered)
and removing response body. This fixes a problem where Sinatra sent a 404
response to HEAD requests due to HEAD not having any registered handlers.
While here, make Static handlers respond only to GET and HEAD requests instead
of using GET semantics for PUT/POST/DELETE. Makes it possible for Events to
register PUT/POST/DELETE handlers for static file URLs. For instance, assuming a
file exists, `public/foo.xml`, and the following event:
put '/foo.xml' do
File.open('public/foo.xml', 'wb') do |io|
io.write(request.body.read)
end
''
end
get '/foo.xml' do
"THIS NEVER HAPPENS ... as long as /foo.xml exists on disk."
end
The built-in Static handler hits on GET and the dynamic event hits on PUT. An
important note here is that the Static handler is now registered at the head of
the events[:get] array (see Application#load_default_events! and
Application#lookup), where it was previously a special case in the lookup
method.
136 lines
2.5 KiB
Ruby
136 lines
2.5 KiB
Ruby
require File.dirname(__FILE__) + '/helper'
|
|
|
|
context "Sinatra" do
|
|
|
|
setup do
|
|
Sinatra.application = nil
|
|
end
|
|
|
|
specify "should handle result of nil" do
|
|
get '/' do
|
|
nil
|
|
end
|
|
|
|
get_it '/'
|
|
should.be.ok
|
|
body.should == ''
|
|
end
|
|
|
|
specify "handles events" do
|
|
get '/:name' do
|
|
'Hello ' + params[:name]
|
|
end
|
|
|
|
get_it '/Blake'
|
|
|
|
should.be.ok
|
|
body.should.equal 'Hello Blake'
|
|
end
|
|
|
|
specify "follows redirects" do
|
|
get '/' do
|
|
redirect '/blake'
|
|
end
|
|
|
|
get '/blake' do
|
|
'Mizerany'
|
|
end
|
|
|
|
get_it '/'
|
|
should.be.redirection
|
|
body.should.equal ''
|
|
|
|
follow!
|
|
should.be.ok
|
|
body.should.equal 'Mizerany'
|
|
end
|
|
|
|
specify "renders a body with a redirect" do
|
|
Sinatra::EventContext.any_instance.expects(:foo).returns('blah')
|
|
get "/" do
|
|
redirect 'foo', :foo
|
|
end
|
|
get_it '/'
|
|
should.be.redirection
|
|
headers['Location'].should.equal 'foo'
|
|
body.should.equal 'blah'
|
|
end
|
|
|
|
specify "body sets content and ends event" do
|
|
|
|
Sinatra::EventContext.any_instance.expects(:foo).never
|
|
|
|
get '/set_body' do
|
|
stop 'Hello!'
|
|
stop 'World!'
|
|
foo
|
|
end
|
|
|
|
get_it '/set_body'
|
|
|
|
should.be.ok
|
|
body.should.equal 'Hello!'
|
|
|
|
end
|
|
|
|
specify "delegates HEAD requests to GET handlers" do
|
|
get '/invisible' do
|
|
"I am invisible to the world"
|
|
end
|
|
|
|
head_it '/invisible'
|
|
should.be.ok
|
|
body.should.not.equal "I am invisible to the world"
|
|
body.should.equal ''
|
|
end
|
|
|
|
|
|
specify "put'n with POST" do
|
|
put '/' do
|
|
'puted'
|
|
end
|
|
post_it '/', :_method => 'PUT'
|
|
assert_equal 'puted', body
|
|
end
|
|
|
|
specify "put'n wth PUT" do
|
|
put '/' do
|
|
'puted'
|
|
end
|
|
put_it '/'
|
|
assert_equal 'puted', body
|
|
end
|
|
|
|
# Some Ajax libraries downcase the _method parameter value. Make
|
|
# sure we can handle that.
|
|
specify "put'n with POST and lowercase _method param" do
|
|
put '/' do
|
|
'puted'
|
|
end
|
|
post_it '/', :_method => 'put'
|
|
body.should.equal 'puted'
|
|
end
|
|
|
|
# Ignore any _method parameters specified in GET requests or on the query string in POST requests.
|
|
specify "not put'n with GET" do
|
|
get '/' do
|
|
'getted'
|
|
end
|
|
get_it '/', :_method => 'put'
|
|
should.be.ok
|
|
body.should.equal 'getted'
|
|
end
|
|
|
|
specify "_method query string parameter ignored on POST" do
|
|
post '/' do
|
|
'posted'
|
|
end
|
|
put '/' do
|
|
'booo'
|
|
end
|
|
post_it "/?_method=PUT"
|
|
should.be.ok
|
|
body.should.equal 'posted'
|
|
end
|
|
|
|
end
|