Merge pull request #1185 from namusyaka/fix-a-little-coding-style
A few small code-style improvements
This commit is contained in:
commit
5db06e8356
|
@ -1283,7 +1283,7 @@ module Sinatra
|
||||||
# handled.
|
# handled.
|
||||||
def error(*codes, &block)
|
def error(*codes, &block)
|
||||||
args = compile! "ERROR", /.*/, block
|
args = compile! "ERROR", /.*/, block
|
||||||
codes = codes.map { |c| Array(c) }.flatten
|
codes = codes.flat_map(&method(:Array))
|
||||||
codes << Exception if codes.empty?
|
codes << Exception if codes.empty?
|
||||||
codes << Sinatra::NotFound if codes.include?(404)
|
codes << Sinatra::NotFound if codes.include?(404)
|
||||||
codes.each { |c| (@errors[c] ||= []) << args }
|
codes.each { |c| (@errors[c] ||= []) << args }
|
||||||
|
@ -1916,7 +1916,7 @@ module Sinatra
|
||||||
set :app_file, nil
|
set :app_file, nil
|
||||||
|
|
||||||
def self.register(*extensions, &block) #:nodoc:
|
def self.register(*extensions, &block) #:nodoc:
|
||||||
added_methods = extensions.map {|m| m.public_instance_methods }.flatten
|
added_methods = extensions.flat_map(&:public_instance_methods)
|
||||||
Delegator.delegate(*added_methods)
|
Delegator.delegate(*added_methods)
|
||||||
super(*extensions, &block)
|
super(*extensions, &block)
|
||||||
end
|
end
|
||||||
|
|
|
@ -55,10 +55,10 @@ module Sinatra
|
||||||
end
|
end
|
||||||
|
|
||||||
def frame_class(frame)
|
def frame_class(frame)
|
||||||
if frame.filename =~ /lib\/sinatra.*\.rb/
|
if frame.filename =~ %r{lib/sinatra.*\.rb}
|
||||||
"framework"
|
"framework"
|
||||||
elsif (defined?(Gem) && frame.filename.include?(Gem.dir)) ||
|
elsif (defined?(Gem) && frame.filename.include?(Gem.dir)) ||
|
||||||
frame.filename =~ /\/bin\/(\w+)$/
|
frame.filename =~ %r{/bin/(\w+)\z}
|
||||||
"system"
|
"system"
|
||||||
else
|
else
|
||||||
"app"
|
"app"
|
||||||
|
|
Loading…
Reference in New Issue