1 files changed, 10 insertions, 30 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
index 5c50f9ec6a..64230ff1ae 100644
--- a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
@@ -14,18 +14,17 @@ module ActionDispatch
     end
 
     def call(env)
-      begin
-        response = (_, headers, body = @app.call(env))
-
-        if headers['X-Cascade'] == 'pass'
-          body.close if body.respond_to?(:close)
-          raise ActionController::RoutingError, "No route matches [#{env['REQUEST_METHOD']}] #{env['PATH_INFO'].inspect}"
-        end
-      rescue Exception => exception
-        raise exception if env['action_dispatch.show_exceptions'] == false
+      _, headers, body = response = @app.call(env)
+
+      if headers['X-Cascade'] == 'pass'
+        body.close if body.respond_to?(:close)
+        raise ActionController::RoutingError, "No route matches [#{env['REQUEST_METHOD']}] #{env['PATH_INFO'].inspect}"
       end
 
-      exception ? render_exception(env, exception) : response
+      response
+    rescue Exception => exception
+      raise exception if env['action_dispatch.show_exceptions'] == false
+      render_exception(env, exception)
     end
 
     private
@@ -84,28 +83,9 @@ module ActionDispatch
     end
 
     def routes_inspector(exception)
-      return false unless @routes_app.respond_to?(:routes)
-      if exception.is_a?(ActionController::RoutingError) || exception.is_a?(ActionView::Template::Error)
+      if @routes_app.respond_to?(:routes) && (exception.is_a?(ActionController::RoutingError) || exception.is_a?(ActionView::Template::Error))
         ActionDispatch::Routing::RoutesInspector.new(@routes_app.routes.routes)
       end
     end
-
-    class TableRoutesFormatter
-      def initialize(view)
-        @view = view
-        @buffer = []
-      end
-
-      def section(type, title, routes)
-        @buffer << %(<tr><th colspan="4">#{title}</th></tr>)
-        @buffer << @view.render(partial: "routes/route", collection: routes)
-      end
-
-      def result
-        @view.raw @view.render(layout: "routes/route_wrapper") {
-          @view.raw @buffer.join("\n")
-        }
-      end
-    end
   end
 end