errship 2.1.3 → 2.2.0

data/README.rdoc

@@ -38,6 +38,16 @@ when you want useful debugging output again instead!
 
 Alternatively, simply point your browser to /error or /not_found to get a taste.
 
+== Configuration
+
+Errship renders all error pages with a HTTP status of 200 by default. This is
+done to ensure that the error page is rendered if the web server is configured
+to intercept errors (e.g. proxy_intercept_errors for nginx). If you want to
+have the correct status codes for your errors, add the following to an
+initializer:
+
+    Errship.status_code_success = false
+
 == I18n
 
 If you want to edit the text that is rendered, add the following to your config/locales/*.yml
@@ -91,6 +101,9 @@ If Airbrake is installed, every rescuer will report the exception, except for 40
 
 == Changelog
 
+2.2.0
+  - Preserve correct status codes by default (Rescuers no longer force a 200 status)
+
 2.1.3
   - Conditionally loading rescuers to check for specific loading ORM
   

data/lib/errship.rb

@@ -8,6 +8,9 @@ module Errship
     paths['app/views']      << 'app/views'
     paths['config/locales'] << 'config/locales'
   end
+  
+  mattr_accessor :status_code_success
+  @@status_code_success = true
 
   module Rescuers
     def self.included(base)
@@ -21,12 +24,12 @@ module Errship
     def render_error(exception, errship_scope = false)
       airbrake_class.send(:notify, exception) if airbrake_class
       render :template => '/errship/standard', :locals => {
-        :status_code => 500, :errship_scope => errship_scope }
+        :status_code => 500, :errship_scope => errship_scope }, :status => (Errship.status_code_success ? 200 : 500)
     end
 
     def render_404_error(exception = nil, errship_scope = false)
       render :template => '/errship/standard', :locals => {
-        :status_code => 404, :errship_scope => errship_scope }
+        :status_code => 404, :errship_scope => errship_scope }, :status => (Errship.status_code_success ? 200 : 404)
     end
 
     # A blank page with just the layout and flash message, which can be redirected to when

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: errship
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,12 +11,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-28 00:00:00.000000000 -04:00
+date: 2011-11-02 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &21940360 !ruby/object:Gem::Requirement
+  requirement: &15152220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21940360
+  version_requirements: *15152220
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &21939540 !ruby/object:Gem::Requirement
+  requirement: &15151620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21939540
+  version_requirements: *15151620
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &21938540 !ruby/object:Gem::Requirement
+  requirement: &15146020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,10 +46,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *21938540
+  version_requirements: *15146020
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &21937760 !ruby/object:Gem::Requirement
+  requirement: &15145440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -57,10 +57,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *21937760
+  version_requirements: *15145440
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &21936680 !ruby/object:Gem::Requirement
+  requirement: &15144840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,7 +68,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21936680
+  version_requirements: *15144840
 description: Errship is a Rails 3.1 engine for rendering error pages inside your layout.
   It supports i18n, custom exceptions, and Airbrake (Hoptoad) error tracking.
 email:
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3781624677601233719
+      hash: -593668271471606510
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: