Merge pull request BetterErrors#176 from evertrue/exception-response-codes

Exception Response Codes

Author: Charlie Somerville

lib/better_errors/middleware.rb

@@ -85,10 +85,10 @@ def protected_app_call(env)
     rescue Exception => ex
       @error_page = @handler.new ex, env
       log_exception
-      show_error_page(env)
+      show_error_page(env, ex)
     end
 
-    def show_error_page(env)
+    def show_error_page(env, exception=nil)
       type, content = if @error_page
         if text?(env)
           [ 'plain', @error_page.render('text') ]
@@ -99,7 +99,12 @@ def show_error_page(env)
         [ 'html', no_errors_page ]
       end
 
-      [500, { "Content-Type" => "text/#{type}; charset=utf-8" }, [content]]
+      status_code = 500
+      if defined? ActionDispatch::ExceptionWrapper
+        status_code = ActionDispatch::ExceptionWrapper.new(env, exception).status_code
+      end
+
+      [status_code, { "Content-Type" => "text/#{type}; charset=utf-8" }, [content]]
     end
 
     def text?(env)

lib/better_errors/version.rb

@@ -1,3 +1,3 @@
 module BetterErrors
-  VERSION = "0.9.0"
+  VERSION = "0.10.0.pre"
 end

spec/better_errors/middleware_spec.rb

@@ -3,6 +3,7 @@
 module BetterErrors
   describe Middleware do
     let(:app) { Middleware.new(->env { ":)" }) }
+    let(:exception) { RuntimeError.new("oh no :(") }
 
     it "should pass non-error responses through" do
       app.call({}).should == ":)"
@@ -54,14 +55,24 @@ module BetterErrors
     end
 
     context "when handling an error" do
-      let(:app) { Middleware.new(->env { raise "oh no :(" }) }
+      let(:app) { Middleware.new(->env { raise exception }) }
 
       it "should return status 500" do
         status, headers, body = app.call({})
 
         status.should == 500
       end
 
+      it "should return ExceptionWrapper's status_code" do
+        ad_ew = double("ActionDispatch::ExceptionWrapper")
+        ad_ew.stub('new').with({}, exception ){ double("ExceptionWrapper", status_code: 404) }
+        stub_const('ActionDispatch::ExceptionWrapper', ad_ew)
+
+        status, headers, body = app.call({})
+
+        status.should == 404
+      end
+
       it "should return UTF-8 error pages" do
         status, headers, body = app.call({})