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

* Default error messages 

* Use SINATRA_ENV var if set
This commit is contained in:
Blake Mizerany 2007-11-29 18:35:06 -08:00
parent bd8515bbf8
commit 9ee50b3082
4 changed files with 78 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Rakefile
View File

@ -4,5 +4,6 @@ require 'rake/testtask'
task :default => :test
Rake::TestTask.new do |t|
ENV['SINATRA_ENV'] = 'test'
t.pattern = "test/*_test.rb"
end

BIN
images/404.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
images/500.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

78
lib/sinatra.rb
View File

@ -64,7 +64,7 @@ module Sinatra
class Event
URI_CHAR = '[^/?:,&#]'.freeze unless defined?(URI_CHAR)
URI_CHAR = '[^/?:,&#\.]'.freeze unless defined?(URI_CHAR)
PARAM = /:(#{URI_CHAR}+)/.freeze unless defined?(PARAM)
attr_reader :path, :block, :param_keys, :pattern
@ -328,6 +328,11 @@ def layout(name = :layout, &b)
Sinatra.application.define_layout(name, &b)
end
def configures(*envs, &b)
yield if envs.include?(Sinatra.application.options.env) ||
envs.empty?
end
### Misc Core Extensions
module Kernel
@ -445,3 +450,74 @@ at_exit do
raise $! if $!
Sinatra.run if Sinatra.application.options.run
end
ENV['SINATRA_ENV'] = 'test' if $0 =~ /_test\.rb$/
Sinatra::Application.default_options.merge!(
:env => (ENV['SINATRA_ENV'] || 'development').to_sym
)
configures :development do
get '/sinatra_custom_images/:image.png' do
File.read(File.dirname(__FILE__) + "/../images/#{params[:image]}.png")
end
error 404 do
%Q(
<html>
<body style='text-align: center; color: #888; font-family: Arial; font-size: 22px; margin: 20px'>
<h2>Sinatra doesn't know this diddy.</h2>
<img src='/sinatra_custom_images/404.png'></img>
</body>
</html>
)
end
error 500 do
@error = request.env['sinatra.error']
%Q(
<html>
<body>
<style type="text/css" media="screen">
body {
font-family: Verdana;
color: #333;
}
#content {
width: 700px;
margin-left: 20px;
}
#content h1 {
width: 99%;
color: #1D6B8D;
font-weight: bold;
}
#stacktrace {
margin-top: -20px;
}
#stacktrace pre {
font-size: 12px;
border-left: 2px solid #ddd;
padding-left: 10px;
}
#stacktrace img {
margin-top: 10px;
}
</style>
<div id="content">
<img src="/sinatra_custom_images/500.png" />
<div id="stacktrace">
<h1>#{@error.message}</h1>
<pre><code>#{@error.backtrace.join("\n")}</code></pre>
</div>
</body>
</html>
)
end
end