1 files changed, 52 insertions, 55 deletions

diff --git a/actionpack/lib/action_dispatch/routing/inspector.rb b/actionpack/lib/action_dispatch/routing/inspector.rb
index 8c0cf74667..bae50f6a43 100644
--- a/actionpack/lib/action_dispatch/routing/inspector.rb
+++ b/actionpack/lib/action_dispatch/routing/inspector.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "delegate"
+require "io/console/size"
 
 module ActionDispatch
   module Routing
@@ -60,11 +61,11 @@ module ActionDispatch
         @routes = routes
       end
 
-      def format(formatter, filter = nil)
+      def format(formatter, filter = {})
         routes_to_display = filter_routes(normalize_filter(filter))
         routes = collect_routes(routes_to_display)
         if routes.none?
-          formatter.no_routes(collect_routes(@routes))
+          formatter.no_routes(collect_routes(@routes), filter)
           return formatter.result
         end
 
@@ -80,12 +81,12 @@ module ActionDispatch
       end
 
       private
-
         def normalize_filter(filter)
-          if filter.is_a?(Hash) && filter[:controller]
+          if filter[:controller]
             { controller: /#{filter[:controller].downcase.sub(/_?controller\z/, '').sub('::', '/')}/ }
-          elsif filter
-            { controller: /#{filter}/, action: /#{filter}/, verb: /#{filter}/, name: /#{filter}/, path: /#{filter}/ }
+          elsif filter[:grep]
+            { controller: /#{filter[:grep]}/, action: /#{filter[:grep]}/,
+              verb: /#{filter[:grep]}/, name: /#{filter[:grep]}/, path: /#{filter[:grep]}/ }
           end
         end
 
@@ -125,8 +126,8 @@ module ActionDispatch
         end
     end
 
-    class ConsoleFormatter
-      class Sheet
+    module ConsoleFormatter
+      class Base
         def initialize
           @buffer = []
         end
@@ -136,30 +137,44 @@ module ActionDispatch
         end
 
         def section_title(title)
-          @buffer << "\n#{title}:"
         end
 
         def section(routes)
-          @buffer << draw_section(routes)
         end
 
         def header(routes)
-          @buffer << draw_header(routes)
         end
 
-        def no_routes(routes)
+        def no_routes(routes, filter)
           @buffer <<
-          if routes.none?
-            <<~MESSAGE
-            You don't have any routes defined!
+            if routes.none?
+              <<~MESSAGE
+                You don't have any routes defined!
+
+                Please add some routes in config/routes.rb.
+              MESSAGE
+            elsif filter.key?(:controller)
+              "No routes were found for this controller."
+            elsif filter.key?(:grep)
+              "No routes were found for this grep pattern."
+            end
 
-            Please add some routes in config/routes.rb.
-            MESSAGE
-          else
-            "No routes were found for this controller"
-          end
           @buffer << "For more information about routes, see the Rails guide: http://guides.rubyonrails.org/routing.html."
         end
+      end
+
+      class Sheet < Base
+        def section_title(title)
+          @buffer << "\n#{title}:"
+        end
+
+        def section(routes)
+          @buffer << draw_section(routes)
+        end
+
+        def header(routes)
+          @buffer << draw_header(routes)
+        end
 
         private
 
@@ -185,54 +200,36 @@ module ActionDispatch
           end
       end
 
-      class Expanded < ConsoleFormatter
-        def initialize
-          @buffer = []
-        end
-
-        def result
-          @buffer.join("")
-        end
-
+      class Expanded < Base
         def section_title(title)
-          @buffer << "\n#{"[ #{title} ]"}\n"
+          @buffer << "\n#{"[ #{title} ]"}"
         end
 
         def section(routes)
           @buffer << draw_expanded_section(routes)
         end
 
-        def header(routes)
-          @buffer
-        end
-
-        def no_routes(routes)
-          @buffer <<
-          if routes.none?
-            <<~MESSAGE
-            You don't have any routes defined!
-
-            Please add some routes in config/routes.rb.\n
-            MESSAGE
-          else
-            "No routes were found for this controller\n"
-          end
-          @buffer << "For more information about routes, see the Rails guide: http://guides.rubyonrails.org/routing.html."
-        end
-
         private
 
           def draw_expanded_section(routes)
             routes.map.each_with_index do |r, i|
-              <<~MESSAGE
-              --[ Route #{i + 1} ]#{'-' * 60}
-              Prefix            | #{r[:name]}
-              Verb              | #{r[:verb]}
-              URI               | #{r[:path]}
-              Controller#Action | #{r[:reqs]}
+              <<~MESSAGE.chomp
+                #{route_header(index: i + 1)}
+                Prefix            | #{r[:name]}
+                Verb              | #{r[:verb]}
+                URI               | #{r[:path]}
+                Controller#Action | #{r[:reqs]}
               MESSAGE
             end
           end
+
+          def route_header(index:)
+            console_width = IO.console_size.second
+            header_prefix = "--[ Route #{index} ]"
+            dash_remainder = [console_width - header_prefix.size, 0].max
+
+            "#{header_prefix}#{'-' * dash_remainder}"
+          end
       end
     end
 
@@ -264,7 +261,7 @@ module ActionDispatch
               <a href="http://guides.rubyonrails.org/routing.html">Rails Routing from the Outside In</a>.
             </li>
           </ul>
-          MESSAGE
+        MESSAGE
       end
 
       def result