err_merchant 0.1.1 → 0.1.2

data/README.rdoc

@@ -1,5 +1,5 @@
 = err_merchant
-This is a very simple Rails Engine for replacing the standard (ugly) Rails exception pages, with pages which are rendered in your layout. There are several gems out there that do the same, but this one takes the approach proposed by AccUser[http://accuser.cc/posts/1-rails-3-0-exception-handling]. I just made a gem out of it because I use it in every project.
+This is a very simple Rails Engine for replacing the standard (ugly) Rails exception pages with pages which are rendered in your layout. There are several gems out there that do the same, but this one takes the approach proposed by AccUser[http://accuser.cc/posts/1-rails-3-0-exception-handling]. I just made a gem out of it because I use it in every project. This solution works seamlessly with Airbrake[http://airbrake.io/].
 
 == Installation
 Add the gem to your Gemfile, run `bundle install` and restart your server:
@@ -8,6 +8,12 @@ Add the gem to your Gemfile, run `bundle install` and restart your server:
 
 This is it. If you want to check the error pages in development mode, make sure to set +config.consider_all_requests_local+ to +false+ and restart your development server.
 
+=== Should I keep the standard Rails error pages around?
+Yes, these files are used as a fallback if +err_merchant+ itself raises an exception. This can happen if there is an error in your application layout.
+
+== Configuration
+* +ErrMerchant.layout+: Can be used to set the layout for the error pages. By default the application-layout is used.
+
 == I18n
 You can translate the error messages, by default they are the same as the standard Rails errors:
 
@@ -22,9 +28,12 @@ You can translate the error messages, by default they are the same as the standa
       title: "We're sorry, but something went wrong."
       description: "We've been notified about this issue and we'll take a look at it shortly."
 
-Please note that there are translations missing in development mode if you don't supply translations for your locale. In production however, +config.i18n.fallbacks+ is usually set to +true+, so the english error message will be shown if the lookup is unsuccessful.
+Please note that there are translations missing in development mode if you don't supply translations for your locale. In production however, +config.i18n.fallbacks+ is usually set to +true+, so the error messages for the default locale will be shown if the lookup is not successful.
 
 == Changelog
+=== 0.1.2
+* added configuration option for layout
+
 === 0.1.1
 * fix gemspec
 * add test for fallback to standard rails error pages

data/app/controllers/err_merchant/errors_controller.rb

@@ -13,7 +13,7 @@ class ErrMerchant::ErrorsController < ApplicationController
   ERRORS.each do |e, status_code|
     define_method e do
       respond_to do |format|
-        format.html { render 'template', :locals => {:status_code => status_code}, :status => e }
+        format.html { render 'template', :locals => {:status_code => status_code}, :layout => ErrMerchant.layout, :status => e }
         format.any { head e }
       end
     end

data/lib/err_merchant/version.rb

@@ -1,3 +1,3 @@
 module ErrMerchant
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/err_merchant.rb

@@ -1 +1,8 @@
+require 'active_support/core_ext/module/attribute_accessors'
+
+module ErrMerchant
+  mattr_accessor :layout
+  @@layout = 'application'
+end
+
 require 'err_merchant/engine'

data/spec/err_merchant_spec.rb

@@ -34,23 +34,33 @@ describe 'ErrMerchant' do
     page.should have_content("This is a usual action.")
     page.status_code.should == 200
   end
+
+  it 'shows translated error messages if available' do
+    I18n.locale = :de
+    visit '/failures/where_is_it'
+
+    page.should have_content("Seite nicht gefunden")
+  end
   
   it 'shows english error message when no translation available' do
-    I18n.locale = :de
+    I18n.locale = :fr
     visit '/failures/wild_error'
 
     page.should have_content("We're sorry, but something went wrong.")
   end
 
   it 'falls back to standard error pages if everything goes wrong' do
-    ErrMerchant::ErrorsController.class_eval do
-      layout "erroneous"
-    end
+    ErrMerchant.layout = "erroneous"
 
     visit '/failures/wild_error'
     page.should have_content("We're sorry, but something went wrong.")
     page.status_code.should == 500
+    page.should_not have_css('div.err_merchant')
     page.should have_css('div.dialog h1')
   end
 
+  it 'should deliver airbrake notifications' do
+    Airbrake.should_receive(:notify_or_ignore)
+    visit '/failures/wild_error'
+  end
 end

data/spec/internal/config/locales/de.yml

@@ -0,0 +1,4 @@
+de:
+  err_merchant:
+    '404':
+      title: "Seite nicht gefunden"