err_merchant 0.1.2 → 0.2.0

data/spec/spec_helper.rb

@@ -7,11 +7,7 @@ require 'capybara/rspec'
 
 Combustion::Application.config.consider_all_requests_local = false
 Combustion::Application.config.i18n.fallbacks = true
-Combustion.initialize!
+Combustion.initialize! :active_record, :action_controller, :action_view
 
 require 'rspec/rails'
 require 'capybara/rails'
-
-RSpec.configure do |config|
-  config.use_transactional_fixtures = true
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: err_merchant
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-13 00:00:00.000000000 Z
+date: 2012-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2163226600 !ruby/object:Gem::Requirement
+  requirement: &2153532640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2163226600
+  version_requirements: *2153532640
 - !ruby/object:Gem::Dependency
   name: combustion
-  requirement: &2163226100 !ruby/object:Gem::Requirement
+  requirement: &2153532100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *2163226100
+  version_requirements: *2153532100
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2163225600 !ruby/object:Gem::Requirement
+  requirement: &2153531700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2163225600
+  version_requirements: *2153531700
 - !ruby/object:Gem::Dependency
   name: airbrake
-  requirement: &2163225140 !ruby/object:Gem::Requirement
+  requirement: &2153531120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2163225140
+  version_requirements: *2153531120
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2163224520 !ruby/object:Gem::Requirement
+  requirement: &2153530480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2163224520
+  version_requirements: *2153530480
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2163224020 !ruby/object:Gem::Requirement
+  requirement: &2153529800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2163224020
+  version_requirements: *2153529800
 description: Rails Engine for rendering error pages
 email:
 - fabian.schwahn@gmail.com
@@ -85,7 +85,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/err_merchant/engine.rb
-- lib/err_merchant/show_exceptions_patch.rb
+- lib/err_merchant/exceptions_app.rb
 - lib/err_merchant/version.rb
 - lib/err_merchant.rb
 - app/controllers/err_merchant/errors_controller.rb
@@ -101,7 +101,6 @@ files:
 - spec/internal/app/views/layouts/application.html.erb
 - spec/internal/app/views/layouts/erroneous.html.erb
 - spec/internal/config/database.yml
-- spec/internal/config/initializers/local_request_override.rb
 - spec/internal/config/locales/de.yml
 - spec/internal/config/routes.rb
 - spec/internal/db/combustion_test.sqlite
@@ -124,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 24091787803453396
+      hash: -1955459898448739955
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -133,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 24091787803453396
+      hash: -1955459898448739955
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15
@@ -148,7 +147,6 @@ test_files:
 - spec/internal/app/views/layouts/application.html.erb
 - spec/internal/app/views/layouts/erroneous.html.erb
 - spec/internal/config/database.yml
-- spec/internal/config/initializers/local_request_override.rb
 - spec/internal/config/locales/de.yml
 - spec/internal/config/routes.rb
 - spec/internal/db/combustion_test.sqlite

data/lib/err_merchant/show_exceptions_patch.rb

@@ -1,18 +0,0 @@
-require 'active_support/concern'
-
-module ErrMerchant
-  module ShowExceptionsPatch
-    extend ActiveSupport::Concern
-
-    included { alias_method_chain :render_exception, :template unless Rails.application.config.consider_all_requests_local }
-
-    private
-      def render_exception_with_template(env, exception)
-        body = ErrMerchant::ErrorsController.action(rescue_responses[exception.class.name]).call(env)
-        log_error(exception)
-        body
-      rescue
-        render_exception_without_template(env, exception)
-      end
-  end
-end

data/spec/internal/config/initializers/local_request_override.rb

@@ -1,5 +0,0 @@
-class ActionDispatch::Request
-  def local?
-    false
-  end
-end