err_merchant 0.2.0 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 06cd48be71775b09c9aa0f4e428f4df30d532bdfcf72434853fcf6dbced355ba
+  data.tar.gz: 756d2bed2eb493f17edc1c862f5f7c33842a26a88144947a8d88e9a1cc14a162
+SHA512:
+  metadata.gz: afcb515aeaca4ba0ccd2cb0edd827fbfcefaebaba4f3a302249910707277cd18ad7a8d58c621a650d62d0f49ba5ffa85979dc0f41695f29c3fb2486ca1f425d0
+  data.tar.gz: 7b354a0e0d581fb512589df9d8c207f2bba06e3a3850618624b0ff377e7a6487aed73f89c7d2aaa0fd00d53d11260e091b66da39646163968422fdbfd899aedb

data/.github/workflows/ruby.yml

@@ -0,0 +1,30 @@
+name: RSpec
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - rails-version: 5.2.0
+          - rails-version: 6.0.0
+          - rails-version: 6.1.0
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.5
+    - run: bundle install
+      env:
+        RAILS_VERSION: ${{ matrix.rails-version }}
+    - run: bundle exec rspec spec
+      env:
+        RAILS_VERSION: ${{ matrix.rails-version }}
+

data/.gitignore

@@ -0,0 +1,11 @@
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+
+Gemfile.lock
+spec/internal/db/combustion_test.sqlite

data/Gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gemspec
+
+if ENV["RAILS_VERSION"]
+  gem "rails", "~> #{ENV['RAILS_VERSION']}"
+end

data/README.rdoc

@@ -1,8 +1,6 @@
 = 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/].
+This is a very simple Rails Engine for replacing the standard (ugly) Rails exception pages with pages which are rendered in your layout.
 
 == Installation
 Add the gem to your Gemfile, run `bundle install` and restart your server:
@@ -16,6 +14,7 @@ Yes, these files are used as a fallback if +err_merchant+ itself raises an excep
 
 == Configuration
 * +ErrMerchant.layout+: Can be used to set the layout for the error pages. By default the application-layout is used.
+* +ErrMerchant.skip_filters+: Can be used to skip certain filters when rendering errors. Most common are filters by authorization gems like `cancan` or `pundit` which ensure that authorization happens. These have to be skipped when rendering error pages. (example: `ErrMerchant.skip_filters[:after] = [:verify_authorized]` for pundit)
 
 == I18n
 You can translate the error messages, by default they are the same as the standard Rails errors:
@@ -34,6 +33,28 @@ 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.7.0 (2021-01-05)
+* Disable CSRF in ErrorsController
+* Drop support for rails < 5.2
+
+=== 0.6.0 (2019-06-07)
+* Relax version requirement for rails
+* Drop support for rails < 5
+
+=== 0.5.0 (2018-08-09)
+* ErrorsController inherits from ApplicationController again (so helpers etc. defined there are available). Added ErrMerchant.skip_filters for previously hardcoded behavior.
+
+=== 0.4.0 (2018-08-09)
+* Relax rails requirements
+* Remove special cases for CanCan / Pundit, instead inherit from ActionController::Base (so we don't get any before_action we don't like)
+
+=== 0.3.1 (2014-11-08)
+* works with `pundit` now
+* show error messages raw
+
+=== 0.3.0 (2014-10-24)
+* compatible with rails 4
+
 === 0.2.0 (2012-01-30)
 * only supports rails 3.2 (code cleanup)
 
@@ -49,4 +70,4 @@ Please note that there are translations missing in development mode if you don't
 * Initial release
 
 == License
-This project rocks and uses MIT-LICENSE.
+This project rocks and uses MIT-LICENSE.

data/Rakefile

@@ -1,28 +1,5 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ErrMerchant'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-Bundler::GemHelper.install_tasks
-
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new
 
-task :default => :spec
+task :default => :spec

data/app/controllers/err_merchant/errors_controller.rb

@@ -1,19 +1,22 @@
-class ErrMerchant::ErrorsController < ApplicationController
-  skip_authorization_check if defined?(::CanCan)
-  
+class ErrMerchant::ErrorsController < ::ApplicationController
+  ErrMerchant.skip_filters.each do |filter_type, filters|
+    send(:"skip_#{filter_type}_action", *filters) if filters.any?
+  end
+  skip_forgery_protection(raise: false)
+
   ERRORS = {
-    :internal_server_error => 500,
-    :not_found => 404,
-    :conflict => 409,
-    :unprocessable_entity => 422,
-    :method_not_allowed => 405,
-    :not_implemented => 501
+    internal_server_error: 500,
+    not_found: 404,
+    conflict: 409,
+    unprocessable_entity: 422,
+    method_not_allowed: 405,
+    not_implemented: 501
   }.freeze
 
   ERRORS.each do |e, status_code|
     define_method e do
       respond_to do |format|
-        format.html { render 'template', :locals => {:status_code => status_code}, :layout => ErrMerchant.layout, :status => e }
+        format.html { render "template", locals: { status_code: status_code }, layout: ErrMerchant.layout, status: e }
         format.any { head e }
       end
     end

data/app/views/err_merchant/errors/template.html.erb

@@ -1,4 +1,4 @@
 <div class='err_merchant'>
-  <h2><%= I18n.t(:"err_merchant.#{status_code}.title", :default => :"err_merchant.500.title") %></h2>
-  <p><%= I18n.t(:"err_merchant.#{status_code}.description", :default => :"err_merchant.500.description") %></p>
-</div>
+  <h2><%= raw I18n.t(:"err_merchant.#{status_code}.title", :default => :"err_merchant.500.title") %></h2>
+  <p><%= raw I18n.t(:"err_merchant.#{status_code}.description", :default => :"err_merchant.500.description") %></p>
+</div>

data/config.ru

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'bundler'
+
+Bundler.require :default, :development
+
+Combustion.initialize!
+run Combustion::Application

data/err_merchant.gemspec

@@ -0,0 +1,29 @@
+
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "err_merchant/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "err_merchant"
+  spec.version       = ErrMerchant::VERSION
+  spec.authors       = ["Fabian Schwahn"]
+  spec.email         = ["fabian.schwahn@gmail.com"]
+
+  spec.summary       = "Rails Engine for rendering error pages"
+  spec.homepage      = "https://github.com/fschwahn/err_merchant"
+  spec.license       = "MIT"
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency 'rails', '>= 5.2', '< 6.2'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'combustion'
+  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'rspec-rails', '~> 3.0'
+  spec.add_development_dependency 'capybara', '>= 2.2'
+end

data/lib/err_merchant.rb

@@ -3,6 +3,9 @@ require 'active_support/core_ext/module/attribute_accessors'
 module ErrMerchant
   mattr_accessor :layout
   @@layout = 'application'
+
+  mattr_accessor :skip_filters
+  @@skip_filters = { before: [], after: [], around: [] }
 end
 
-require 'err_merchant/engine'
+require 'err_merchant/engine'

data/lib/err_merchant/exceptions_app.rb

@@ -8,6 +8,5 @@ module ErrMerchant
     rescue
       ActionDispatch::PublicExceptions.new(Rails.root.join('public')).call(env)
     end
-
   end
-end
+end

data/lib/err_merchant/version.rb

@@ -1,3 +1,3 @@
 module ErrMerchant
-  VERSION = "0.2.0"
+  VERSION = "0.7.0".freeze
 end

metadata

@@ -1,157 +1,148 @@
 --- !ruby/object:Gem::Specification
 name: err_merchant
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - Fabian Schwahn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-30 00:00:00.000000000 Z
+date: 2021-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153532640 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2153532640
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
 - !ruby/object:Gem::Dependency
-  name: combustion
-  requirement: &2153532100 !ruby/object:Gem::Requirement
-    none: false
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153532100
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &2153531700 !ruby/object:Gem::Requirement
-    none: false
+  name: combustion
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153531700
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: airbrake
-  requirement: &2153531120 !ruby/object:Gem::Requirement
-    none: false
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153531120
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2153530480 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *2153530480
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2153529800 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.2'
   type: :development
   prerelease: false
-  version_requirements: *2153529800
-description: Rails Engine for rendering error pages
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.2'
+description: 
 email:
 - fabian.schwahn@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/err_merchant/engine.rb
-- lib/err_merchant/exceptions_app.rb
-- lib/err_merchant/version.rb
-- lib/err_merchant.rb
+- ".github/workflows/ruby.yml"
+- ".gitignore"
+- Gemfile
+- MIT-LICENSE
+- README.rdoc
+- Rakefile
 - app/controllers/err_merchant/errors_controller.rb
 - app/views/err_merchant/errors/template.html.erb
+- config.ru
 - config/locales/en.yml
-- MIT-LICENSE
-- Rakefile
-- README.rdoc
-- spec/err_merchant_spec.rb
-- spec/internal/app/controllers/application_controller.rb
-- spec/internal/app/controllers/failures_controller.rb
-- spec/internal/app/views/failures/usual_action.html.erb
-- spec/internal/app/views/layouts/application.html.erb
-- spec/internal/app/views/layouts/erroneous.html.erb
-- spec/internal/config/database.yml
-- spec/internal/config/locales/de.yml
-- spec/internal/config/routes.rb
-- spec/internal/db/combustion_test.sqlite
-- spec/internal/db/schema.rb
-- spec/internal/log/test.log
-- spec/internal/public/500.html
-- spec/internal/public/favicon.ico
-- spec/spec_helper.rb
+- err_merchant.gemspec
+- lib/err_merchant.rb
+- lib/err_merchant/engine.rb
+- lib/err_merchant/exceptions_app.rb
+- lib/err_merchant/version.rb
 homepage: https://github.com/fschwahn/err_merchant
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1955459898448739955
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1955459898448739955
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 3.1.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rails Engine for rendering error pages
-test_files:
-- spec/err_merchant_spec.rb
-- spec/internal/app/controllers/application_controller.rb
-- spec/internal/app/controllers/failures_controller.rb
-- spec/internal/app/views/failures/usual_action.html.erb
-- spec/internal/app/views/layouts/application.html.erb
-- spec/internal/app/views/layouts/erroneous.html.erb
-- spec/internal/config/database.yml
-- spec/internal/config/locales/de.yml
-- spec/internal/config/routes.rb
-- spec/internal/db/combustion_test.sqlite
-- spec/internal/db/schema.rb
-- spec/internal/log/test.log
-- spec/internal/public/500.html
-- spec/internal/public/favicon.ico
-- spec/spec_helper.rb
+test_files: []