sinatra 1.3.6 → 1.4.0.a

data/test/helpers_test.rb

@@ -10,7 +10,7 @@ class HelpersTest < Test::Unit::TestCase
     code += 2 if [204, 205, 304].include? code
     block ||= proc { }
     mock_app do
-      get '/' do
+      get('/') do
         status code
         instance_eval(&block).inspect
       end
@@ -119,36 +119,57 @@ class HelpersTest < Test::Unit::TestCase
 
   describe 'body' do
     it 'takes a block for defered body generation' do
-      mock_app {
-        get '/' do
-          body { 'Hello World' }
-        end
-      }
+      mock_app do
+        get('/') { body { 'Hello World' } }
+      end
 
       get '/'
       assert_equal 'Hello World', body
     end
 
     it 'takes a String, Array, or other object responding to #each' do
-      mock_app {
+      mock_app { get('/') { body 'Hello World' } }
+
+      get '/'
+      assert_equal 'Hello World', body
+    end
+
+    it 'can be used with other objects' do
+      mock_app do
         get '/' do
-          body 'Hello World'
+          body :hello => 'from json'
         end
-      }
+
+        after do
+          if Hash === response.body
+            body response.body[:hello]
+          end
+        end
+      end
 
       get '/'
-      assert_equal 'Hello World', body
+      assert_body 'from json'
+    end
+
+    it 'can be set in after filter' do
+      mock_app do
+        get('/') { body 'route'  }
+        after    { body 'filter' }
+      end
+
+      get '/'
+      assert_body 'filter'
     end
   end
 
   describe 'redirect' do
     it 'uses a 302 when only a path is given' do
-      mock_app {
-        get '/' do
+      mock_app do
+        get('/') do
           redirect '/foo'
           fail 'redirect should halt'
         end
-      }
+      end
 
       get '/'
       assert_equal 302, status
@@ -157,12 +178,12 @@ class HelpersTest < Test::Unit::TestCase
     end
 
     it 'uses the code given when specified' do
-      mock_app {
-        get '/' do
+      mock_app do
+        get('/') do
           redirect '/foo', 301
           fail 'redirect should halt'
         end
-      }
+      end
 
       get '/'
       assert_equal 301, status
@@ -171,11 +192,7 @@ class HelpersTest < Test::Unit::TestCase
     end
 
     it 'redirects back to request.referer when passed back' do
-      mock_app {
-        get '/try_redirect' do
-          redirect back
-        end
-      }
+      mock_app { get('/try_redirect') { redirect back } }
 
       request = Rack::MockRequest.new(@app)
       response = request.get('/try_redirect', 'HTTP_REFERER' => '/foo')
@@ -184,11 +201,7 @@ class HelpersTest < Test::Unit::TestCase
     end
 
     it 'redirects using a non-standard HTTP port' do
-      mock_app {
-        get '/' do
-          redirect '/foo'
-        end
-      }
+      mock_app { get('/') { redirect '/foo' } }
 
       request = Rack::MockRequest.new(@app)
       response = request.get('/', 'SERVER_PORT' => '81')
@@ -196,11 +209,7 @@ class HelpersTest < Test::Unit::TestCase
     end
 
     it 'redirects using a non-standard HTTPS port' do
-      mock_app {
-        get '/' do
-          redirect '/foo'
-        end
-      }
+      mock_app { get('/') { redirect '/foo' } }
 
       request = Rack::MockRequest.new(@app)
       response = request.get('/', 'SERVER_PORT' => '444')
@@ -209,7 +218,7 @@ class HelpersTest < Test::Unit::TestCase
 
     it 'uses 303 for post requests if request is HTTP 1.1' do
       mock_app { post('/') { redirect '/'} }
-      post '/', {}, 'HTTP_VERSION' => 'HTTP/1.1'
+      post('/', {}, 'HTTP_VERSION' => 'HTTP/1.1')
       assert_equal 303, status
       assert_equal '', body
       assert_equal 'http://example.org/', response['Location']
@@ -217,18 +226,14 @@ class HelpersTest < Test::Unit::TestCase
 
     it 'uses 302 for post requests if request is HTTP 1.0' do
       mock_app { post('/') { redirect '/'} }
-      post '/', {}, 'HTTP_VERSION' => 'HTTP/1.0'
+      post('/', {}, 'HTTP_VERSION' => 'HTTP/1.0')
       assert_equal 302, status
       assert_equal '', body
       assert_equal 'http://example.org/', response['Location']
     end
 
     it 'works behind a reverse proxy' do
-      mock_app do
-        get '/' do
-          redirect '/foo'
-        end
-      end
+      mock_app { get('/') { redirect '/foo' } }
 
       request = Rack::MockRequest.new(@app)
       response = request.get('/', 'HTTP_X_FORWARDED_HOST' => 'example.com', 'SERVER_PORT' => '8080')
@@ -237,7 +242,7 @@ class HelpersTest < Test::Unit::TestCase
 
     it 'accepts absolute URIs' do
       mock_app do
-        get '/' do
+        get('/') do
           redirect 'http://google.com'
           fail 'redirect should halt'
         end
@@ -251,7 +256,7 @@ class HelpersTest < Test::Unit::TestCase
 
     it 'accepts absolute URIs with a different schema' do
       mock_app do
-        get '/' do
+        get('/') do
           redirect 'mailto:jsmith@example.com'
           fail 'redirect should halt'
         end
@@ -262,16 +267,27 @@ class HelpersTest < Test::Unit::TestCase
       assert_equal '', body
       assert_equal 'mailto:jsmith@example.com', response['Location']
     end
+
+    it 'accepts a URI object instead of a String' do
+      mock_app do
+        get('/') { redirect URI.parse('http://sinatrarb.com') }
+      end
+
+      get '/'
+      assert_equal 302, status
+      assert_equal '', body
+      assert_equal 'http://sinatrarb.com', response['Location']
+    end
   end
 
   describe 'error' do
     it 'sets a status code and halts' do
-      mock_app {
-        get '/' do
+      mock_app do
+        get('/') do
           error 501
           fail 'error should halt'
         end
-      }
+      end
 
       get '/'
       assert_equal 501, status
@@ -279,25 +295,103 @@ class HelpersTest < Test::Unit::TestCase
     end
 
     it 'takes an optional body' do
-      mock_app {
-        get '/' do
+      mock_app do
+        get('/') do
           error 501, 'FAIL'
           fail 'error should halt'
         end
-      }
+      end
 
       get '/'
       assert_equal 501, status
       assert_equal 'FAIL', body
     end
 
-    it 'uses a 500 status code when first argument is a body' do
-      mock_app {
+    it 'should not invoke error handler when setting status inside an error handler' do
+      mock_app do
+        disable :raise_errors
+        not_found do
+          body "not_found handler"
+          status 404
+        end
+
+        error do
+          body "error handler"
+          status 404
+        end
+
+        get '/' do
+          raise
+        end
+      end
+
+      get '/'
+      assert_equal 404, status
+      assert_equal 'error handler', body
+    end
+
+    it 'should not reset the content-type to html for error handlers' do
+      mock_app do
+        disable :raise_errors
+        before    { content_type "application/json;charset=utf-8" }
+        not_found { JSON.dump("error" => "Not Found") }
+      end
+
+      get '/'
+      assert_equal 404, status
+      assert_equal 'application/json;charset=utf-8', response.content_type
+    end
+
+    it 'should not invoke error handler when halting with 500 inside an error handler' do
+      mock_app do
+        disable :raise_errors
+        not_found do
+          body "not_found handler"
+          halt 404
+        end
+
+        error do
+          body "error handler"
+          halt 404
+        end
+
         get '/' do
+          raise
+        end
+      end
+
+      get '/'
+      assert_equal 404, status
+      assert_equal 'error handler', body
+    end
+
+    it 'should not invoke not_found handler when halting with 404 inside a not found handler' do
+      mock_app do
+        disable :raise_errors
+
+        not_found do
+          body "not_found handler"
+          halt 500
+        end
+
+        error do
+          body "error handler"
+          halt 500
+        end
+      end
+
+      get '/'
+      assert_equal 500, status
+      assert_equal 'not_found handler', body
+    end
+
+    it 'uses a 500 status code when first argument is a body' do
+      mock_app do
+        get('/') do
           error 'FAIL'
           fail 'error should halt'
         end
-      }
+      end
 
       get '/'
       assert_equal 500, status
@@ -307,12 +401,12 @@ class HelpersTest < Test::Unit::TestCase
 
   describe 'not_found' do
     it 'halts with a 404 status' do
-      mock_app {
-        get '/' do
+      mock_app do
+        get('/') do
           not_found
           fail 'not_found should halt'
         end
-      }
+      end
 
       get '/'
       assert_equal 404, status
@@ -320,12 +414,12 @@ class HelpersTest < Test::Unit::TestCase
     end
 
     it 'does not set a X-Cascade header' do
-      mock_app {
-        get '/' do
+      mock_app do
+        get('/') do
           not_found
           fail 'not_found should halt'
         end
-      }
+      end
 
       get '/'
       assert_equal 404, status
@@ -335,12 +429,12 @@ class HelpersTest < Test::Unit::TestCase
 
   describe 'headers' do
     it 'sets headers on the response object when given a Hash' do
-      mock_app {
-        get '/' do
+      mock_app do
+        get('/') do
           headers 'X-Foo' => 'bar', 'X-Baz' => 'bling'
           'kthx'
         end
-      }
+      end
 
       get '/'
       assert ok?
@@ -350,12 +444,12 @@ class HelpersTest < Test::Unit::TestCase
     end
 
     it 'returns the response headers hash when no hash provided' do
-      mock_app {
-        get '/' do
+      mock_app do
+        get('/') do
           headers['X-Foo'] = 'bar'
           'kthx'
         end
-      }
+      end
 
       get '/'
       assert ok?
@@ -365,30 +459,30 @@ class HelpersTest < Test::Unit::TestCase
 
   describe 'session' do
     it 'uses the existing rack.session' do
-      mock_app {
-        get '/' do
+      mock_app do
+        get('/') do
           session[:foo]
         end
-      }
+      end
 
-      get '/', {}, { 'rack.session' => { :foo => 'bar' } }
+      get('/', {}, { 'rack.session' => { :foo => 'bar' } })
       assert_equal 'bar', body
     end
 
     it 'creates a new session when none provided' do
-      mock_app {
+      mock_app do
         enable :sessions
 
-        get '/' do
+        get('/') do
           assert session[:foo].nil?
           session[:foo] = 'bar'
           redirect '/hi'
         end
 
-        get '/hi' do
+        get('/hi') do
           "hi #{session[:foo]}"
         end
-      }
+      end
 
       get '/'
       follow_redirect!
@@ -398,7 +492,8 @@ class HelpersTest < Test::Unit::TestCase
     it 'inserts session middleware' do
       mock_app do
         enable :sessions
-        get '/' do
+
+        get('/') do
           assert env['rack.session']
           assert env['rack.session.options']
           'ok'
@@ -412,7 +507,8 @@ class HelpersTest < Test::Unit::TestCase
     it 'sets a default session secret' do
       mock_app do
         enable :sessions
-        get '/' do
+
+        get('/') do
           secret = env['rack.session.options'][:secret]
           assert secret
           assert_equal secret, settings.session_secret
@@ -428,23 +524,22 @@ class HelpersTest < Test::Unit::TestCase
       mock_app do
         enable :sessions
         disable :session_secret
-        get '/' do
+
+        get('/') do
           assert !env['rack.session.options'].include?(:session_secret)
           'ok'
         end
       end
 
-      # Silence warnings since Rack::Session::Cookie complains about the non-present session secret
-      silence_warnings do
-        get '/'
-      end
+      get '/'
       assert_body 'ok'
     end
 
     it 'accepts an options hash' do
       mock_app do
         set :sessions, :foo => :bar
-        get '/' do
+
+        get('/') do
           assert_equal env['rack.session.options'][:foo], :bar
           'ok'
         end
@@ -479,13 +574,13 @@ class HelpersTest < Test::Unit::TestCase
   end
 
   test 'Base.mime_type registers mime type' do
-    mock_app {
+    mock_app do
       mime_type :foo, 'application/foo'
 
-      get '/' do
+      get('/') do
         "foo is #{mime_type(:foo)}"
       end
-    }
+    end
 
     get '/'
     assert_equal 'foo is application/foo', body
@@ -493,12 +588,12 @@ class HelpersTest < Test::Unit::TestCase
 
   describe 'content_type' do
     it 'sets the Content-Type header' do
-      mock_app {
-        get '/' do
+      mock_app do
+        get('/') do
           content_type 'text/plain'
           'Hello World'
         end
-      }
+      end
 
       get '/'
       assert_equal 'text/plain;charset=utf-8', response['Content-Type']
@@ -506,12 +601,12 @@ class HelpersTest < Test::Unit::TestCase
     end
 
     it 'takes media type parameters (like charset=)' do
-      mock_app {
-        get '/' do
+      mock_app do
+        get('/') do
           content_type 'text/html', :charset => 'latin1'
           "<h1>Hello, World</h1>"
         end
-      }
+      end
 
       get '/'
       assert ok?
@@ -521,12 +616,12 @@ class HelpersTest < Test::Unit::TestCase
 
     it "looks up symbols in Rack's mime types dictionary" do
       Rack::Mime::MIME_TYPES['.foo'] = 'application/foo'
-      mock_app {
-        get '/foo.xml' do
+      mock_app do
+        get('/foo.xml') do
           content_type :foo
           "I AM FOO"
         end
-      }
+      end
 
       get '/foo.xml'
       assert ok?
@@ -535,12 +630,12 @@ class HelpersTest < Test::Unit::TestCase
     end
 
     it 'fails when no mime type is registered for the argument provided' do
-      mock_app {
-        get '/foo.xml' do
+      mock_app do
+        get('/foo.xml') do
           content_type :bizzle
           "I AM FOO"
         end
-      }
+      end
 
       assert_raise(RuntimeError) { get '/foo.xml' }
     end
@@ -552,7 +647,7 @@ class HelpersTest < Test::Unit::TestCase
         mime_type :bar, 'application/bar'
         mime_type :baz, 'application/baz'
         add_charset << mime_type(:baz)
-        get '/' do
+        get('/') do
           assert_equal content_type(:txt),    'text/plain;charset=utf-8'
           assert_equal content_type(:css),    'text/css;charset=utf-8'
           assert_equal content_type(:html),   'text/html;charset=utf-8'
@@ -568,70 +663,97 @@ class HelpersTest < Test::Unit::TestCase
           "done"
         end
       end
+
       get '/'
       assert tests_ran
     end
 
     it 'handles already present params' do
       mock_app do
-        get '/' do
+        get('/') do
           content_type 'foo/bar;level=1', :charset => 'utf-8'
           'ok'
         end
       end
+
       get '/'
       assert_equal 'foo/bar;level=1, charset=utf-8', response['Content-Type']
     end
 
     it 'does not add charset if present' do
       mock_app do
-        get '/' do
+        get('/') do
           content_type 'text/plain;charset=utf-16'
           'ok'
         end
       end
+
       get '/'
       assert_equal 'text/plain;charset=utf-16', response['Content-Type']
     end
+
+    it 'properly encodes parameters with delimiter characters' do
+      mock_app do
+        before '/comma' do
+          content_type 'image/png', :comment => 'Hello, world!'
+        end
+        before '/semicolon' do
+          content_type 'image/png', :comment => 'semi;colon'
+        end
+        before '/quote' do
+          content_type 'image/png', :comment => '"Whatever."'
+        end
+
+        get('*') { 'ok' }
+      end
+
+      get '/comma'
+      assert_equal 'image/png;comment="Hello, world!"', response['Content-Type']
+      get '/semicolon'
+      assert_equal 'image/png;comment="semi;colon"', response['Content-Type']
+      get '/quote'
+      assert_equal 'image/png;comment="\"Whatever.\""', response['Content-Type']
+    end
   end
 
   describe 'attachment' do
     def attachment_app(filename=nil)
-      mock_app {       
-        get '/attachment' do
+      mock_app do
+        get('/attachment') do
           attachment filename
           response.write("<sinatra></sinatra>")
         end
-      }
+      end
     end
-    
+
     it 'sets the Content-Type response header' do
       attachment_app('test.xml')
       get '/attachment'
       assert_equal 'application/xml;charset=utf-8', response['Content-Type']
       assert_equal '<sinatra></sinatra>', body
-    end 
-    
+    end
+
     it 'sets the Content-Type response header without extname' do
       attachment_app('test')
       get '/attachment'
       assert_equal 'text/html;charset=utf-8', response['Content-Type']
-      assert_equal '<sinatra></sinatra>', body   
+      assert_equal '<sinatra></sinatra>', body
     end
-    
+
     it 'sets the Content-Type response header with extname' do
       mock_app do
-        get '/attachment' do
+        get('/attachment') do
           content_type :atom
           attachment 'test.xml'
           response.write("<sinatra></sinatra>")
         end
       end
+
       get '/attachment'
       assert_equal 'application/atom+xml', response['Content-Type']
-      assert_equal '<sinatra></sinatra>', body   
+      assert_equal '<sinatra></sinatra>', body
     end
-    
+
   end
 
   describe 'send_file' do
@@ -700,9 +822,7 @@ class HelpersTest < Test::Unit::TestCase
 
     it "returns a 404 when not found" do
       mock_app {
-        get '/' do
-          send_file 'this-file-does-not-exist.txt'
-        end
+        get('/') { send_file 'this-file-does-not-exist.txt' }
       }
       get '/'
       assert not_found?
@@ -720,10 +840,16 @@ class HelpersTest < Test::Unit::TestCase
       assert_equal 'attachment; filename="file.txt"', response['Content-Disposition']
     end
 
+    it "does not set add a file name if filename is false" do
+      send_file_app :disposition => 'inline', :filename => false
+      get '/file.txt'
+      assert_equal 'inline', response['Content-Disposition']
+    end
+
     it "sets the Content-Disposition header when :disposition set to 'inline'" do
       send_file_app :disposition => 'inline'
       get '/file.txt'
-      assert_equal 'inline', response['Content-Disposition']
+      assert_equal 'inline; filename="file.txt"', response['Content-Disposition']
     end
 
     it "sets the Content-Disposition header when :filename provided" do
@@ -732,6 +858,12 @@ class HelpersTest < Test::Unit::TestCase
       assert_equal 'attachment; filename="foo.txt"', response['Content-Disposition']
     end
 
+    it 'allows setting a custom status code' do
+      send_file_app :status => 201
+      get '/file.txt'
+      assert_status 201
+    end
+
     it "is able to send files with unkown mime type" do
       @file = File.dirname(__FILE__) + '/file.foobar'
       File.open(@file, 'wb') { |io| io.write('Hello World') }
@@ -743,7 +875,7 @@ class HelpersTest < Test::Unit::TestCase
     it "does not override Content-Type if already set and no explicit type is given" do
       path = @file
       mock_app do
-        get '/' do
+        get('/') do
           content_type :png
           send_file path
         end
@@ -755,7 +887,7 @@ class HelpersTest < Test::Unit::TestCase
     it "does override Content-Type even if already set, if explicit type is given" do
       path = @file
       mock_app do
-        get '/' do
+        get('/') do
           content_type :png
           send_file path, :type => :gif
         end
@@ -768,12 +900,12 @@ class HelpersTest < Test::Unit::TestCase
   describe 'cache_control' do
     setup do
       mock_app do
-        get '/foo' do
+        get('/foo') do
           cache_control :public, :no_cache, :max_age => 60.0
           'Hello World'
         end
 
-        get '/bar' do
+        get('/bar') do
           cache_control :public, :no_cache
           'Hello World'
         end
@@ -794,20 +926,16 @@ class HelpersTest < Test::Unit::TestCase
   describe 'expires' do
     setup do
       mock_app do
-        get '/foo' do
+        get('/foo') do
           expires 60, :public, :no_cache
           'Hello World'
         end
 
-        get '/bar' do
-          expires Time.now
-        end
+        get('/bar') { expires Time.now }
 
-        get '/baz' do
-          expires Time.at(0)
-        end
+        get('/baz') { expires Time.at(0) }
 
-        get '/blah' do
+        get('/blah') do
           obj = Object.new
           def obj.method_missing(*a, &b) 60.send(*a, &b) end
           def obj.is_a?(thing) 60.is_a?(thing) end
@@ -815,9 +943,7 @@ class HelpersTest < Test::Unit::TestCase
           'Hello World'
         end
 
-        get '/boom' do
-          expires '9999'
-        end
+        get('/boom') { expires '9999' }
       end
     end
 
@@ -853,9 +979,7 @@ class HelpersTest < Test::Unit::TestCase
 
   describe 'last_modified' do
     it 'ignores nil' do
-      mock_app do
-        get '/' do last_modified nil; 200; end
-      end
+      mock_app { get('/') { last_modified nil; 200; } }
 
       get '/'
       assert ! response['Last-Modified']
@@ -863,7 +987,7 @@ class HelpersTest < Test::Unit::TestCase
 
     it 'does not change a status other than 200' do
       mock_app do
-        get '/' do
+        get('/') do
           status 299
           last_modified Time.at(0)
           'ok'
@@ -880,7 +1004,7 @@ class HelpersTest < Test::Unit::TestCase
       describe "with #{last_modified_time.class.name}" do
         setup do
           mock_app do
-            get '/' do
+            get('/') do
               last_modified last_modified_time
               'Boo!'
             end
@@ -907,12 +1031,12 @@ class HelpersTest < Test::Unit::TestCase
 
         context "when there's an invalid If-Modified-Since header" do
           it 'sets the Last-Modified header to a valid RFC 2616 date value' do
-            get '/', {}, { 'HTTP_IF_MODIFIED_SINCE' => 'a really weird date' }
+            get('/', {}, { 'HTTP_IF_MODIFIED_SINCE' => 'a really weird date' })
             assert_equal @last_modified_time.httpdate, response['Last-Modified']
           end
 
           it 'conditional GET misses and returns a body' do
-            get '/', {}, { 'HTTP_IF_MODIFIED_SINCE' => 'a really weird date' }
+            get('/', {}, { 'HTTP_IF_MODIFIED_SINCE' => 'a really weird date' })
             assert_equal 200, status
             assert_equal 'Boo!', body
           end
@@ -920,28 +1044,28 @@ class HelpersTest < Test::Unit::TestCase
 
         context "when the resource has been modified since the If-Modified-Since header date" do
           it 'sets the Last-Modified header to a valid RFC 2616 date value' do
-            get '/', {}, { 'HTTP_IF_MODIFIED_SINCE' => (@last_modified_time - 1).httpdate }
+            get('/', {}, { 'HTTP_IF_MODIFIED_SINCE' => (@last_modified_time - 1).httpdate })
             assert_equal @last_modified_time.httpdate, response['Last-Modified']
           end
 
           it 'conditional GET misses and returns a body' do
-            get '/', {}, { 'HTTP_IF_MODIFIED_SINCE' => (@last_modified_time - 1).httpdate }
+            get('/', {}, { 'HTTP_IF_MODIFIED_SINCE' => (@last_modified_time - 1).httpdate })
             assert_equal 200, status
             assert_equal 'Boo!', body
           end
 
           it 'does not rely on string comparison' do
             mock_app do
-              get '/compare' do
+              get('/compare') do
                 last_modified "Mon, 18 Oct 2010 20:57:11 GMT"
                 "foo"
               end
             end
 
-            get '/compare', {}, { 'HTTP_IF_MODIFIED_SINCE' => 'Sun, 26 Sep 2010 23:43:52 GMT' }
+            get('/compare', {}, { 'HTTP_IF_MODIFIED_SINCE' => 'Sun, 26 Sep 2010 23:43:52 GMT' })
             assert_equal 200, status
             assert_equal 'foo', body
-            get '/compare', {}, { 'HTTP_IF_MODIFIED_SINCE' => 'Sun, 26 Sep 2030 23:43:52 GMT' }
+            get('/compare', {}, { 'HTTP_IF_MODIFIED_SINCE' => 'Sun, 26 Sep 2030 23:43:52 GMT' })
             assert_equal 304, status
             assert_equal '', body
           end
@@ -949,12 +1073,12 @@ class HelpersTest < Test::Unit::TestCase
 
         context "when the resource has been modified on the exact If-Modified-Since header date" do
           it 'sets the Last-Modified header to a valid RFC 2616 date value' do
-            get '/', {}, { 'HTTP_IF_MODIFIED_SINCE' => @last_modified_time.httpdate }
+            get('/', {}, { 'HTTP_IF_MODIFIED_SINCE' => @last_modified_time.httpdate })
             assert_equal @last_modified_time.httpdate, response['Last-Modified']
           end
 
           it 'conditional GET matches and halts' do
-            get '/', {}, { 'HTTP_IF_MODIFIED_SINCE' => @last_modified_time.httpdate }
+            get( '/', {}, { 'HTTP_IF_MODIFIED_SINCE' => @last_modified_time.httpdate })
             assert_equal 304, status
             assert_equal '', body
           end
@@ -962,12 +1086,12 @@ class HelpersTest < Test::Unit::TestCase
 
         context "when the resource hasn't been modified since the If-Modified-Since header date" do
           it 'sets the Last-Modified header to a valid RFC 2616 date value' do
-            get '/', {}, { 'HTTP_IF_MODIFIED_SINCE' => (@last_modified_time + 1).httpdate }
+            get('/', {}, { 'HTTP_IF_MODIFIED_SINCE' => (@last_modified_time + 1).httpdate })
             assert_equal @last_modified_time.httpdate, response['Last-Modified']
           end
 
           it 'conditional GET matches and halts' do
-            get '/', {}, { 'HTTP_IF_MODIFIED_SINCE' => (@last_modified_time + 1).httpdate }
+            get('/', {}, { 'HTTP_IF_MODIFIED_SINCE' => (@last_modified_time + 1).httpdate })
             assert_equal 304, status
             assert_equal '', body
           end
@@ -975,13 +1099,13 @@ class HelpersTest < Test::Unit::TestCase
 
         context "If-Unmodified-Since" do
           it 'results in 200 if resource has not been modified' do
-            get '/', {}, { 'HTTP_IF_UNMODIFIED_SINCE' => 'Sun, 26 Sep 2030 23:43:52 GMT' }
+            get('/', {}, { 'HTTP_IF_UNMODIFIED_SINCE' => 'Sun, 26 Sep 2030 23:43:52 GMT' })
             assert_equal 200, status
             assert_equal 'Boo!', body
           end
 
           it 'results in 412 if resource has been modified' do
-            get '/', {}, { 'HTTP_IF_UNMODIFIED_SINCE' => Time.at(0).httpdate }
+            get('/', {}, { 'HTTP_IF_UNMODIFIED_SINCE' => Time.at(0).httpdate })
             assert_equal 412, status
             assert_equal '', body
           end
@@ -994,13 +1118,13 @@ class HelpersTest < Test::Unit::TestCase
     context "safe requests" do
       it 'returns 200 for normal requests' do
         mock_app do
-          get '/' do
+          get('/') do
             etag 'foo'
             'ok'
           end
         end
 
-        get('/')
+        get '/'
         assert_status 200
         assert_body 'ok'
       end
@@ -1008,7 +1132,7 @@ class HelpersTest < Test::Unit::TestCase
       context "If-None-Match" do
         it 'returns 304 when If-None-Match is *' do
           mock_app do
-            get '/' do
+            get('/') do
               etag 'foo'
               'ok'
             end
@@ -1021,7 +1145,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 200 when If-None-Match is * for new resources' do
           mock_app do
-            get '/' do
+            get('/') do
               etag 'foo', :new_resource => true
               'ok'
             end
@@ -1034,7 +1158,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 304 when If-None-Match is * for existing resources' do
           mock_app do
-            get '/' do
+            get('/') do
               etag 'foo', :new_resource => false
               'ok'
             end
@@ -1047,7 +1171,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 304 when If-None-Match is the etag' do
           mock_app do
-            get '/' do
+            get('/') do
               etag 'foo'
               'ok'
             end
@@ -1060,7 +1184,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 304 when If-None-Match includes the etag' do
           mock_app do
-            get '/' do
+            get('/') do
               etag 'foo'
               'ok'
             end
@@ -1073,7 +1197,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 200 when If-None-Match does not include the etag' do
           mock_app do
-            get '/' do
+            get('/') do
               etag 'foo'
               'ok'
             end
@@ -1086,7 +1210,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'ignores If-Modified-Since if If-None-Match does not match' do
           mock_app do
-            get '/' do
+            get('/') do
               etag 'foo'
               last_modified Time.at(0)
               'ok'
@@ -1100,7 +1224,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'does not change a status code other than 2xx or 304' do
           mock_app do
-            get '/' do
+            get('/') do
               status 499
               etag 'foo'
               'ok'
@@ -1114,7 +1238,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'does change 2xx status codes' do
           mock_app do
-            get '/' do
+            get('/') do
               status 299
               etag 'foo'
               'ok'
@@ -1128,7 +1252,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'does not send a body on 304 status codes' do
           mock_app do
-            get '/' do
+            get('/') do
               status 304
               etag 'foo'
               'ok'
@@ -1144,7 +1268,7 @@ class HelpersTest < Test::Unit::TestCase
       context "If-Match" do
         it 'returns 200 when If-Match is the etag' do
           mock_app do
-            get '/' do
+            get('/') do
               etag 'foo'
               'ok'
             end
@@ -1157,7 +1281,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 200 when If-Match includes the etag' do
           mock_app do
-            get '/' do
+            get('/') do
               etag 'foo'
               'ok'
             end
@@ -1170,7 +1294,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 200 when If-Match is *' do
           mock_app do
-            get '/' do
+            get('/') do
               etag 'foo'
               'ok'
             end
@@ -1183,7 +1307,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 412 when If-Match is * for new resources' do
           mock_app do
-            get '/' do
+            get('/') do
               etag 'foo', :new_resource => true
               'ok'
             end
@@ -1196,7 +1320,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 200 when If-Match is * for existing resources' do
           mock_app do
-            get '/' do
+            get('/') do
               etag 'foo', :new_resource => false
               'ok'
             end
@@ -1209,7 +1333,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 412 when If-Match does not include the etag' do
           mock_app do
-            get '/' do
+            get('/') do
               etag 'foo'
               'ok'
             end
@@ -1225,13 +1349,13 @@ class HelpersTest < Test::Unit::TestCase
     context "idempotent requests" do
       it 'returns 200 for normal requests' do
         mock_app do
-          put '/' do
+          put('/') do
             etag 'foo'
             'ok'
           end
         end
 
-        put('/')
+        put '/'
         assert_status 200
         assert_body 'ok'
       end
@@ -1239,7 +1363,7 @@ class HelpersTest < Test::Unit::TestCase
       context "If-None-Match" do
         it 'returns 412 when If-None-Match is *' do
           mock_app do
-            put '/' do
+            put('/') do
               etag 'foo'
               'ok'
             end
@@ -1252,7 +1376,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 200 when If-None-Match is * for new resources' do
           mock_app do
-            put '/' do
+            put('/') do
               etag 'foo', :new_resource => true
               'ok'
             end
@@ -1265,7 +1389,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 412 when If-None-Match is * for existing resources' do
           mock_app do
-            put '/' do
+            put('/') do
               etag 'foo', :new_resource => false
               'ok'
             end
@@ -1291,7 +1415,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 412 when If-None-Match includes the etag' do
           mock_app do
-            put '/' do
+            put('/') do
               etag 'foo'
               'ok'
             end
@@ -1304,7 +1428,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 200 when If-None-Match does not include the etag' do
           mock_app do
-            put '/' do
+            put('/') do
               etag 'foo'
               'ok'
             end
@@ -1317,7 +1441,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'ignores If-Modified-Since if If-None-Match does not match' do
           mock_app do
-            put '/' do
+            put('/') do
               etag 'foo'
               last_modified Time.at(0)
               'ok'
@@ -1333,7 +1457,7 @@ class HelpersTest < Test::Unit::TestCase
       context "If-Match" do
         it 'returns 200 when If-Match is the etag' do
           mock_app do
-            put '/' do
+            put('/') do
               etag 'foo'
               'ok'
             end
@@ -1346,7 +1470,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 200 when If-Match includes the etag' do
           mock_app do
-            put '/' do
+            put('/') do
               etag 'foo'
               'ok'
             end
@@ -1359,7 +1483,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 200 when If-Match is *' do
           mock_app do
-            put '/' do
+            put('/') do
               etag 'foo'
               'ok'
             end
@@ -1372,7 +1496,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 412 when If-Match is * for new resources' do
           mock_app do
-            put '/' do
+            put('/') do
               etag 'foo', :new_resource => true
               'ok'
             end
@@ -1385,7 +1509,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 200 when If-Match is * for existing resources' do
           mock_app do
-            put '/' do
+            put('/') do
               etag 'foo', :new_resource => false
               'ok'
             end
@@ -1398,7 +1522,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 412 when If-Match does not include the etag' do
           mock_app do
-            put '/' do
+            put('/') do
               etag 'foo'
               'ok'
             end
@@ -1414,7 +1538,7 @@ class HelpersTest < Test::Unit::TestCase
     context "post requests" do
       it 'returns 200 for normal requests' do
         mock_app do
-          post '/' do
+          post('/') do
             etag 'foo'
             'ok'
           end
@@ -1428,7 +1552,7 @@ class HelpersTest < Test::Unit::TestCase
       context "If-None-Match" do
         it 'returns 200 when If-None-Match is *' do
           mock_app do
-            post '/' do
+            post('/') do
               etag 'foo'
               'ok'
             end
@@ -1441,7 +1565,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 200 when If-None-Match is * for new resources' do
           mock_app do
-            post '/' do
+            post('/') do
               etag 'foo', :new_resource => true
               'ok'
             end
@@ -1454,7 +1578,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 412 when If-None-Match is * for existing resources' do
           mock_app do
-            post '/' do
+            post('/') do
               etag 'foo', :new_resource => false
               'ok'
             end
@@ -1467,7 +1591,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 412 when If-None-Match is the etag' do
           mock_app do
-            post '/' do
+            post('/') do
               etag 'foo'
               'ok'
             end
@@ -1480,7 +1604,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 412 when If-None-Match includes the etag' do
           mock_app do
-            post '/' do
+            post('/') do
               etag 'foo'
               'ok'
             end
@@ -1493,7 +1617,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 200 when If-None-Match does not include the etag' do
           mock_app do
-            post '/' do
+            post('/') do
               etag 'foo'
               'ok'
             end
@@ -1506,7 +1630,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'ignores If-Modified-Since if If-None-Match does not match' do
           mock_app do
-            post '/' do
+            post('/') do
               etag 'foo'
               last_modified Time.at(0)
               'ok'
@@ -1522,7 +1646,7 @@ class HelpersTest < Test::Unit::TestCase
       context "If-Match" do
         it 'returns 200 when If-Match is the etag' do
           mock_app do
-            post '/' do
+            post('/') do
               etag 'foo'
               'ok'
             end
@@ -1535,7 +1659,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 200 when If-Match includes the etag' do
           mock_app do
-            post '/' do
+            post('/') do
               etag 'foo'
               'ok'
             end
@@ -1548,7 +1672,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 412 when If-Match is *' do
           mock_app do
-            post '/' do
+            post('/') do
               etag 'foo'
               'ok'
             end
@@ -1561,7 +1685,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 412 when If-Match is * for new resources' do
           mock_app do
-            post '/' do
+            post('/') do
               etag 'foo', :new_resource => true
               'ok'
             end
@@ -1574,7 +1698,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 200 when If-Match is * for existing resources' do
           mock_app do
-            post '/' do
+            post('/') do
               etag 'foo', :new_resource => false
               'ok'
             end
@@ -1587,7 +1711,7 @@ class HelpersTest < Test::Unit::TestCase
 
         it 'returns 412 when If-Match does not include the etag' do
           mock_app do
-            post '/' do
+            post('/') do
               etag 'foo'
               'ok'
             end
@@ -1602,7 +1726,7 @@ class HelpersTest < Test::Unit::TestCase
 
     it 'uses a weak etag with the :weak option' do
       mock_app do
-        get '/' do
+        get('/') do
           etag 'FOO', :weak
           "that's weak, dude."
         end
@@ -1613,24 +1737,20 @@ class HelpersTest < Test::Unit::TestCase
 
     it 'raises an ArgumentError for an invalid strength' do
       mock_app do
-        get '/' do
+        get('/') do
           etag 'FOO', :w00t
           "that's weak, dude."
         end
       end
-      assert_raise(ArgumentError) { get '/' }
+      assert_raise(ArgumentError) { get('/') }
     end
   end
 
   describe 'back' do
     it "makes redirecting back pretty" do
-      mock_app {
-        get '/foo' do
-          redirect back
-        end
-      }
+      mock_app { get('/foo') { redirect back } }
 
-      get '/foo', {}, 'HTTP_REFERER' => 'http://github.com'
+      get('/foo', {}, 'HTTP_REFERER' => 'http://github.com')
       assert redirect?
       assert_equal "http://github.com", response.location
     end
@@ -1690,7 +1810,7 @@ class HelpersTest < Test::Unit::TestCase
     it 'logging works when logging is enabled' do
       mock_app do
         enable :logging
-        get '/' do
+        get('/') do
           logger.info "Program started"
           logger.warn "Nothing to do!"
         end
@@ -1704,7 +1824,7 @@ class HelpersTest < Test::Unit::TestCase
     it 'logging works when logging is disable, but no output is produced' do
       mock_app do
         disable :logging
-        get '/' do
+        get('/') do
           logger.info "Program started"
           logger.warn "Nothing to do!"
         end
@@ -1731,17 +1851,13 @@ class HelpersTest < Test::Unit::TestCase
 
   describe 'Adding new helpers' do
     it 'takes a list of modules to mix into the app' do
-      mock_app {
+      mock_app do
         helpers ::HelperOne, ::HelperTwo
 
-        get '/one' do
-          one
-        end
+        get('/one') { one }
 
-        get '/two' do
-          two
-        end
-      }
+        get('/two') { two }
+      end
 
       get '/one'
       assert_equal '1', body
@@ -1751,32 +1867,26 @@ class HelpersTest < Test::Unit::TestCase
     end
 
     it 'takes a block to mix into the app' do
-      mock_app {
+      mock_app do
         helpers do
           def foo
             'foo'
           end
         end
 
-        get '/' do
-          foo
-        end
-      }
+        get('/') { foo }
+      end
 
       get '/'
       assert_equal 'foo', body
     end
 
     it 'evaluates the block in class context so that methods can be aliased' do
-      mock_app {
-        helpers do
-          alias_method :h, :escape_html
-        end
+      mock_app do
+        helpers { alias_method :h, :escape_html }
 
-        get '/' do
-          h('42 < 43')
-        end
-      }
+        get('/') { h('42 < 43') }
+      end
 
       get '/'
       assert ok?