Commit 9ee50b308247b18326111b81272944c5c7ce2090 to nicksieger's sinatra

nicksieger / sinatra

Fork of bmizerany/sinatra
Description:	Classy web-development dressed in a DSL
Homepage:	http://sinatrarb.com
Clone URL:	git://github.com/nicksieger/sinatra.git Give this clone URL to anyone. `git clone git://github.com/nicksieger/sinatra.git`
Search Repo:

* Default error messages
* Use SINATRA_ENV var if set

Blake Mizerany (author)

Thu Nov 29 18:35:06 -0800 2007

commit 9ee50b308247b18326111b81272944c5c7ce2090
tree 2d0ec39c88f0b7f899b67f3a873a4a3b5c1297d6
parent bd8515bbf89bcb7502ef5e7099bc6f714ecbf30f

Rakefile

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

lib/sinatra.rb

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

Comments

No one has commented yet.