Skip to content
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

Fix issue with passed routes and provides #1606

Merged
merged 2 commits into from
Mar 16, 2020
Merged

Fix issue with passed routes and provides #1606

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e84e0c
Fix issue with passed routes and provides
mwpastore Feb 10, 2016
ed99b99
Merge branch 'pass-clears-content-type' of https://github.com/mwpasto…
jkowens Mar 16, 2020
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
Next Next commit
Fix issue with passed routes and provides
  • Loading branch information
@mwpastore
mwpastore committed Feb 12, 2016
commit 8e84e0c60c61ce66d895e3b8ccb3ec22c5981211
13 changes: 11 additions & 2 deletions lib/sinatra/base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -882,6 +882,7 @@ def initialize(app = nil)
super()
@app = app
@template_cache = Tilt::Cache.new
@pinned_response = nil # whether a before! filter pinned the content-type
yield self if block_given?
end

Expand Down Expand Up @@ -956,15 +957,21 @@ def forward
private

# Run filters defined on the class and all superclasses.
# Accepts an optional block to call after each filter is applied.
def filter!(type, base = settings)
filter! type, base.superclass if base.superclass.respond_to?(:filters)
base.filters[type].each { |args| process_route(*args) }
base.filters[type].each do |args|
result = process_route(*args)
yield result if block_given?
end
end

# Run routes defined on the class and all superclasses.
def route!(base = settings, pass_block = nil)
if routes = base.routes[@request.request_method]
routes.each do |pattern, keys, conditions, block|
@response['Content-Type'] = nil unless @pinned_response

returned_pass_block = process_route(pattern, keys, conditions) do |*args|
env['sinatra.route'] = block.instance_variable_get(:@route_name)
route_eval { block[*args] }
Expand Down Expand Up @@ -1080,7 +1087,9 @@ def invoke
def dispatch!
invoke do
static! if settings.static? && (request.get? || request.head?)
filter! :before
filter! :before do
@pinned_response = !@response['Content-Type'].nil?
end
route!
end
rescue ::Exception => boom
Expand Down
22 changes: 22 additions & 0 deletions test/routing_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1063,6 +1063,28 @@ class RoutingTest < Minitest::Test
assert_body 'html'
end

it "doesn't allow provides of passed routes to interfere with provides of other routes" do
mock_app do
get('/:foo', :provides => :txt) do
pass if params[:foo] != 'foo'

'foo'
end

get('/bar', :provides => :html) { 'bar' }
end

get '/foo', {}, { 'HTTP_ACCEPT' => '*/*' }
assert ok?
assert_equal 'text/plain;charset=utf-8', response.headers['Content-Type']
assert_body 'foo'

get '/bar', {}, { 'HTTP_ACCEPT' => '*/*' }
assert ok?
assert_equal 'text/html;charset=utf-8', response.headers['Content-Type']
assert_body 'bar'
end

it "allows multiple mime types for accept header" do
types = ['image/jpeg', 'image/pjpeg']

Expand Down