Merge pull request #17944 from tjschuck/mounted_named_routes_regression

Mounted Rack apps should have default named routes based on app name

2 files changed, 43 insertions, 14 deletions

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 5040aa82b2..f07a4aa674 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -579,15 +579,14 @@ module ActionDispatch
 
           raise "A rack application must be specified" unless path
 
-          rails_app = rails_app? app
-          options[:as] ||= app.railtie_name if rails_app
+          options[:as] ||= app_name(app)
 
           target_as       = name_for_action(options[:as], path)
           options[:via] ||= :all
 
           match(path, options.merge(:to => app, :anchor => false, :format => false))
 
-          define_generate_prefix(app, target_as) if rails_app
+          define_generate_prefix(app, target_as) if rails_app?(app)
           self
         end
 
@@ -612,6 +611,14 @@ module ActionDispatch
             app.is_a?(Class) && app < Rails::Railtie
           end
 
+          def app_name(app)
+            if rails_app?(app)
+              app.railtie_name
+            elsif class_name = app.try(:name)
+              ActiveSupport::Inflector.underscore(class_name).tr("/", "_")
+            end
+          end
+
           def define_generate_prefix(app, name)
             _route = @set.named_routes.get name
             _routes = @set
diff --git a/actionpack/test/dispatch/routing/inspector_test.rb b/actionpack/test/dispatch/routing/inspector_test.rb
index 5910f364cc..3d3d4b74ae 100644
--- a/actionpack/test/dispatch/routing/inspector_test.rb
+++ b/actionpack/test/dispatch/routing/inspector_test.rb
@@ -2,6 +2,11 @@ require 'abstract_unit'
 require 'rails/engine'
 require 'action_dispatch/routing/inspector'
 
+class MountedRackApp
+  def self.call(env)
+  end
+end
+
 module ActionDispatch
   module Routing
     class RoutesInspectorTest < ActiveSupport::TestCase
@@ -204,19 +209,36 @@ module ActionDispatch
         ], output
       end
 
-      class RackApp
-        def self.call(env)
+      def test_rake_routes_shows_route_with_rack_app
+        output = draw do
+          get 'foo/:id' => MountedRackApp, :id => /[A-Z]\d{5}/
         end
+
+        assert_equal [
+          "Prefix Verb URI Pattern        Controller#Action",
+          "       GET  /foo/:id(.:format) MountedRackApp {:id=>/[A-Z]\\d{5}/}"
+        ], output
       end
 
-      def test_rake_routes_shows_route_with_rack_app
+      def test_rake_routes_shows_named_route_with_mounted_rack_app
         output = draw do
-          get 'foo/:id' => RackApp, :id => /[A-Z]\d{5}/
+          mount MountedRackApp => '/foo'
         end
 
         assert_equal [
-          "Prefix Verb URI Pattern        Controller#Action",
-          "       GET  /foo/:id(.:format) #{RackApp.name} {:id=>/[A-Z]\\d{5}/}"
+          "          Prefix Verb URI Pattern Controller#Action",
+          "mounted_rack_app      /foo        MountedRackApp"
+        ], output
+      end
+
+      def test_rake_routes_shows_overridden_named_route_with_mounted_rack_app_with_name
+        output = draw do
+          mount MountedRackApp => '/foo', as: 'blog'
+        end
+
+        assert_equal [
+          "Prefix Verb URI Pattern Controller#Action",
+          "  blog      /foo        MountedRackApp"
         ], output
       end
 
@@ -229,21 +251,21 @@ module ActionDispatch
 
         output = draw do
           scope :constraint => constraint.new do
-            mount RackApp => '/foo'
+            mount MountedRackApp => '/foo'
           end
         end
 
         assert_equal [
-          "Prefix Verb URI Pattern Controller#Action",
-          "   foo      /foo        #{RackApp.name} {:constraint=>( my custom constraint )}"
+          "          Prefix Verb URI Pattern Controller#Action",
+          "mounted_rack_app      /foo        MountedRackApp {:constraint=>( my custom constraint )}"
         ], output
       end
 
       def test_rake_routes_dont_show_app_mounted_in_assets_prefix
         output = draw do
-          get '/sprockets' => RackApp
+          get '/sprockets' => MountedRackApp
         end
-        assert_no_match(/RackApp/, output.first)
+        assert_no_match(/MountedRackApp/, output.first)
         assert_no_match(/\/sprockets/, output.first)
       end