Merge pull request #32153 from bogdanvlviv/rails-routes-32130

Change message on the empty result of searching routes by `rails routes` with `-c` or `-g` 

2 files changed, 37 insertions, 44 deletions

diff --git a/actionpack/lib/action_dispatch/routing.rb b/actionpack/lib/action_dispatch/routing.rb
index 776058d98e..5cde677051 100644
--- a/actionpack/lib/action_dispatch/routing.rb
+++ b/actionpack/lib/action_dispatch/routing.rb
@@ -243,9 +243,9 @@ module ActionDispatch
   #
   #   rails routes
   #
-  # Target specific controllers by prefixing the command with <tt>-c</tt> option. Use
-  # <tt>--expanded</tt> to turn on the expanded table formatting mode.
-  #
+  # Target a specific controller with <tt>-c</tt>, or grep routes
+  # using <tt>-g</tt>. Useful in conjunction with <tt>--expanded</tt>
+  # which displays routes vertically.
   module Routing
     extend ActiveSupport::Autoload
 
diff --git a/actionpack/lib/action_dispatch/routing/inspector.rb b/actionpack/lib/action_dispatch/routing/inspector.rb
index 19dfb44283..7656c263a3 100644
--- a/actionpack/lib/action_dispatch/routing/inspector.rb
+++ b/actionpack/lib/action_dispatch/routing/inspector.rb
@@ -61,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
 
@@ -83,10 +83,16 @@ module ActionDispatch
       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_pattern]
+            {
+              controller: /#{filter[:grep_pattern]}/,
+              action: /#{filter[:grep_pattern]}/,
+              verb: /#{filter[:grep_pattern]}/,
+              name: /#{filter[:grep_pattern]}/,
+              path: /#{filter[:grep_pattern]}/
+            }
           end
         end
 
@@ -127,7 +133,7 @@ module ActionDispatch
     end
 
     module ConsoleFormatter
-      class Sheet
+      class Base
         def initialize
           @buffer = []
         end
@@ -137,18 +143,15 @@ 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
@@ -156,11 +159,27 @@ module ActionDispatch
 
             Please add some routes in config/routes.rb.
             MESSAGE
-          else
-            "No routes were found for this controller"
+          elsif filter.has_key?(:controller)
+            "No routes were found for this controller."
+          elsif filter.has_key?(:grep_pattern)
+            "No routes were found for this grep pattern."
           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
 
@@ -186,46 +205,20 @@ module ActionDispatch
           end
       end
 
-      class Expanded
-        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
+              <<~MESSAGE.chomp
               #{route_header(index: i + 1)}
               Prefix            | #{r[:name]}
               Verb              | #{r[:verb]}