kotovalexarian-likes-github
/
sinatra
mirror of https://github.com/sinatra/sinatra
1
0
Fork 0
Code Releases Activity

Being align anal

This commit is contained in:
bmizerany 2009-01-29 16:56:57 -08:00
parent a9329421f9
commit 585ea1032b
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/sinatra/base.rb
View File

@ -82,7 +82,7 @@ module Sinatra
# Halt processing and return the error status provided. # Halt processing and return the error status provided.
def error(code, body=nil) def error(code, body=nil)
code, body = 500, code.to_str if code.respond_to? :to_str code, body = 500, code.to_str if code.respond_to? :to_str
response.body = body unless body.nil? response.body = body unless body.nil?
halt code halt code
end end
@ -198,7 +198,7 @@ module Sinatra
module Templates module Templates
def render(engine, template, options={}) def render(engine, template, options={})
data = lookup_template(engine, template, options) data = lookup_template(engine, template, options)
output = __send__("render_#{engine}", template, data, options) output = __send__("render_#{engine}", template, data, options)
layout, data = lookup_layout(engine, options) layout, data = lookup_layout(engine, options)
if layout if layout
@ -229,7 +229,7 @@ module Sinatra
return if options[:layout] == false return if options[:layout] == false
options.delete(:layout) if options[:layout] == true options.delete(:layout) if options[:layout] == true
template = options[:layout] || :layout template = options[:layout] || :layout
data = lookup_template(engine, template, options) data = lookup_template(engine, template, options)
[template, data] [template, data]
rescue Errno::ENOENT rescue Errno::ENOENT
nil nil
@ -352,7 +352,7 @@ module Sinatra
# routes # routes
if routes = self.class.routes[@request.request_method] if routes = self.class.routes[@request.request_method]
original_params = @params original_params = @params
path = @request.path_info path = @request.path_info
routes.each do |pattern, keys, conditions, block| routes.each do |pattern, keys, conditions, block|
if match = pattern.match(path) if match = pattern.match(path)
@ -421,7 +421,7 @@ module Sinatra
headers.each { |k, v| @response.headers[k] = v } if headers headers.each { |k, v| @response.headers[k] = v } if headers
elsif res.length == 2 elsif res.length == 2
@response.status = res.first @response.status = res.first
@response.body = res.last @response.body = res.last
else else
raise TypeError, "#{res.inspect} not supported" raise TypeError, "#{res.inspect} not supported"
end end
@ -448,9 +448,8 @@ module Sinatra
def handle_not_found!(boom) def handle_not_found!(boom)
@env['sinatra.error'] = boom @env['sinatra.error'] = boom
@response.status = 404
@response.status = 404 @response.body = ['<h1>Not Found</h1>']
@response.body = ['<h1>Not Found</h1>']
error_block! boom.class, NotFound error_block! boom.class, NotFound
end end
@ -638,7 +637,7 @@ module Sinatra
define_method "#{verb} #{path}", &block define_method "#{verb} #{path}", &block
unbound_method = instance_method("#{verb} #{path}") unbound_method = instance_method("#{verb} #{path}")
block = lambda { unbound_method.bind(self).call } block = lambda { unbound_method.bind(self).call }
(routes[verb] ||= []). (routes[verb] ||= []).
push([pattern, keys, conditions, block]).last push([pattern, keys, conditions, block]).last
@ -690,7 +689,7 @@ module Sinatra
def run!(options={}) def run!(options={})
set options set options
handler = detect_rack_handler handler = detect_rack_handler
handler_name = handler.name.gsub(/.*::/, '') handler_name = handler.name.gsub(/.*::/, '')
puts "== Sinatra/#{Sinatra::VERSION} has taken the stage " + puts "== Sinatra/#{Sinatra::VERSION} has taken the stage " +
"on #{port} for #{environment} with backup from #{handler_name}" "on #{port} for #{environment} with backup from #{handler_name}"
@ -737,11 +736,11 @@ module Sinatra
end end
def inherited(subclass) def inherited(subclass)
subclass.routes = dupe_routes subclass.routes = dupe_routes
subclass.templates = templates.dup subclass.templates = templates.dup
subclass.conditions = [] subclass.conditions = []
subclass.filters = filters.dup subclass.filters = filters.dup
subclass.errors = errors.dup subclass.errors = errors.dup
subclass.middleware = middleware.dup subclass.middleware = middleware.dup
subclass.send :reset_middleware subclass.send :reset_middleware
super super