gaffe 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a76d88f73a65c01478f10e150f4ec9ef46a9089
-  data.tar.gz: 512a17ddc07b06e40683a8685eacb56950b92205
+  metadata.gz: a299d255e8e71ef667c749630dfca9ea9aac630a
+  data.tar.gz: 762d2f648c24cfd0714331e22894f839c1d80ee9
 SHA512:
-  metadata.gz: 7e87748a54801fea4b59b755a5c52564e1678184309012971042ff4749f3dd04520010365460a73afcadd8d86ce1807a2535074d1ccbe259d66626ae1c47ef86
-  data.tar.gz: 7314dde747616aace314b458bfad68369996971dc08737e81ea3aa284a2b5b5a04a773fdac5f6027588649f911e3d6ddcb533b2c4223082f130137007c4dbfd6
+  metadata.gz: d6ae8586749c662a4e4427ff64d9e9254d3770dbd05467d31ce2125c075962448eb788def45c58d7c2ab6511713943914e4b41d8d3abd3a161ad6d3440225e31
+  data.tar.gz: 641f0bdb5cf608df3093cc3b8e20fba86a6affba4cb29841a432b3d0574602ae8a11b8230e28fef8f69dadc3b86edbcca09ece7b54558fea8a62e43fbf5bc7c7

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2015, Mirego
+Copyright (c) 2013-2016, Mirego
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -47,16 +47,17 @@ end
 Gaffe.enable!
 ```
 
-It’s also possible to use a custom controller based on the URL in which the error has occured. This is especially
-useful if you have an application that also serves API requests via JSON. You would probably want to serve API errors
-through JSON and regular errors through HTML pages.
+It’s also possible to use a custom controller based on the URL in which the error has occured. Both absolute and 
+relative URL supported. This is especially useful if you have an application that also serves API requests via 
+JSON. You would probably want to serve API errors through JSON and regular errors through HTML pages.
 
 ```ruby
 # config/initializers/gaffe.rb
 Gaffe.configure do |config|
   config.errors_controller = {
     %r[^/api/] => 'Api::ErrorsController',
-    %r[^/] => 'ErrorsController'
+    %r[^/] => 'ErrorsController',
+    %r[^www.example.com] => 'HostSpecificErrorsController'
   }
 end
 
@@ -179,7 +180,7 @@ To test responses sent by Gaffe, you must use *request tests*.
 
 ## License
 
-`Gaffe` is © 2013-2015 [Mirego](http://www.mirego.com) and may be freely distributed under the [New BSD license](http://opensource.org/licenses/BSD-3-Clause).  See the [`LICENSE.md`](https://github.com/mirego/gaffe/blob/master/LICENSE.md) file.
+`Gaffe` is © 2013-2016 [Mirego](http://www.mirego.com) and may be freely distributed under the [New BSD license](http://opensource.org/licenses/BSD-3-Clause).  See the [`LICENSE.md`](https://github.com/mirego/gaffe/blob/master/LICENSE.md) file.
 
 The mushroom cloud logo is based on [this lovely icon](http://thenounproject.com/noun/mushroom-cloud/#icon-No18596) by [Gokce Ozan](http://thenounproject.com/occultsearcher), from The Noun Project. Used under a [Creative Commons BY 3.0](http://creativecommons.org/licenses/by/3.0/) license.
 

data/lib/gaffe/errors_controller_resolver.rb

@@ -30,7 +30,12 @@ module Gaffe
   private
 
     def request_controller(controllers)
-      controllers.find { |pattern, _| @env['REQUEST_URI'] =~ pattern }.try(:last)
+      matched_controllers = controllers.find do |pattern, _|
+        relative_url = @env['REQUEST_URI']
+        absolute_url = @env['HTTP_HOST'] + relative_url
+        [relative_url, absolute_url].any? { |url| (url =~ pattern).present? }
+      end
+      matched_controllers.try(:last)
     end
   end
 end

data/lib/gaffe/version.rb

@@ -1,3 +1,3 @@
 module Gaffe
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/spec/application_controller_helper.rb

@@ -0,0 +1,3 @@
+# We need a fake "ApplicationController" because Gaffe's default controller inherits from it
+class ApplicationController < ActionController::Base
+end

data/spec/gaffe/errors_controller_resolver_spec.rb

@@ -32,7 +32,8 @@ describe Gaffe::ErrorsControllerResolver do
         Gaffe.configure do |config|
           config.errors_controller = {
             %r{^/web/} => :web_controller,
-            %r{^/api/} => :api_controller
+            %r{^/api/} => :api_controller,
+            %r{^www.com} => :host_specific_controller
           }
         end
       end
@@ -42,6 +43,11 @@ describe Gaffe::ErrorsControllerResolver do
         it { expect(controller).to eql :api_controller }
       end
 
+      context 'with error coming from matching HTTP_HOST' do
+        let(:env) { request.env.merge('HTTP_HOST' => 'www.com', 'REQUEST_URI' => '/') }
+        it { expect(controller).to eql :host_specific_controller }
+      end
+
       context 'with errors coming from non-matching URL' do
         let(:env) { request.env.merge 'REQUEST_URI' => '/what' }
         it { expect(controller).to eql Gaffe::ErrorsController }

data/spec/spec_helper.rb

@@ -3,6 +3,8 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'rspec'
 require 'action_controller/railtie'
 require 'gaffe'
+require_relative './application_controller_helper'
+require 'gaffe/errors_controller'
 
 RSpec.configure do |config|
   # Disable `should` syntax
@@ -25,10 +27,6 @@ RSpec.configure do |config|
   end
 end
 
-# We need a fake "ApplicationController" because Gaffe's default controller inherits from it
-class ApplicationController < ActionController::Base
-end
-
 def test_request
   if Rails::VERSION::MAJOR >= 5
     ActionDispatch::TestRequest.create

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaffe
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Rémi Prévost
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,6 +132,7 @@ files:
 - lib/gaffe/errors_controller.rb
 - lib/gaffe/errors_controller_resolver.rb
 - lib/gaffe/version.rb
+- spec/application_controller_helper.rb
 - spec/gaffe/errors_controller_resolver_spec.rb
 - spec/gaffe/errors_spec.rb
 - spec/gaffe/gaffe_spec.rb
@@ -161,6 +162,7 @@ signing_key:
 specification_version: 4
 summary: Gaffe handles Rails error pages in a clean, simple way.
 test_files:
+- spec/application_controller_helper.rb
 - spec/gaffe/errors_controller_resolver_spec.rb
 - spec/gaffe/errors_spec.rb
 - spec/gaffe/gaffe_spec.rb