Skip to content

Fallback to default_content if wildcard present in Accept header #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
francois wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fallback to default_content if wildcard present in Accept header #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/sinatra/respond_to.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,11 @@ def wants.method_missing(type, *args, &handler)
request.accept.each do |mime_type|
break if alt = wants.keys.detect {|k| ::Sinatra::Base.mime_type(k) == mime_type}
end
format alt if alt
if alt
format alt
elsif request.accept.include?("*.*")
format settings.default_content
end
end
raise UnhandledFormat if wants[format].nil?
wants[format].call
Expand Down
6 changes: 6 additions & 0 deletions spec/extension_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,12 @@ def mime_type(sym)
last_response.body.should =~ %r{'Hiya from javascript'}
last_response.content_type.should include(mime_type(:js))
end

it "should use default_content when the first Accept header includes the wildcard" do
get "/resource", {}, {'HTTP_ACCEPT' => "text/csv;q=0.9,*.*;q=0.8"}
last_response.body.should =~ %r{\s*<html>\s*<body>Hello from HTML</body>\s*</html>\s*}
last_response.content_type.should include(mime_type(:html))
end
end

describe "routes not using respond_to" do
Expand Down