err_merchant 0.1.2 → 0.2.0

data/README.rdoc

@@ -1,4 +1,7 @@
 = err_merchant
+
+{<img src="https://secure.travis-ci.org/fschwahn/err_merchant.png" />}[http://travis-ci.org/fschwahn/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 solution works seamlessly with Airbrake[http://airbrake.io/].
 
 == Installation
@@ -31,15 +34,18 @@ You can translate the error messages, by default they are the same as the standa
 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
+=== 0.2.0 (2012-01-30)
+* only supports rails 3.2 (code cleanup)
+
+=== 0.1.2 (2012-01-12)
 * added configuration option for layout
 
-=== 0.1.1
+=== 0.1.1 (2012-01-12)
 * fix gemspec
 * add test for fallback to standard rails error pages
 * fix issue with CanCan
 
-=== 0.1.0
+=== 0.1.0 (2012-01-11)
 * Initial release
 
 == License

data/lib/err_merchant/engine.rb

@@ -1,10 +1,10 @@
 require 'rails/engine'
-require 'err_merchant/show_exceptions_patch'
+require 'err_merchant/exceptions_app'
 
 module ErrMerchant
   class Engine < ::Rails::Engine
-    initializer "err_merchant.show_exceptions_patch" do
-      ActionDispatch::ShowExceptions.send(:include, ShowExceptionsPatch)
+    initializer "err_merchant.set_exceptions_app" do |app|
+      app.config.exceptions_app = ErrMerchant::ExceptionsApp.new
     end
   end
 end

data/lib/err_merchant/exceptions_app.rb

@@ -0,0 +1,13 @@
+require 'action_dispatch/middleware/public_exceptions'
+
+module ErrMerchant
+  class ExceptionsApp
+    def call(env)
+      status = env["PATH_INFO"][1..-1]
+      ErrMerchant::ErrorsController.action(Rack::Utils::SYMBOL_TO_STATUS_CODE.invert[status.to_i]).call(env)
+    rescue
+      ActionDispatch::PublicExceptions.new(Rails.root.join('public')).call(env)
+    end
+
+  end
+end

data/lib/err_merchant/version.rb

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

data/spec/err_merchant_spec.rb

@@ -41,7 +41,7 @@ describe 'ErrMerchant' do
 
     page.should have_content("Seite nicht gefunden")
   end
-  
+
   it 'shows english error message when no translation available' do
     I18n.locale = :fr
     visit '/failures/wild_error'

data/spec/internal/config/database.yml

@@ -1,3 +1,3 @@
 test:
   adapter:  sqlite3
-  database: db/combustion_test.sqlite
+  database: db/combustion_test.sqlite

data/spec/internal/db/schema.rb

@@ -1,3 +0,0 @@
-ActiveRecord::Schema.define do
-  #
-end