objectreload-pagination 0.1.7 → 0.1.8

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/action_controller/rescue_with_helper.rb

@@ -0,0 +1,16 @@
+# When an exception happens inside a view, it is wrapped with an
+# ActionView::TemplateError. The lookup for the rescue_with_handler
+# then fails to find the handle for the original exception. This solution
+# special cases the template error to look also at the wrapped exception
+# and if there is a handler for that exception, then call it and ignore
+# the wrapping.
+module RescueWithHelper
+  def rescue_with_handler(exception)
+    if ((exception.class == ActionView::TemplateError) &&
+      (orig_exception = exception.original_exception) &&
+      (orig_handler = handler_for_rescue(orig_exception)))
+      exception = orig_exception
+    end
+    super(exception)
+  end
+end

data/lib/pagination.rb

@@ -2,6 +2,9 @@
 require 'active_record/base_extensions'
 require 'active_record/scope_extensions'
 
+# Loads
+require 'action_controller/rescue_with_helper'
+
 # Loads internal pagination classes
 require 'pagination/collection'
 require 'pagination/named_scope'
@@ -11,6 +14,11 @@ require 'pagination/view_helpers'
 # Loads the :paginate view helper
 ActionView::Base.send :include, Pagination::ViewHelpers
 
-if defined?(ActionController::Base) and ActionController::Base.respond_to? :rescue_responses
-  ActionController::Base.rescue_responses['Pagination::InvalidPage'] = :not_found
+# Load :rescue_with_handler - solution: https://rails.lighthouseapp.com/projects/8994/tickets/2034-exceptions-in-views-hard-to-catch
+ActionController::Base.send :include, RescueWithHelper
+
+ActionController::Base.send(:rescue_from, Pagination::InvalidPage, :with => :not_found)
+
+def not_found
+   render_optional_error_file 404
 end

data/test/collection_test.rb

@@ -57,10 +57,6 @@ class CollectionTest < Test::Unit::TestCase
       should "rise an error ArgumentError" do
         assert_raise(ArgumentError) { paginate_collection(@collection, 2, -2) }
       end
-
-      should "test_rescue_response_hook_presence" do
-        assert_equal :not_found, ActionController::Base.rescue_responses['Pagination::InvalidPage']
-      end
     end
 
     context "collection is empty" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Mateusz Drozdzynski
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-01 00:00:00 +03:00
+date: 2010-07-05 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -35,6 +35,7 @@ files:
 - Rakefile
 - VERSION
 - init.rb
+- lib/action_controller/rescue_with_helper.rb
 - lib/active_record/base_extensions.rb
 - lib/active_record/scope_extensions.rb
 - lib/pagination.rb