Permalink
Browse files

Exceptions from views should be rescued based on the original excepti…

…on. If a handler for original exception is missing then apply ActiveView::TemplateError

[#2034 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
  • Loading branch information...
1 parent ad8f4df commit 33c5689e2d04aa08759903bc5d1e4de3bf6c35dd Neeraj Singh committed with josevalim Jun 8, 2010
View
1 actionpack/lib/action_controller.rb
@@ -28,6 +28,7 @@ module ActionController
autoload :Rendering
autoload :RequestForgeryProtection
autoload :Rescue
+ autoload :RescueWithHelper
autoload :Responder
autoload :SessionManagement
autoload :Streaming
View
6 actionpack/lib/action_controller/base.rb
@@ -49,7 +49,9 @@ def self.without_modules(*modules)
AbstractController::Callbacks,
# The same with rescue, append it at the end to wrap as much as possible.
- Rescue
+ Rescue,
+
+ RescueWithHelper
]
MODULES.each do |mod|
@@ -69,4 +71,4 @@ def self.inherited(klass)
end
end
-require "action_controller/deprecated/base"
+require "action_controller/deprecated/base"
View
14 actionpack/lib/action_controller/metal/rescue_with_helper.rb
@@ -0,0 +1,14 @@
+module ActionController #:nodoc:
+ 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
+end
View
27 actionpack/test/controller/rescue_test.rb
@@ -79,6 +79,14 @@ class ResourceUnavailableToRescueAsString < StandardError
render :text => 'no way'
end
+ rescue_from ActionView::TemplateError do
+ render :text => 'action_view templater error'
+ end
+
+ rescue_from IOError do
+ render :text => 'io error'
+ end
+
before_filter(:only => :before_filter_raises) { raise 'umm nice' }
def before_filter_raises
@@ -141,6 +149,14 @@ def resource_unavailable_raise_as_string
def missing_template
end
+
+ def io_error_in_view
+ raise ActionView::TemplateError.new(nil, {}, IOError.new('this is io error'))
+ end
+
+ def zero_division_error_in_view
+ raise ActionView::TemplateError.new(nil, {}, ZeroDivisionError.new('this is zero division error'))
+ end
protected
def deny_access
@@ -228,6 +244,17 @@ def test_exception_in_parent_controller
end
class RescueControllerTest < ActionController::TestCase
+
+ def test_io_error_in_view
+ get :io_error_in_view
+ assert_equal 'io error', @response.body
+ end
+
+ def test_zero_division_error_in_view
+ get :zero_division_error_in_view
+ assert_equal 'action_view templater error', @response.body
+ end
+
def test_rescue_handler
get :not_authorized
assert_response :forbidden

0 comments on commit 33c5689

Please sign in to comment.