scorched 0.22 → 0.23

data/lib/scorched/version.rb

@@ -1,3 +1,3 @@
 module Scorched
-  VERSION = '0.22'
-end
+  VERSION = '0.23'
+end

data/scorched.gemspec

@@ -15,9 +15,10 @@ Gem::Specification.new 'scorched', Scorched::VERSION do |s|
   s.required_ruby_version = '>= 2.0.0'
 
   s.add_dependency 'rack', '~> 1.4'
-  s.add_dependency 'rack-accept', '~> 0.4'
+  s.add_dependency 'rack-accept', '~> 0.4' # Used for Accept-Charset, Accept-Encoding and Accept-Language headers.
+  s.add_dependency 'scorched-accept', '~> 0.1' # Used for Accept header.
   s.add_dependency 'tilt', '~> 1.4'
   s.add_development_dependency 'rack-test', '~> 0.6'
   s.add_development_dependency 'rspec', '~> 2.9'
-  s.add_development_dependency 'rake', '>= 10'
-end
+  s.add_development_dependency 'rake', '~> 10.4'
+end

data/spec/controller_spec.rb

@@ -5,30 +5,30 @@ module Scorched
     let(:generic_handler) do
       proc { |env| [200, {}, ['ok']] }
     end
-    
+
     it "contains a default set of configuration options" do
       app.config.should be_a(Options)
       app.config.length.should > 0
     end
-    
+
     it "contains a set of default conditions" do
       app.conditions.should be_a(Options)
       app.conditions.length.should > 0
       app.conditions[:method].should be_a(Proc)
     end
-    
+
     describe "basic route handling" do
       it "gracefully handles 404 errors" do
         response = rt.get '/'
         response.status.should == 404
       end
-    
+
       it "handles a root rack call correctly" do
         app << {pattern: '/$', target: generic_handler}
         response = rt.get '/'
         response.status.should == 200
       end
-    
+
       it "does not maintain state between requests" do
         app << {pattern: '/state', target: proc { |env| [200, {}, [@state = 1 + @state.to_i]] }}
         response = rt.get '/state'
@@ -36,7 +36,7 @@ module Scorched
         response = rt.get '/state'
         response.body.should == '1'
       end
-      
+
       it "raises exception when invalid mapping hash given" do
         expect {
           app << {pattern: '/'}
@@ -46,14 +46,14 @@ module Scorched
         }.to raise_error(ArgumentError)
       end
     end
-    
+
     describe "URL matching" do
       it 'always matches from the beginning of the URL' do
         app << {pattern: 'about', target: generic_handler}
         response = rt.get '/about'
         response.status.should == 404
       end
-      
+
       it "matches eagerly by default" do
         req = nil
         app << {pattern: '/*', target: proc do |env|
@@ -62,7 +62,7 @@ module Scorched
         response = rt.get '/about'
         req.captures.should == ['about']
       end
-      
+
       it "can be forced to match end of URL" do
         app << {pattern: '/about$', target: generic_handler}
         response = rt.get '/about/us'
@@ -71,7 +71,7 @@ module Scorched
         response = rt.get '/about/us'
         response.status.should == 200
       end
-      
+
       it "unescapes all characters except for the forward-slash and percent sign" do
         app << {pattern: '/a (quite) big fish', target: generic_handler}
         rt.get('/a%20%28quite%29%20big%20fish').status.should == 200
@@ -81,7 +81,7 @@ module Scorched
         rt.get('/page%2Fabout').status.should == 200
         rt.get('/page/about').status.should == 404
       end
-      
+
       it "unmatched path doesn't always begin with a forward slash" do
         gh = generic_handler
         app << {pattern: '/ab', target: Class.new(Scorched::Controller) do
@@ -91,7 +91,7 @@ module Scorched
         resp.status.should == 200
         resp.body.should == "ok"
       end
-      
+
       it "unmatched path begins with forward slash if last match was up to or included a forward slash" do
         gh = generic_handler
         app << {pattern: '/about/', target: Class.new(Scorched::Controller) do
@@ -103,7 +103,7 @@ module Scorched
         rt.get('/about/us').body.should == "ok"
         rt.get('/contact/us').body.should == "ok"
       end
-      
+
       it "can match anonymous wildcards" do
         req = nil
         app << {pattern: '/anon/*/**', target: proc do |env|
@@ -112,7 +112,7 @@ module Scorched
         response = rt.get '/anon/jeff/has/crabs'
         req.captures.should == ['jeff', 'has/crabs']
       end
-      
+
       it "can match named wildcards (ignoring anonymous captures)" do
         req = nil
         app << {pattern: '/anon/:name/*/::infliction', target: proc do |env|
@@ -121,7 +121,7 @@ module Scorched
         response = rt.get '/anon/jeff/smith/has/crabs'
         req.captures.should == {name: 'jeff', infliction: 'has/crabs'}
       end
-      
+
       example "wildcards match one or more characters" do
         app << {pattern: '/*', target: proc { |env| [200, {}, ['ok']] }}
         rt.get('/').status.should == 404
@@ -139,7 +139,7 @@ module Scorched
         rt.get('/').status.should == 404
         rt.get('/dog/cat').status.should == 200
       end
-      
+
       example "wildcards can optionally match zero or more characters" do
         app << {pattern: '/*?', target: proc { |env| [200, {}, ['ok']] }}
         rt.get('/').status.should == 200
@@ -157,7 +157,7 @@ module Scorched
         rt.get('/').status.should == 200
         rt.get('/dog/cat').status.should == 200
       end
-      
+
       it "can match regex and preserve anonymous captures" do
         req = nil
         app << {pattern: %r{/anon/([^/]+)/(.+)}, target: proc do |env|
@@ -166,7 +166,7 @@ module Scorched
         response = rt.get '/anon/jeff/has/crabs'
         req.captures.should == ['jeff', 'has/crabs']
       end
-      
+
       it "can match regex and preserve named captures (ignoring anonymous captures)" do
         req = nil
         app << {pattern: %r{/anon/(?<name>[^/]+)/([^/]+)/(?<infliction>.+)}, target: proc do |env|
@@ -175,7 +175,7 @@ module Scorched
         response = rt.get '/anon/jeff/smith/has/crabs'
         req.captures.should == {name: 'jeff', infliction: 'has/crabs'}
       end
-      
+
       it "matches routes based on priority, otherwise giving precedence to those defined first" do
         order = []
         app << {pattern: '/', priority: -1, target: proc { |env| order << 'four'; [200, {}, ['ok']] }}
@@ -185,38 +185,35 @@ module Scorched
         rt.get('/').body.should == 'ok'
         order.should == %w{one two three four}
       end
-      
-      it "finds the best match for media type whilst respecting priority and definition order" do
-        app << {pattern: '/', conditions: {media_type: 'text/html'}, target: proc { |env|
-          [200, {}, ['text/html']]
-        }}
-        app << {pattern: '/', conditions: {media_type: 'application/json'}, target: proc { |env|
-          [200, {}, ['application/json']]
-        }}
-        app << {pattern: '/', priority: 1, target: proc { |env|
-          [200, {}, ['anything']]
-        }}
-        rt.get('/', media_type: 'application/json, */*;q=0.5').body.should == 'anything'
+
+      it "finds the best match for the media type whilst respecting priority and definition order" do
+        app << {pattern: '/', target: proc { |env| [200, {}, ['anything']] }}
+        app << {pattern: '/', conditions: {media_type: 'application/json'}, target: proc { |env| [200, {}, ['application/json']] }}
+        app << {pattern: '/', conditions: {media_type: 'text/html'}, target: proc { |env| [200, {}, ['text/html']] }}
+        app << {pattern: '/', priority: 1, target: proc { |env| [200, {}, ['anything_high_priority']] }}
+        rt.get('/', {}, 'HTTP_ACCEPT' => 'application/json, */*;q=0.5').body.should == 'anything_high_priority'
         app.mappings.pop
-        rt.get('/', {}, 'HTTP_ACCEPT' => 'text/html;q=0.5, application/json').body.should == 'application/json'
-        rt.get('/', {}, 'HTTP_ACCEPT' =>  'text/html, */*;q=0.5').body.should == 'text/html'
+        rt.get('/', {}, 'HTTP_ACCEPT' => 'application/json;q=0.5, text/html').body.should == 'text/html'
+        rt.get('/', {}, 'HTTP_ACCEPT' =>  'application/json, */*').body.should == 'application/json'
+        rt.get('/', {}, 'HTTP_ACCEPT' =>  '*/*, text/*').body.should == 'text/html'
+        rt.get('/', {}, 'HTTP_ACCEPT' =>  '*/*').body.should == 'anything'
       end
     end
-    
+
     describe "conditions" do
       it "contains a default set of conditions" do
         app.conditions.should be_a(Options)
         app.conditions.should include(:method, :media_type)
         app.conditions.each { |k,v| v.should be_a(Proc) }
       end
-      
+
       it "executes route only if all conditions return true" do
         app << {pattern: '/$', conditions: {method: 'POST'}, target: generic_handler}
         response = rt.get "/"
         response.status.should be_between(400, 499)
         response = rt.post "/"
         response.status.should == 200
-        
+
         app.conditions[:has_name] = proc { |name| request.GET['name'] }
         app << {pattern: '/about', conditions: {method: ['GET', 'POST'], has_name: 'Ronald'}, target: generic_handler}
         response = rt.get "/about"
@@ -224,28 +221,28 @@ module Scorched
         response = rt.get "/about", name: 'Ronald'
         response.status.should == 200
       end
-      
+
       it "raises exception when condition doesn't exist or is invalid" do
         app << {pattern: '/', conditions: {surprise_christmas_turkey: true}, target: generic_handler}
         expect {
           rt.get "/"
         }.to raise_error(Scorched::Error)
       end
-      
+
       it "falls through to next route when conditions are not met" do
         app << {pattern: '/', conditions: {method: 'POST'}, target: proc { |env| [200, {}, ['post']] }}
         app << {pattern: '/', conditions: {method: 'GET'}, target: proc { |env| [200, {}, ['get']] }}
         rt.get("/").body.should == 'get'
         rt.post("/").body.should == 'post'
       end
-      
+
       it "inverts the conditions if it's referenced with a trailing exclamation mark" do
         app << {pattern: '/', conditions: {method!: 'GET'}, target: proc { |env| [200, {}, ['ok']] }}
         rt.get("/").status.should == 405
         rt.post("/").status.should == 200
       end
     end
-    
+
     describe "route helpers" do
       it "allows end points to be defined more succinctly" do
         route_proc = app.route('/*', 2, method: 'GET') { |capture| capture }
@@ -253,7 +250,7 @@ module Scorched
         mapping.should == {pattern: mapping[:pattern], priority: 2, conditions: {method: 'GET'}, target: route_proc}
         rt.get('/about').body.should == 'about'
       end
-      
+
       it "can provide a mapping proc without mapping it" do
         block = proc { |capture| capture }
         wrapped_block = app.route(&block)
@@ -262,32 +259,32 @@ module Scorched
         app << {pattern: '/*', target: wrapped_block}
         rt.get('/turkey').body.should == 'turkey'
       end
-      
+
       it "provides a method for every HTTP method" do
         [:get, :post, :put, :delete, :options, :head, :patch].each do |m|
           app.send(m, '/say_cool') { 'cool' }
           rt.send(m, '/say_cool').body.should == (m == :head ? '' : 'cool')
         end
       end
-      
+
       it "provides wildcard captures as arguments" do
         app.get('/*/**') { |a,b| "#{a} #{b}" }
         rt.get('/hello/there/dude').body.should == 'hello there/dude'
       end
-      
+
       it "provides named captures as individual arguments for each value" do
         app.get('/:given_name') { |a| a }
         app.get('/:given_name/::surname') { |a,b| "#{a} #{b}" }
         rt.get('/bob').body.should == 'bob'
         rt.get('/bob/smith').body.should == 'bob smith'
       end
-      
+
       it "always matches to the end of the URL (implied $)" do
         app.get('/') { 'awesome '}
         rt.get('/dog').status.should == 404
         rt.get('/').status.should == 200
       end
-      
+
       it "leaves body empty if nil is returned" do
         app.get('/') { }
         app.after do
@@ -295,7 +292,7 @@ module Scorched
         end
         rt.get('/')
       end
-      
+
       it "can take an array of patterns" do
         app.get(['/', '/dog']) { 'rad' }
         rt.get('/dog').status.should == 200
@@ -303,7 +300,7 @@ module Scorched
         rt.get('/cat').status.should == 404
       end
     end
-    
+
     describe "sub-controllers" do
       it "should ignore the already matched portions of the path" do
         app << {pattern: '/article', target: Class.new(Scorched::Controller) do
@@ -321,7 +318,7 @@ module Scorched
             'hello'
           end
         end
-        
+
         resp = rt.get('/article/name')
         resp.status.should == 200
         outer_env['SCRIPT_NAME'].should == ''
@@ -329,7 +326,7 @@ module Scorched
         inner_env['SCRIPT_NAME'].should == '/article'
         inner_env['PATH_INFO'].should == '/name'
       end
-      
+
       example "PATH_INFO and SCRIPT_NAME joined, should produce a full path" do
         app.controller '/article/' do
           get '/name' do
@@ -354,7 +351,7 @@ module Scorched
           response.status.should == 200
           response.body.should == 'hello'
         end
-      
+
         it "can be given a pattern" do
           app.controller '/dog' do
             get('/') { 'roof' }
@@ -363,12 +360,12 @@ module Scorched
           response.status.should == 200
           response.body.should == 'roof'
         end
-      
+
         it "inherits from parent class, or otherwise the specified class" do
           app.controller{}.superclass.should == app
           app.controller('/', String){}.superclass.should == String
         end
-      
+
         it "can take mapping options" do
           app.controller priority: -1, conditions: {method: 'POST'} do
             route('/') { 'ok' }
@@ -377,7 +374,7 @@ module Scorched
           rt.get('/').status.should be_between(400, 499)
           rt.post('/').body.should == 'ok'
         end
-        
+
         it "automatically passes to the outer controller when no match" do
           filters_run = 0
           app.controller do
@@ -389,7 +386,7 @@ module Scorched
           rt.get('/').body.should == 'hello'
           filters_run.should == 0
         end
-        
+
         it "can be used to map a predefined controller" do
           person_controller = Class.new(Scorched::Controller) do
             get('/name') { 'George' }
@@ -399,7 +396,7 @@ module Scorched
         end
       end
     end
-    
+
     describe "before/after filters" do
       they "run directly before and after the target action" do
         order = []
@@ -409,7 +406,7 @@ module Scorched
         rt.get('/')
         order.should == [:before, :action, :after]
       end
-      
+
       they "run in the context of the controller (same as the route)" do
         route_instance = nil
         before_instance = nil
@@ -421,7 +418,7 @@ module Scorched
         route_instance.should == before_instance
         route_instance.should == after_instance
       end
-      
+
       they "should run even if no route matches" do
         counter = 0
         app.before { counter += 1 }
@@ -429,7 +426,7 @@ module Scorched
         rt.delete('/').status.should == 404
         counter.should == 2
       end
-      
+
       they "can take an optional set of conditions" do
         counter = 0
         app.before(method: ['GET', 'PUT']) { counter += 1  }
@@ -439,7 +436,7 @@ module Scorched
         rt.put('/')
         counter.should == 4
       end
-      
+
       they "execute in the order they're defined" do
         order = []
         app.before { order << :first }
@@ -449,7 +446,7 @@ module Scorched
         rt.get('/')
         order.should == %i{first second third fourth}
       end
-      
+
       describe "nesting" do
         example "filters inherit but only run once" do
           before_counter, after_counter = 0, 0
@@ -458,18 +455,18 @@ module Scorched
           subcontroller = app.controller { get('/') { 'wow' } }
           subcontroller.filters[:before].should == app.filters[:before]
           subcontroller.filters[:after].should == app.filters[:after]
-          
+
           rt.get('/')
           before_counter.should == 1
           after_counter.should == 1
-          
+
           # Hitting the subcontroller directly should yield the same results.
           before_counter, after_counter = 0, 0
           Rack::Test::Session.new(subcontroller).get('/')
           before_counter.should == 1
           after_counter.should == 1
         end
-        
+
         example "before filters run from outermost to innermost" do
           order = []
           app.before { order << :outer }
@@ -482,7 +479,7 @@ module Scorched
           rt.get('/')
           order.should == %i{outer outer2 inner inner2}
         end
-        
+
         example "after filters run from innermost to outermost" do
           order = []
           app.after { order << :outer }
@@ -495,7 +492,7 @@ module Scorched
           rt.get('/')
           order.should == %i{inner inner2 outer outer2}
         end
-        
+
         example "inherited filters which fail to satisfy their conditions are re-evaluated at every level" do
           order = []
           sub_class = app.controller do
@@ -518,7 +515,7 @@ module Scorched
         end
       end
     end
-    
+
     describe "error filters" do
       let(:app) do
         Class.new(Scorched::Controller) do
@@ -527,26 +524,26 @@ module Scorched
           end
         end
       end
-      
+
       they "catch exceptions" do
         app.error { response.status = 500 }
         rt.get('/').status.should == 500
       end
-      
+
       they "receive the exception object as their first argument" do
         error = nil
         app.error { |e| error = e }
         rt.get('/')
         error.should be_a(StandardError)
       end
-      
+
       they "try the next handler if the previous handler returns false" do
         handlers_called = 0
         app.error { handlers_called += 1 }
         app.error { handlers_called += 1 }
         rt.get '/'
         handlers_called.should == 1
-        
+
         app.error_filters.clear
         handlers_called = 0
         app.error { handlers_called += 1; false }
@@ -554,45 +551,45 @@ module Scorched
         rt.get '/'
         handlers_called.should == 2
       end
-      
+
       they "still runs after filters if route error is handled" do
         app.after { response.status = 111 }
         app.error { true }
         rt.get('/').status.should == 111
       end
-      
+
       they "can handle exceptions in before/after filters" do
         app.error { |e| response.write e.class.name }
         app.after { raise ArgumentError }
         rt.get('/').body.should == 'StandardErrorArgumentError'
       end
-      
+
       they "swallow halts when executed in an outer context" do
         app.before { raise "Big bad error" }
         app.error { throw :halt }
         rt.get('/') # Would otherwise bomb out with uncaught throw.
       end
-      
+
       they "only get called once per error" do
         times_called = 0
         app.error { times_called += 1 }
         rt.get '/'
         times_called.should == 1
       end
-      
+
       they "fall through when unhandled" do
         expect {
           rt.get '/'
         }.to raise_error(StandardError)
       end
-      
+
       they "can optionally filter on one or more exception types" do
         app.get('/arg_error') { raise ArgumentError }
-        
+
         app.error(StandardError, ArgumentError) { true }
         rt.get '/'
         rt.get '/arg_error'
-        
+
         app.error_filters.clear
         app.error(ArgumentError) { true }
         expect {
@@ -600,7 +597,7 @@ module Scorched
         }.to raise_error(StandardError)
         rt.get '/arg_error'
       end
-      
+
       they "can take an optional set of conditions" do
         app.error(method: ['GET', 'PUT']) { true  }
         expect {
@@ -610,7 +607,7 @@ module Scorched
         rt.put('/')
       end
     end
-    
+
     describe "middleware" do
       let(:app) do
         Class.new(Scorched::Controller) do
@@ -625,56 +622,56 @@ module Scorched
           end
         end
       end
-      
+
       it "is only included once by default" do
         rt.get('/').body.should == '1'
         rt.get('/sub_controller').body.should == '1'
       end
-      
+
       it "can be explicitly included more than once in sub-controllers" do
         app.mappings[-1][:target].middleware << proc { use Scorched::SimpleCounter }
         rt.get('/').body.should == '1'
         rt.get('/sub_controller').body.should == '2'
       end
     end
-    
+
     describe "halting" do
       it "short circuits current request" do
         has_run = false
         app.get('/') { halt; has_run = true }
         rt.get '/'
-        has_run.should be_false
+        has_run.should be_falsey
       end
-      
+
       it "takes an optional status" do
         app.get('/') { halt 600 }
         rt.get('/').status.should == 600
       end
-      
+
       it "takes an optional response body" do
         app.get('/') { halt 'cool' }
         rt.get('/').body.should == 'cool'
       end
-      
+
       it "can take a status and a response body" do
         app.get('/') { halt 600, 'cool' }
         rt.get('/').status.should == 600
         rt.get('/').body.should == 'cool'
       end
-      
+
       it "still processes filters" do
         app.after { response.status = 600 }
         app.get('/') { halt }
         rt.get('/').status.should == 600
       end
-      
+
       describe "within filters" do
         it "short circuits filters if halted within filter" do
           app.before { halt }
           app.after { response.status = 600 }
           rt.get('/').status.should_not == 600
         end
-        
+
         it "forced filters are always run" do
           app.before { halt }
           app.after(force: true) { response.status = 600 }
@@ -682,7 +679,7 @@ module Scorched
           app.get('/') { 'hello' }
           rt.get('/').status.should == 600
         end
-        
+
         it "halting within a forced filter still runs other forced filters" do
           app.before { halt }
           app.before(force: true) { halt }
@@ -694,7 +691,7 @@ module Scorched
         end
       end
     end
-    
+
     describe 'redirecting' do
       it "redirects using 303 or 302 by default, depending on HTTP version" do
         app.get('/cat') { redirect '/dog' }
@@ -705,12 +702,12 @@ module Scorched
         response.status.should == 302
         response.location.should == '/dog'
       end
-      
+
       it "allows the HTTP status to be overridden" do
         app.get('/') { redirect '/somewhere', 308 }
         rt.get('/').status.should == 308
       end
-      
+
       it "halts the request after redirect" do
         var = false
         app.get('/') do
@@ -720,7 +717,7 @@ module Scorched
         rt.get('/')
         var.should == false
       end
-      
+
       it "works in filters" do
         app.error { redirect '/somewhere' }
         app.get('/') { raise "Some error" }
@@ -729,7 +726,7 @@ module Scorched
         rt.get('/').location.should == '/somewhere_else'
       end
     end
-    
+
     describe "passing" do
       it "invokes the next match" do
         app.get('/') { response.body << 'hello'; pass }
@@ -738,7 +735,7 @@ module Scorched
         app.get('/') { response.body << '!' } # Shouldn't be hit
         rt.get('/').body.should == 'hello there sir'
       end
-      
+
       it "invokes the next match in parent controller if passed from filter" do
         effects = []
         app.controller '/sub' do
@@ -756,7 +753,7 @@ module Scorched
         rt.get('/sub').body.should == 'y'
         effects.should == [1, 2]
       end
-      
+
       it "results in uncaught symbol if passing within filter of root controller " do
         app.before { pass }
         expect {
@@ -764,36 +761,36 @@ module Scorched
           rt.get('/')
         }.to raise_error(ArgumentError)
       end
-      
+
       it "is not considered a match if a mapping passes the request" do
         app.get('/*') { pass }
         app.get('/nopass') {  }
         handled = nil
         app.after { handled = @_handled }
         rt.get('/').status.should == 404 # 404 if matched, but passed
-        handled.should_not be_true
+        handled.should be_falsey
         rt.get('/nopass').status.should == 200
-        handled.should be_true
+        handled.should be_truthy
       end
     end
-    
+
     describe "status codes" do
       it "returns 405 when :method condition fails" do
         app.get('/') { }
         rt.post('/').status.should == 405
       end
-      
+
       it "returns 404 when :host condition fails" do
         app.get('/', host: 'somehost') { }
         rt.get('/').status.should == 404
       end
-      
+
       it "returns 406 when accept-related conditions fail" do
         app.get('/media_type', media_type: 'application/json') { }
         app.get('/charset', charset: 'iso-8859-5') { }
         app.get('/encoding', encoding: 'gzip') { }
         app.get('/language', language: 'en') { }
-        
+
         rt.get('/media_type', {}, 'HTTP_ACCEPT' => 'application/json').status.should == 200
         rt.get('/media_type', {}, 'HTTP_ACCEPT' => 'text/html').status.should == 406
         rt.get('/charset', {}, 'HTTP_ACCEPT_CHARSET' => 'iso-8859-5').status.should == 200
@@ -804,7 +801,7 @@ module Scorched
         rt.get('/language', {}, 'HTTP_ACCEPT_LANGUAGE' => 'da').status.should == 406
       end
     end
-    
+
     describe "configuration" do
       describe :strip_trailing_slash do
         it "can be set to strip trailing slash and redirect" do
@@ -814,7 +811,7 @@ module Scorched
           response.status.should == 307
           response['Location'].should == '/test'
         end
-        
+
         it "can be set to ignore trailing slash while pattern matching" do
           app.config[:strip_trailing_slash] = :ignore
           hit = false
@@ -822,17 +819,17 @@ module Scorched
           rt.get('/test/').status.should == 200
           hit.should == true
         end
-        
+
         it "can be set not do nothing with a trailing slash" do
           app.config[:strip_trailing_slash] = false
           app.get('/test') { }
           rt.get('/test/').status.should == 404
-          
+
           app.get('/test/') { }
           rt.get('/test/').status.should == 200
         end
       end
-      
+
       describe :static_dir do
         it "can serve static file from the specific directory" do
           app.config[:static_dir] = 'public'
@@ -840,23 +837,23 @@ module Scorched
           response.status.should == 200
           response.body.should == 'My static file!'
         end
-        
+
         it "can be disabled" do
           app.config[:static_dir] = false
           response = rt.get('/static.txt')
           response.status.should == 404
         end
       end
-      
+
       describe :show_exceptions do
         it "shows debug-friendly error page for unhandled exceptions" do
           app.config[:show_exceptions] = true
           app.get('/') { raise RuntimeError, "Kablamo!" }
-          response = rt.get('/')
+          response = rt.get('/', {}, 'HTTP_ACCEPT' => 'text/html')
           response.status.should == 500
           response.body.should include('Rack::ShowExceptions')
         end
-        
+
         it "can be disabled" do
           app.config[:show_exceptions] = false
           app.get('/') { raise RuntimeError, "Kablamo!" }
@@ -865,7 +862,7 @@ module Scorched
           }.to raise_error(RuntimeError)
         end
       end
-      
+
       describe :show_http_error_pages do
         it "shows HTTP error pages for errors 400 to 599" do
           app.config[:show_http_error_pages] = true
@@ -875,7 +872,7 @@ module Scorched
           rt.post('/').body.should include('405 Method Not Allowed')
           rt.get('/unknown').body.should include('480 ')
         end
-        
+
         it "can be disabled" do
           app.config[:show_http_error_pages] = false
           app.get('/') { response.status = 501; '' }
@@ -885,7 +882,7 @@ module Scorched
           rt.post('/unknown').body.should_not include('408 ')
         end
       end
-      
+
       describe :auto_pass do
         it "passes to the outer controller without running any filters, if no match" do
           sub = Class.new(Scorched::Controller) do
@@ -900,22 +897,22 @@ module Scorched
           rt.get('/').status.should == 200
           rt.get('/hello').body.should == 'hello'
           rt.get('/hello').status.should == 600
-          
+
           sub.config[:auto_pass] = false
           rt.get('/').body.should == ''
           rt.get('/').status.should == 600
         end
       end
-      
+
       describe :cache_templates do
         before(:each) do
           File.open('views/temp.str', 'w') { |f| f.write 'hello world' }
         end
-        
+
         after(:all) {
           File.unlink 'views/temp.str'
         }
-        
+
         it "can cache templates" do
           app.config[:cache_templates] = true
           app.get('/') { render :'temp.str' }
@@ -923,7 +920,7 @@ module Scorched
           File.open('views/temp.str', 'a') { |f| f.write '!!!' }
           rt.get('/').body.should == 'hello world'
         end
-        
+
         it "can be set not to cache templates" do
           app.config[:cache_templates] = false
           app.get('/') { render :'temp.str' }
@@ -933,7 +930,7 @@ module Scorched
         end
       end
     end
-    
+
     describe "sessions" do
       it "provides convenience method for accessing the Rack session" do
         rack_session = nil
@@ -944,49 +941,49 @@ module Scorched
         rt.get('/')
         rack_session.should be_a(Rack::Session::Abstract::SessionHash)
       end
-      
+
       describe "flash" do
         before(:each) do
           app.middleware << proc { use Rack::Session::Cookie, secret: 'test' }
         end
-        
+
         it "keeps session variables that live for one page load" do
           app.get('/set') { flash[:cat] = 'meow' }
           app.get('/get') { flash[:cat] }
-          
+
           rt.get('/set')
           rt.get('/get').body.should == 'meow'
           rt.get('/get').body.should == ''
         end
-        
+
         it "always reads from the original request flash" do
           app.get('/') do
             flash[:counter] = flash[:counter] ? flash[:counter] + 1 : 0
             flash[:counter].to_s
           end
-          
+
           rt.get('/').body.should == ''
           rt.get('/').body.should == '0'
           rt.get('/').body.should == '1'
         end
-        
+
         it "can only remove flash variables if the flash object is accessed" do
           app.get('/set') { flash[:cat] = 'meow' }
           app.get('/get') { flash[:cat] }
           app.get('/null') { }
-          
+
           rt.get('/set')
           rt.get('/null')
           rt.get('/get').body.should == 'meow'
           rt.get('/get').body.should == ''
         end
-        
+
         it "can keep multiple sets of flash session variables" do
           app.get('/set_animal') { flash(:animals)[:cat] = 'meow' }
           app.get('/get_animal') { flash(:animals)[:cat] }
           app.get('/set_name') { flash(:names)[:jeff] = 'male' }
           app.get('/get_name') { flash(:names)[:jeff] }
-          
+
           rt.get('/set_animal')
           rt.get('/set_name')
           rt.get('/get_animal').body.should == 'meow'
@@ -996,7 +993,7 @@ module Scorched
         end
       end
     end
-    
+
     describe "cookie helper" do
       it "sets, retrieves and deletes cookies" do
         app.get('/') { cookie :test }
@@ -1004,7 +1001,7 @@ module Scorched
         app.post('/goodbye') { cookie :test, {value: 'goodbye', expires: Time.now() + 999999 } }
         app.delete('/') { cookie :test, nil }
         app.delete('/alt') { cookie :test, {value: nil} }
-        
+
         rt.get('/').body.should == ''
         rt.post('/')
         rt.get('/').body.should == 'hello'
@@ -1016,7 +1013,7 @@ module Scorched
         rt.get('/').body.should == ''
       end
     end
-    
+
     describe "rendering" do
       before(:each) do
         app.render_defaults.each { |k,v| app.render_defaults[k] = nil }
@@ -1042,7 +1039,7 @@ module Scorched
         end
         rt.get('/')
       end
-      
+
       it "properly respects absolute and relative file paths in respect to the view directory" do
         app.get('/relative') do
           render(:'../views/main.erb', dir: 'views')
@@ -1105,14 +1102,14 @@ module Scorched
         end
         rt.get('/').body.should == '({1 for none}{1 for none})'
       end
-      
+
       it "can pass local variables through to view" do
         app.get '/' do
           render '<%= var %>', engine: 'erb', dir: 'views', locals: {var: 'hello sailor'}
         end
         rt.get('/').body.should == 'hello sailor'
       end
-      
+
       it "provides a means for passing options directly to tilt" do
         Tilt.register(Class.new(Tilt::ERBTemplate) do
           def prepare
@@ -1120,13 +1117,13 @@ module Scorched
             super
           end
         end, 'test')
-        
+
         app.get '/safe' do
           render '<%= var %>', engine: 'test', dir: 'views', locals: {var: 'hello sailor'}
           render '<%= var %>', engine: 'test', dir: 'views', locals: {var: 'hello sailor'}, tilt: {engine: Class.new}
         end
         rt.get('/safe').body.should == 'hello sailor'
-        
+
         app.get '/boomer' do
           render '<%= var %>', engine: 'test', dir: 'views', locals: {var: 'hello sailor'}, tilt: {engine: 'invalid'}
         end
@@ -1135,12 +1132,12 @@ module Scorched
         }.to raise_error(NoMethodError)
       end
     end
-    
+
     describe "url helpers" do
       let(:my_app) do
         Class.new(Scorched::Controller)
       end
-      
+
       let(:root_app) do
         Class.new(Scorched::Controller)
       end
@@ -1152,7 +1149,7 @@ module Scorched
         builder.map('/') { run this.root_app }
         builder.to_app
       end
-      
+
       it "can determine the root path of the current Scorched application" do
         my_app.controller '/article' do
           get '/name' do
@@ -1161,26 +1158,26 @@ module Scorched
         end
         rt.get('/myapp/article/name').body.should == '/myapp'
       end
-      
+
       describe "url" do
         it "returns the fully qualified URL" do
           my_app.get('/') { url }
           rt.get('https://scorchedrb.com:73/myapp?something=true').body.should ==
             'https://scorchedrb.com:73/myapp'
         end
-        
+
         it "can append an optional path" do
           my_app.get('/') { url('hello') }
           rt.get('https://scorchedrb.com:73/myapp?something=true').body.should ==
             'https://scorchedrb.com:73/myapp/hello'
         end
-        
+
         it "returns the given URL if scheme detected" do
           test_url = 'http://google.com/blah'
           my_app.get('/') { url(test_url) }
           rt.get('/myapp').body.should == test_url
         end
-        
+
         it "generates URL from inside subcontroller defined with controller helper" do
           root_app.controller '/sub2' do
             get('/') { url('hi') }
@@ -1188,29 +1185,29 @@ module Scorched
           rt.get('https://scorchedrb.com:73/sub2').body.should == 'https://scorchedrb.com:73/hi'
         end
       end
-      
+
       describe "absolute" do
         it "returns an absolute URL path" do
           my_app.get('/absolute') { absolute }
           rt.get('http://scorchedrb.com/myapp/absolute?something=true').body.should == '/myapp'
         end
-        
+
         it "returns a forward slash if script name is the root of the URL path" do
           root_app.get('/') { absolute }
           rt.get('http://scorchedrb.com').body.should == '/'
         end
-        
+
         it "can append an optional path" do
           my_app.get('/absolute') { absolute('hello') }
           rt.get('http://scorchedrb.com/myapp/absolute?something=true').body.should == '/myapp/hello'
         end
-        
+
         it "returns the given URL if scheme detected" do
           test_url = 'http://google.com/blah'
           my_app.get('/') { absolute(test_url) }
           rt.get('/myapp').body.should == test_url
         end
-        
+
         it "returns an absolute URL path for subcontroller defined with controller helper" do
           root_app.controller '/sub2' do
             get('/') { absolute }
@@ -1219,7 +1216,7 @@ module Scorched
         end
       end
     end
-    
+
     describe "delegators" do
       it "delegates captures" do
         app.get('/:id') { captures[:id] }