divert 0.8 → 0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16f5b5e662bdbbb632e00019f1e86196f5120875
-  data.tar.gz: 5f92cbb7f07b6d07d95ff743681cc8461efae889
+  metadata.gz: 8f011293941b1d03cdd4a51c1b9ca0c409e51a93
+  data.tar.gz: de4f7bfe990bc1923b3f46b33faa0650b7a13e28
 SHA512:
-  metadata.gz: 0a84c3129f19d06790c80321eca99a1dfa40cf35ec296cf120178412873205b7a78d1e22ab978724c0da88b08b68c25043b0991319092dfc28e49252e5ad01ed
-  data.tar.gz: 1ba5c7dd0ed80d7d388aae650b1b45431732baf6d3c85e0e5a98a0863601b1334ea657ec99f577d9477927e2b43394861365bfc207af99f3220881bca98d9f55
+  metadata.gz: 30db07838771b1297fdff9c751e78da8eff5a843064da2c5c074568ba9226523c559742b21ef1cabfa898a90631a8b525468d9bf3379b7ebb3e3d96d9d82d62f
+  data.tar.gz: 34203e63dbacb99b9ed8cc1bd69313053a15ccbd04fb103e75fce0e27318445edbabfbfec17ef1aedb86a9cb23e71f477444116035cc8f22b4179faa583491ae

data/README.rdoc

@@ -15,10 +15,16 @@ to the END of your routes file.
 The route added catches anything so needs to go last.
 
 Finally add:
-  include Divert
-to the controller specified in the above route.
+  class ApplicationController < ActionController::Base
+    include Divert
 
-It will not interfere with actions defined in that controller
+    rescue_from ActiveRecord::RecordNotFound do |exception|
+      divert(request.env['PATH_INFO'])
+    end
+  end
+to your ApplicationController. The `rescue_from ActiveRecord::RecordNotFound` is optional, but allows Divert to recover from `Model.find(...)` errors with a redirect or 404.
+
+It will not interfere with actions defined in the configured controller
 or view files that don't have an action defined.
 Cos it's nice like that.
 

data/lib/divert.rb

@@ -16,29 +16,34 @@ module Divert
   end
 
   def action_missing path = nil
+    controller = Divert.configuration.controller || controller_name
 
     path ||= params[:path]
     if action_methods.include? path
       send path and return
     end
 
-    if template_exists?(path, [controller_name])
-      render "#{controller_name}/#{path}" and return
+    if template_exists?(path, [controller])
+      render "#{controller}/#{path}" and return
     end
 
     if Divert.configuration.save_to_db && (redirect = Redirect.hit(request.fullpath))
       redirect_to redirect
     else
-      unless template_exists? 'divert', [controller_name]
-        render text:"Missing divert view: #{controller_name}/divert.html.erb", :status => 404 and return
+      unless template_exists? 'divert', [controller]
+        render text:"Missing divert view: #{controller}/divert.html.erb", :status => 404 and return
       end
-      render "#{controller_name}/divert", :status => 404 and return
+      render "#{controller}/divert", :status => 404 and return
     end
   end
+
+  alias_method :divert, :action_missing
 end
 
 class ActionDispatch::Routing::Mapper
   def divert_with controller
+    # Set controller in configuration if not already set
+    Divert.configuration.controller ||= controller.to_s
     get ':action' => controller.to_s
     get '*path' => "#{controller}#action_missing", :format => false
   end

data/lib/divert/configuration.rb

@@ -1,6 +1,7 @@
 module Divert
   class Configuration
     attr_accessor :save_to_db
+    attr_accessor :controller
 
     def initialize
       @save_to_db = true

data/lib/divert/version.rb

@@ -1,3 +1,3 @@
 module Divert
-  VERSION = "0.8"
+  VERSION = "0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: divert
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: '0.9'
 platform: ruby
 authors:
 - Nick Butler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Easily handle 404s and redirects with your rails app.
@@ -149,4 +149,3 @@ test_files:
 - test/test_helper.rb
 - test/unit/divert/redirect_test.rb
 - test/unit/helpers/divert/redirects_helper_test.rb
-has_rdoc: