Changeset 7822

Timestamp:

10/10/07 02:34:42 (1 year ago)

Author:

bitsweat

Message:

rescue_from accepts :with => lambda { |exception| ... } or a normal block. Closes #9827.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/rescue.rb (modified) (2 diffs)
• trunk/actionpack/test/controller/rescue_test.rb (modified) (3 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* rescue_from accepts :with => lambda { |exception| ... } or a normal block.  #9827 [lifofifo]
-
-* Add :status to redirect_to allowing users to choose their own response code without manually setting headers. #8297 [codahale, chasgrundy]

trunk/actionpack/lib/action_controller/rescue.rb

@@ -72 +72 @@
-      #     end
-      # end
-
+, &block
-        options = klasses.extract_options!
- # allow nil
-raise ArgumentError, "Need a handler. Supply an options hash that has a :with key as the last argument."
+
+block_given? ? options[:with] = block : raise(ArgumentError, "Need a handler. Supply an options hash that has a :with key as the last argument.")
-        end
-
@@ -193 +193 @@
-
-      def handler_for_rescue(exception)
-
+
+
-          method(handler)
+        when Proc
+          handler.bind(self)
-        end
-      end

trunk/actionpack/test/controller/rescue_test.rb

@@ -10 +10 @@
-  end
-
+  class NotAllowed < StandardError
+  end
+
+  class InvalidRequest < StandardError
+  end
+
+  class BadGateway < StandardError
+  end
+
+  class ResourceUnavailable < StandardError
+  end
+
-  rescue_from NotAuthorized, :with => :deny_access
-  rescue_from RecordInvalid, :with => :show_errors
+
+  rescue_from NotAllowed, :with => proc { head :forbidden }
+  rescue_from InvalidRequest, :with => proc { |exception| render :text => exception.message }
+
+  rescue_from BadGateway do
+    head :status => 502
+  end
+
+  rescue_from ResourceUnavailable do |exception|
+    render :text => exception.message
+  end
-
-  def raises
@@ -30 +53 @@
-  end
-
+  def not_allowed
+    raise NotAllowed
+  end
+
+  def invalid_request
+    raise InvalidRequest
+  end
+
-  def record_invalid
-    raise RecordInvalid
-  end
-  
+  def bad_gateway
+    raise BadGateway
+  end
+
+  def resource_unavailable
+    raise ResourceUnavailable
+  end
+
-  def missing_template
-  end
@@ -246 +285 @@
-  end
-
+  def test_proc_rescue_handler
+    get :not_allowed
+    assert_response :forbidden
+  end
+
+  def test_proc_rescue_handle_with_argument
+    get :invalid_request
+    assert_equal "RescueController::InvalidRequest", @response.body
+  end
+
+  def test_block_rescue_handler
+    get :bad_gateway
+    assert_response 502
+  end
+
+  def test_block_rescue_handler_with_argument
+    get :resource_unavailable
+    assert_equal "RescueController::ResourceUnavailable", @response.body
+  end
+
-  protected
-    def with_all_requests_local(local = true)