Beef up AD::Rescue to replace global exception handling lost in ApplicationController

1 files changed, 16 insertions, 4 deletions

diff --git a/actionpack/lib/action_dispatch/middleware/rescue.rb b/actionpack/lib/action_dispatch/middleware/rescue.rb
index 1456825526..aee672112c 100644
--- a/actionpack/lib/action_dispatch/middleware/rescue.rb
+++ b/actionpack/lib/action_dispatch/middleware/rescue.rb
@@ -1,14 +1,26 @@
 module ActionDispatch
   class Rescue
-    def initialize(app, rescuer)
-      @app, @rescuer = app, rescuer
+    def initialize(app, rescuers = {}, &block)
+      @app, @rescuers = app, {}
+      rescuers.each { |exception, rescuer| rescue_from(exception, rescuer) }
+      instance_eval(&block) if block_given?
     end
 
     def call(env)
       @app.call(env)
     rescue Exception => exception
-      env['action_dispatch.rescue.exception'] = exception
-      @rescuer.call(env)
+      if rescuer = @rescuers[exception.class.name]
+        env['action_dispatch.rescue.exception'] = exception
+        rescuer.call(env)
+      else
+        raise exception
+      end
     end
+
+    protected
+      def rescue_from(exception, rescuer)
+        exception = exception.class.name if exception.is_a?(Exception)
+        @rescuers[exception.to_s] = rescuer
+      end
   end
 end