Remove Rescue middleware that was never used by Rails.

3 files changed, 1 insertions, 43 deletions

diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index bcb2ac8ffc..070ffbdceb 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -60,7 +60,6 @@ module ActionDispatch
     autoload :PublicExceptions
     autoload :Reloader
     autoload :RemoteIp
-    autoload :Rescue
     autoload :ShowExceptions
     autoload :Static
   end
diff --git a/actionpack/lib/action_dispatch/middleware/rescue.rb b/actionpack/lib/action_dispatch/middleware/rescue.rb
deleted file mode 100644
index aee672112c..0000000000
--- a/actionpack/lib/action_dispatch/middleware/rescue.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-module ActionDispatch
-  class Rescue
-    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
-      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
diff --git a/actionpack/test/controller/rescue_test.rb b/actionpack/test/controller/rescue_test.rb
index c445285538..86d6737cbb 100644
--- a/actionpack/test/controller/rescue_test.rb
+++ b/actionpack/test/controller/rescue_test.rb
@@ -338,23 +338,8 @@ class RescueTest < ActionDispatch::IntegrationTest
     end
   end
 
-  test 'rescue routing exceptions' do
-    raiser = proc { |env| raise ActionController::RoutingError, "Did not handle the request" }
-    @app = ActionDispatch::Rescue.new(raiser) do
-      rescue_from ActionController::RoutingError, lambda { |env| [200, {"Content-Type" => "text/html"}, ["Gotcha!"]] }
-    end
-
-    get '/b00m'
-    assert_equal "Gotcha!", response.body
-  end
-
-  test 'unrescued exception' do
-    raiser = proc { |env| raise ActionController::RoutingError, "Did not handle the request" }
-    @app = ActionDispatch::Rescue.new(raiser)
-    assert_raise(ActionController::RoutingError) { get '/b00m' }
-  end
-
   private
+
     def with_test_routing
       with_routing do |set|
         set.draw do