suzanne.soy/travis-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Respond with 406 if we can't return requested formats

Browse Source
This commit is contained in:
Piotr Sarnacki 2013-02-16 05:03:51 +01:00
parent 212eb6d9d3
commit 65b1e6b988
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/travis/api/app/helpers/respond_with.rb
View File

@ -24,12 +24,14 @@ class Travis::Api::App
def respond(resource, options) def respond(resource, options)
resource = apply_service_responder(resource, options) resource = apply_service_responder(resource, options)
acceptable_formats.find do |accept| response = acceptable_formats.find do |accept|
responders(resource, options).find do |const| responders(resource, options).find do |const|
responder = const.new(self, resource, options.dup.merge(accept: accept)) responder = const.new(self, resource, options.dup.merge(accept: accept))
responder.apply if responder.apply? responder.apply if responder.apply?
end end
end end
response || (resource ? error(406) : error(404))
end end
def apply_service_responder(resource, options) def apply_service_responder(resource, options)

5
spec/integration/formats_handling_spec.rb
View File

@ -24,4 +24,9 @@ describe 'App' do
response = get '/foo', {}, 'HTTP_ACCEPT' => 'image/jpeg, application/json' response = get '/foo', {}, 'HTTP_ACCEPT' => 'image/jpeg, application/json'
response.content_type.should =~ /^application\/json/ response.content_type.should =~ /^application\/json/
end end
it 'responds with 406 if server can\'t use any mime type' do
response = get '/foo/hash', {}, 'HTTP_ACCEPT' => 'text/plain, image/jpeg'
response.status.should == 406
end
end end