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

Use Kernel#caller_locations (2.x) #1491

Merged
merged 6 commits into from
Oct 6, 2021
Merged

Use Kernel#caller_locations (2.x) #1491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1f6ad76
Avoid shadowing caller_locations
julik Nov 5, 2018
ca1d379
Add an implementation of Location for older Rubies
julik Nov 5, 2018
9339e78
The "z" was only needed to verify that tests pass
julik Nov 5, 2018
ac1c251
Remove the previous implementation
julik Nov 5, 2018
b3a85e1
Update method to compile block templates
jkowens Oct 4, 2021
619b696
Remove public declaration of caller_locations
jkowens Oct 6, 2021
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
13 changes: 4 additions & 9 deletions lib/sinatra/base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,9 +903,10 @@ def compile_template(engine, data, options, views)
end

def compile_block_template(template, options, &body)
caller = settings.caller_locations.first
path = options[:path] || caller[0]
line = options[:line] || caller[1]
first_location = caller_locations.first
path, line = first_location.path, first_location.lineno
path = options[:path] || path
line = options[:line] || line
template.new(path, line.to_i, options, &body)
end
end
Expand Down Expand Up @@ -1557,12 +1558,6 @@ def caller_files
cleaned_caller(1).flatten
end

# Like caller_files, but containing Arrays rather than strings with the
# first element being the file, and the second being the line.
def caller_locations
cleaned_caller 2
end

private

# Starts the server by running the Rack Handler.
Expand Down
5 changes: 3 additions & 2 deletions sinatra-contrib/lib/sinatra/namespace.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,8 +299,9 @@ def disable(*opts)
end

def template(name, &block)
filename, line = caller_locations.first
templates[name] = [block, filename, line.to_i]
first_location = caller_locations.first
filename, line = first_location.path, first_location.lineno
templates[name] = [block, filename, line]
end

def layout(name=:layout, &block)
Expand Down