kotovalexarian-likes-github/sinatra
1
0
Fork 0
mirror of https://github.com/sinatra/sinatra synced 2023-03-27 23:18:01 -04:00
Code Releases Activity

use settings instead of self.class

Browse source
This commit is contained in:
Konstantin Haase 2011-03-28 18:51:16 +02:00
parent ef69971efa
commit 4e99062aab
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/sinatra/base.rb
View file

@ -582,7 +582,7 @@ module Sinatra
case case
when data.is_a?(Symbol) when data.is_a?(Symbol)
body, path, line = self.class.templates[data] body, path, line = settings.templates[data]
if body if body
body = body.call if body.respond_to?(:call) body = body.call if body.respond_to?(:call)
template.new(path, line.to_i, options) { body } template.new(path, line.to_i, options) { body }
@ -600,7 +600,7 @@ module Sinatra
end end
when data.is_a?(Proc) || data.is_a?(String) when data.is_a?(Proc) || data.is_a?(String)
body = data.is_a?(String) ? Proc.new { data } : data body = data.is_a?(String) ? Proc.new { data } : data
path, line = self.class.caller_locations.first path, line = settings.caller_locations.first
template.new(path, line.to_i, options, &body) template.new(path, line.to_i, options, &body)
else else
raise ArgumentError raise ArgumentError
@ -706,13 +706,13 @@ module Sinatra
private private
# Run filters defined on the class and all superclasses. # Run filters defined on the class and all superclasses.
def filter!(type, base = self.class) def filter!(type, base = settings)
filter! type, base.superclass if base.superclass.respond_to?(:filters) filter! type, base.superclass if base.superclass.respond_to?(:filters)
base.filters[type].each { |block| instance_eval(&block) } base.filters[type].each { |block| instance_eval(&block) }
end end
# Run routes defined on the class and all superclasses. # Run routes defined on the class and all superclasses.
def route!(base=self.class, pass_block=nil) def route!(base = settings, pass_block=nil)
if routes = base.routes[@request.request_method] if routes = base.routes[@request.request_method]
routes.each do |pattern, keys, conditions, block| routes.each do |pattern, keys, conditions, block|
pass_block = process_route(pattern, keys, conditions) do pass_block = process_route(pattern, keys, conditions) do
@ -886,7 +886,7 @@ module Sinatra
# Find an custom error block for the key(s) specified. # Find an custom error block for the key(s) specified.
def error_block!(*keys) def error_block!(*keys)
keys.each do |key| keys.each do |key|
base = self.class base = settings
while base.respond_to?(:errors) while base.respond_to?(:errors)
if block = base.errors[key] if block = base.errors[key]
# found a handler, eval and return result # found a handler, eval and return result