0
@@ -34,7 +34,11 @@ module Sinatra
0
   Result = Struct.new(:block, :params, :status) unless defined?(Result)
0
   
0
   def application
0
-    @app ||= Application.new
0
+    unless @app 
0
+      @app = Application.new
0
+      Sinatra::Environment.setup!
0
+    end
0
+    @app
0
   end
0
   
0
   def application=(app)
0
@@ -780,7 +784,6 @@ end
0
 at_exit do
0
   raise $! if $!
0
   if Sinatra.application.options.run
0
-    Sinatra::Environment.setup!
0
     Sinatra.run 
0
   end
0
 end

0
@@ -1,16 +1,24 @@
0
 require File.dirname(__FILE__) + '/helper'
0
 
0
+class TesterWithEach
0
+  def each
0
+    yield 'foo'
0
+    yield 'bar'
0
+    yield 'baz'
0
+  end
0
+end
0
+
0
 context "Looking up a request" do
0
 
0
   setup do
0
-    @app = Sinatra::Application.new
0
+    Sinatra.application = nil
0
   end
0
 
0
   specify "returns what's at the end" do
0
     block = Proc.new { 'Hello' }
0
-    @app.define_event(:get, '/', &block)
0
-        
0
-    result = @app.lookup(
0
+    get '/', &block
0
+    
0
+    result = Sinatra.application.lookup(
0
       'REQUEST_METHOD' => 'GET',
0
       'PATH_INFO' => '/'
0
     )
0
@@ -21,9 +29,9 @@ context "Looking up a request" do
0
   
0
   specify "takes params in path" do
0
     block = Proc.new { 'Hello' }
0
-    @app.define_event(:get, '/:foo', &block)
0
+    get '/:foo', &block
0
     
0
-    result = @app.lookup(
0
+    result = Sinatra.application.lookup(
0
       'REQUEST_METHOD' => 'GET',
0
       'PATH_INFO' => '/bar'
0
     )
0
@@ -38,60 +46,48 @@ end
0
 context "An app returns" do
0
   
0
   setup do
0
-    @app = Sinatra::Application.new
0
+    Sinatra.application = nil
0
   end
0
     
0
   specify "404 if no events found" do
0
     request = Rack::MockRequest.new(@app)
0
-    result = request.get('/')
0
-    result.should.be.not_found
0
-    result.body.should.equal '<h1>Not Found</h1>'
0
+    get_it '/'
0
+    should.be.not_found
0
+    body.should.equal '<h1>Not Found</h1>'
0
   end
0
   
0
   specify "200 if success" do
0
-    @app.define_event(:get, '/') do
0
+    get '/' do
0
       'Hello World'
0
     end
0
-    
0
-    request = Rack::MockRequest.new(@app)
0
-    result = request.get('/')
0
-    result.should.be.ok
0
-    result.body.should.equal 'Hello World'
0
+    get_it '/'
0
+    should.be.ok
0
+    body.should.equal 'Hello World'
0
   end
0
   
0
   specify "an objects result from each if it has it" do
0
     
0
-    class TesterWithEach
0
-      def each
0
-        yield 'foo'
0
-        yield 'bar'
0
-        yield 'baz'
0
-      end
0
-    end
0
-    
0
-    @app.define_event(:get, '/') do
0
+    get '/' do
0
       TesterWithEach.new
0
     end
0
     
0
-    request = Rack::MockRequest.new(@app)
0
-    result = request.get('/')
0
-    result.should.be.ok
0
-    result.body.should.equal 'foobarbaz'
0
-    
0
+    get_it '/'
0
+    should.be.ok
0
+    body.should.equal 'foobarbaz'
0
+
0
   end
0
   
0
   specify "the body set if set before the last" do
0
         
0
-    @app.define_event(:get, '/') do
0
+    get '/' do
0
       body 'Blake'
0
       'Mizerany'
0
     end
0
     
0
-    request = Rack::MockRequest.new(@app)
0
-    result = request.get('/')
0
-    result.should.be.ok
0
-    result.body.should.equal 'Blake'
0
-    
0
+    get_it '/'
0
+    should.be.ok
0
+    body.should.equal 'Blake'
0
+
0
   end
0
   
0
 end
0
@@ -99,51 +95,47 @@ end
0
 context "Events in an app" do
0
   
0
   setup do
0
-    @app = Sinatra::Application.new
0
+    Sinatra.application = nil
0
   end
0
   
0
   specify "evaluate in a clean context" do
0
-    Sinatra::EventContext.class_eval do
0
+    helpers do
0
       def foo
0
         'foo'
0
       end
0
     end
0
     
0
-    @app.define_event(:get, '/foo') do
0
+    get '/foo' do
0
       foo
0
     end
0
     
0
-    request = Rack::MockRequest.new(@app)
0
-    result = request.get('/foo')
0
-    result.should.be.ok
0
-    result.body.should.equal 'foo'
0
+    get_it '/foo'
0
+    should.be.ok
0
+    body.should.equal 'foo'
0
   end
0
   
0
   specify "get access to request, response, and params" do
0
-    @app.define_event(:get, '/:foo') do
0
+    get '/:foo' do
0
       params[:foo] + params[:bar]
0
     end
0
     
0
-    request = Rack::MockRequest.new(@app)
0
-    result = request.get('/foo?bar=baz')
0
-    result.should.be.ok
0
-    result.body.should.equal 'foobaz'
0
+    get_it '/foo?bar=baz'
0
+    should.be.ok
0
+    body.should.equal 'foobaz'
0
   end
0
   
0
   specify "can filters by agent" do
0
     
0
-    @app.define_event(:get, '/', :agent => /Windows/) do
0
+    get '/', :agent => /Windows/ do
0
       request.env['HTTP_USER_AGENT']
0
     end
0
     
0
-    request = Rack::MockRequest.new(@app)
0
-    result = request.get('/', :agent => 'Windows')
0
-    result.should.be.ok
0
-    result.body.should.equal 'Windows'
0
+    get_it '/', :agent => 'Windows'
0
+    should.be.ok
0
+    body.should.equal 'Windows'
0
 
0
-    request = Rack::MockRequest.new(@app)
0
-    result = request.get('/', :agent => 'Mac')
0
-    result.should.not.be.ok
0
+    get_it '/', :agent => 'Mac'
0
+    should.not.be.ok
0
 
0
   end
0