public_rescue 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaf03d43f610e14d975735e823c40f9024c3768f
-  data.tar.gz: 06c354d4dd377e6d370d95e1eb2eeaae9251eb41
+  metadata.gz: 859dde98b6b2b66316befb6381ebb9689ee3d5f9
+  data.tar.gz: cdca52210d95761542a6c517e5d997202fe49234
 SHA512:
-  metadata.gz: 15a7ef176e536524f4d6fe79e4b3d84f73be282a1e801863ca76b188a0af0e788880e87c564537cf37dec5420a4e567ab84ad54d91e5578521953b01366ef9c0
-  data.tar.gz: 424b0feada24ef74093398558978543fd3b412bb0851dfe1adc13fa43b4b5f46adbe506c40656c0713e4b5177dd964e992dccfc2b747a443723124e38753a013
+  metadata.gz: f9cffcede939896d6b0651749c03044f8d9b67c4bd4503d0327b4edf03c5f4cb7dfc676e7e9dd440a544daebda1ce701c1a58ceb259a5aec242b9ca0d9728b8a
+  data.tar.gz: 789ab0a655874afa12d81fabe9f84da2eb45998aa930e4d8f25e9b90161a954a1ee327abe7b843ca5e754b6613027240005af36f278ee2f5165cb24592a0cb97

data/Gemfile

@@ -6,7 +6,7 @@ gem "rails", ">= 3.0"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.3.5"
-  gem "jeweler", "~> 2.0.0"
+  gem "bundler", "~> 1.11.2"
+  gem "jeweler", "~> 2.1.0"
   gem "simplecov", ">= 0"
 end

data/Gemfile.lock

@@ -1,55 +1,64 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.7)
-      actionpack (= 3.0.7)
-      mail (~> 2.2.15)
-    actionpack (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-    activesupport (3.0.7)
-    addressable (2.3.5)
-    arel (2.0.10)
-    builder (2.1.2)
-    descendants_tracker (0.0.3)
-    docile (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    faraday (0.9.0)
+    actionmailer (4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.6)
+      actionview (= 4.2.6)
+      activesupport (= 4.2.6)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.6)
+      activesupport (= 4.2.6)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.6)
+      activesupport (= 4.2.6)
+      globalid (>= 0.3.0)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
+      builder (~> 3.1)
+    activerecord (4.2.6)
+      activemodel (= 4.2.6)
+      activesupport (= 4.2.6)
+      arel (~> 6.0)
+    activesupport (4.2.6)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.4.0)
+    arel (6.0.3)
+    builder (3.2.2)
+    concurrent-ruby (1.0.2)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    docile (1.1.5)
+    erubis (2.7.0)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    git (1.2.6)
-    github_api (0.11.1)
-      addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
+    git (1.3.0)
+    github_api (0.14.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
+      hashie (>= 3.4)
       oauth2
-    hashie (2.0.5)
-    highline (1.6.20)
-    i18n (0.5.0)
-    jeweler (2.0.1)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
+    hashie (3.4.4)
+    highline (1.7.8)
+    i18n (0.7.0)
+    jeweler (2.1.1)
       builder
       bundler (>= 1.0)
       git (>= 1.2.5)
@@ -58,66 +67,92 @@ GEM
       nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.1)
-    jwt (0.1.11)
-      multi_json (>= 1.5)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    mini_portile (0.5.2)
-    multi_json (1.8.4)
+      semver
+    json (1.8.3)
+    jwt (1.5.1)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.0.0)
+    minitest (5.9.0)
+    multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    oauth2 (0.9.3)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    oauth2 (1.1.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 0.1.8)
+      jwt (~> 1.0, < 1.5.2)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    polyglot (0.3.1)
-    rack (1.2.2)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
+      rack (>= 1.2, < 3)
+    rack (1.6.4)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.0.7)
-      actionmailer (= 3.0.7)
-      actionpack (= 3.0.7)
-      activerecord (= 3.0.7)
-      activeresource (= 3.0.7)
-      activesupport (= 3.0.7)
-      bundler (~> 1.0)
-      railties (= 3.0.7)
-    railties (3.0.7)
-      actionpack (= 3.0.7)
-      activesupport (= 3.0.7)
+    rails (4.2.6)
+      actionmailer (= 4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
+      activemodel (= 4.2.6)
+      activerecord (= 4.2.6)
+      activesupport (= 4.2.6)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.6)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (4.2.6)
+      actionpack (= 4.2.6)
+      activesupport (= 4.2.6)
       rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.9.0)
-    rdoc (4.1.1)
+      thor (>= 0.18.1, < 2.0)
+    rake (11.1.2)
+    rdoc (4.2.2)
       json (~> 1.4)
-    shoulda (2.11.3)
-    simplecov (0.8.2)
+    semver (1.0.1)
+    shoulda (3.5.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.2.1)
+    shoulda-matchers (2.8.0)
+      activesupport (>= 3.0.0)
+    simplecov (0.11.2)
       docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    thor (0.14.6)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.27)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    sprockets (3.6.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.0.4)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.3.5)
-  jeweler (~> 2.0.0)
+  bundler (~> 1.11.2)
+  jeweler (~> 2.1.0)
   rails (>= 3.0)
   shoulda
   simplecov
+
+BUNDLED WITH
+   1.11.2

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/public_rescue.rb

@@ -7,7 +7,8 @@ module PublicRescue
   extend ActiveSupport::Autoload
   autoload :ShowExceptions
   autoload :PublicErrorsController
+  autoload :PublicExceptions3
   autoload :PublicExceptions
 end
 
-require 'public_rescue/rails'
+require 'public_rescue/rails'

data/lib/public_rescue/public_exceptions.rb

@@ -1,13 +1,22 @@
 module PublicRescue
-  class PublicExceptions
-    
+  class PublicExceptions < ActionDispatch::PublicExceptions
+
+    def initialize
+    end
+
     def call(env)
-      
-      exception = env["action_dispatch.exception"]
-      wrapper = ActionDispatch::ExceptionWrapper.new(env, exception)
-      
-      request = ActionDispatch::Request.new(env)
-      status = wrapper.status_code
+      @env = env
+      super(env)
+    end
+
+    private
+
+    def render_html(status)
+      exception = @env["action_dispatch.exception"]
+      wrapper = ActionDispatch::ExceptionWrapper.new(@env, exception)
+
+      request = ActionDispatch::Request.new(@env)
+
       exception_details = {
               :request => request, :exception => exception,
               :status => status,
@@ -24,13 +33,8 @@ module PublicRescue
         controller = PublicErrorsController
       end
       response = controller.action(action).call(request.env).last
-      render(status, response.body)
-    end
-    
-    private
-    
-    def render(status, body)
-      [status, {'Content-Type' => "text/html; charset=#{ActionDispatch::Response.default_charset}", 'Content-Length' => body.bytesize.to_s}, [body]]
+      render_format(status, 'text/html', response.body)
     end
+
   end
-end
+end

data/lib/public_rescue/public_exceptions3.rb

@@ -0,0 +1,36 @@
+module PublicRescue
+  class PublicExceptions3
+
+    def call(env)
+
+      exception = env["action_dispatch.exception"]
+      wrapper = ActionDispatch::ExceptionWrapper.new(env, exception)
+
+      request = ActionDispatch::Request.new(env)
+      status = wrapper.status_code
+      exception_details = {
+              :request => request, :exception => exception,
+              :status => status,
+              :application_trace => wrapper.application_trace,
+              :framework_trace => wrapper.framework_trace,
+              :full_trace => wrapper.full_trace
+      }
+      request.env['public_rescue.exception_details'] = exception_details
+      action = ActionDispatch::ExceptionWrapper.rescue_responses[exception.class.name]
+      controller_name = Rails.configuration.public_rescue.controller.to_s.camelize << 'Controller'
+      begin
+        controller = Rails.const_get(controller_name)
+      rescue NameError => n_E
+        controller = PublicErrorsController
+      end
+      response = controller.action(action).call(request.env).last
+      render(status, response.body)
+    end
+
+    private
+
+    def render(status, body)
+      [status, {'Content-Type' => "text/html; charset=#{ActionDispatch::Response.default_charset}", 'Content-Length' => body.bytesize.to_s}, [body]]
+    end
+  end
+end

data/lib/public_rescue/rails.rb

@@ -2,20 +2,24 @@ require 'public_rescue'
 
 module PublicRescue
     class Engine < Rails::Engine
-      
+
         config.public_rescue = ActiveSupport::OrderedOptions.new
         config.public_rescue.controller = :public_errors
-        
-        if Rails::VERSION::MINOR == 2
-          initializer "public_rescue.set_exceptions_app" do |app|
-            app.config.exceptions_app = PublicRescue::PublicExceptions.new
-          end
+
+        if Rails::VERSION::MAJOR >= 4
+            initializer "public_rescue.set_exceptions_app" do |app|
+              app.config.exceptions_app = PublicRescue::PublicExceptions.new
+            end
+        elsif (Rails::VERSION::MINOR == 3 && Rails::VERSION::MINOR == 2)
+            initializer "public_rescue.set_exceptions_app" do |app|
+                app.config.exceptions_app = PublicRescue::PublicExceptions3.new
+            end
         else
-          initializer "public_rescue.add_middleware" do |app|
-              app.middleware.swap ActionDispatch::ShowExceptions, PublicRescue::ShowExceptions, app.config.consider_all_requests_local
-          end
+            initializer "public_rescue.add_middleware" do |app|
+                app.middleware.swap ActionDispatch::ShowExceptions, PublicRescue::ShowExceptions, app.config.consider_all_requests_local
+            end
         end
-        
-        
+
+
     end
-end
+end

data/public_rescue.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: public_rescue 0.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "public_rescue"
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Cyril Picard"]
-  s.date = "2014-01-30"
+  s.date = "2016-05-30"
   s.description = "PublicRescue is a gem for rails application who want to display dynamic error pages. It creates a new Rack middleware which replaces ActionDispatch::ShowExceptions and overwrites the rescue_action_in_public method."
   s.email = "Cyril@picard.ch"
   s.extra_rdoc_files = [
@@ -33,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/generators/template/controller.rb",
     "lib/public_rescue.rb",
     "lib/public_rescue/public_exceptions.rb",
+    "lib/public_rescue/public_exceptions3.rb",
     "lib/public_rescue/rails.rb",
     "lib/public_rescue/show_exceptions.rb",
     "public_rescue.gemspec",
@@ -41,8 +44,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/cyrilpic/public_rescue"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.6"
+  s.rubygems_version = "2.5.1"
   s.summary = "Rails gem for displaying dynamic error pages."
 
   if s.respond_to? :specification_version then
@@ -51,21 +53,21 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, [">= 3.0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.3.5"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.11.2"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.1.0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
       s.add_dependency(%q<rails>, [">= 3.0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.3.5"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.11.2"])
+      s.add_dependency(%q<jeweler>, ["~> 2.1.0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
     s.add_dependency(%q<rails>, [">= 3.0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.3.5"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.11.2"])
+    s.add_dependency(%q<jeweler>, ["~> 2.1.0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: public_rescue
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Cyril Picard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2016-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.11.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.11.2
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: PublicRescue is a gem for rails application who want to display dynamic
@@ -90,7 +90,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
+- ".document"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -106,6 +106,7 @@ files:
 - lib/generators/template/controller.rb
 - lib/public_rescue.rb
 - lib/public_rescue/public_exceptions.rb
+- lib/public_rescue/public_exceptions3.rb
 - lib/public_rescue/rails.rb
 - lib/public_rescue/show_exceptions.rb
 - public_rescue.gemspec
@@ -121,17 +122,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rails gem for displaying dynamic error pages.