Defer route drawing to the first request, or when url_helpers called.

Executes the first routes reload in middleware, or when the route set
url_helpers is called. Previously, this was executed unconditionally on
boot, which can slow down boot time unnecessarily for larger apps with
lots of routes.

Author: gmcgibbon

actionpack/lib/action_dispatch/testing/assertions/routing.rb

@@ -46,7 +46,9 @@ def with_routing(&block)
           def create_routes
             app = self.app
             routes = ActionDispatch::Routing::RouteSet.new
-            rack_app = app.config.middleware.build(routes)
+            middleware = app.config.middleware.dup
+            middleware.delete(Rails::Rack::LoadRoutes) if defined?(Rails::Rack::LoadRoutes)
+            rack_app = middleware.build(routes)
             https = integration_session.https?
             host = integration_session.host
 

actionpack/test/abstract_unit.rb

@@ -34,6 +34,8 @@ def env
       @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "test")
     end
 
+    def application; end
+
     def root; end
   end
 end

actionpack/test/dispatch/routing_assertions_test.rb

@@ -4,7 +4,11 @@
 require "rails/engine"
 require "controller/fake_controllers"
 
-class SecureArticlesController < ArticlesController; end
+class SecureArticlesController < ArticlesController
+  def index
+    render(inline: "")
+  end
+end
 class BlockArticlesController < ArticlesController; end
 class QueryArticlesController < ArticlesController; end
 
@@ -276,6 +280,20 @@ class RoutingAssertionsControllerTest < ActionController::TestCase
 
   class WithRoutingTest < ActionController::TestCase
     include RoutingAssertionsSharedTests::WithRoutingSharedTests
+
+    test "with_routing routes are reachable" do
+      @controller = SecureArticlesController.new
+
+      with_routing do |routes|
+        routes.draw do
+          get :new_route, to: "secure_articles#index"
+        end
+
+        get :index
+
+        assert_predicate(response, :ok?)
+      end
+    end
   end
 end
 
@@ -295,6 +313,18 @@ class RoutingAssertionsIntegrationTest < ActionDispatch::IntegrationTest
 
   class WithRoutingTest < ActionDispatch::IntegrationTest
     include RoutingAssertionsSharedTests::WithRoutingSharedTests
+
+    test "with_routing routes are reachable" do
+      with_routing do |routes|
+        routes.draw do
+          get :new_route, to: "secure_articles#index"
+        end
+
+        get "/new_route"
+
+        assert_predicate(response, :ok?)
+      end
+    end
   end
 
   class WithRoutingSettingsTest < ActionDispatch::IntegrationTest

railties/CHANGELOG.md

@@ -1,3 +1,12 @@
+*   Defer route drawing to the first request, or when url_helpers are called
+
+    Executes the first routes reload in middleware, or when a route set's
+    url_helpers receives a route call / asked if it responds to a route.
+    Previously, this was executed unconditionally on boot, which can
+    slow down boot time unnecessarily for larger apps with lots of routes.
+
+    *Gannon McGibbon*
+
 *   Add Rubocop and GitHub Actions to plugin generator.
     This can be skipped using --skip-rubocop and --skip-ci.
 

railties/lib/rails/application.rb

@@ -9,6 +9,7 @@
 require "active_support/encrypted_configuration"
 require "active_support/hash_with_indifferent_access"
 require "active_support/configuration_file"
+require "active_support/parameter_filter"
 require "rails/engine"
 require "rails/autoloaders"
 
@@ -153,6 +154,10 @@ def reload_routes!
       routes_reloader.reload!
     end
 
+    def reload_routes_unless_loaded # :nodoc:
+      initialized? && routes_reloader.execute_unless_loaded
+    end
+
     # Returns a key generator (ActiveSupport::CachingKeyGenerator) for a
     # specified +secret_key_base+. The return value is memoized, so additional
     # calls with the same +secret_key_base+ will return the same key generator

railties/lib/rails/application/default_middleware_stack.rb

@@ -62,6 +62,8 @@ def build_stack
             middleware.use ::ActionDispatch::ActionableExceptions
           end
 
+          middleware.use ::Rails::Rack::LoadRoutes unless app.config.eager_load
+
           if config.reloading_enabled?
             middleware.use ::ActionDispatch::Reloader, app.reloader
           end

railties/lib/rails/application/finisher.rb

@@ -159,7 +159,6 @@ def self.complete(_state)
       initializer :set_routes_reloader_hook do |app|
         reloader = routes_reloader
         reloader.eager_load = app.config.eager_load
-        reloader.execute
         reloaders << reloader
 
         app.reloader.to_run do
@@ -177,7 +176,12 @@ def self.complete(_state)
           ActiveSupport.run_load_hooks(:after_routes_loaded, self)
         end
 
-        ActiveSupport.run_load_hooks(:after_routes_loaded, self)
+        if reloader.eager_load
+          reloader.execute
+          ActiveSupport.run_load_hooks(:after_routes_loaded, self)
+        elsif reloader.loaded
+          ActiveSupport.run_load_hooks(:after_routes_loaded, self)
+        end
       end
 
       # Set clearing dependencies after the finisher hook to ensure paths

railties/lib/rails/application/routes_reloader.rb

@@ -7,7 +7,7 @@ class Application
     class RoutesReloader
       include ActiveSupport::Callbacks
 
-      attr_reader :route_sets, :paths, :external_routes
+      attr_reader :route_sets, :paths, :external_routes, :loaded
       attr_accessor :eager_load
       attr_writer :run_after_load_paths # :nodoc:
       delegate :execute_if_updated, :execute, :updated?, to: :updater
@@ -17,9 +17,11 @@ def initialize
         @route_sets = []
         @external_routes = []
         @eager_load = false
+        @loaded = false
       end
 
       def reload!
+        @loaded = true
         clear!
         load_paths
         finalize!
@@ -28,6 +30,14 @@ def reload!
         revert
       end
 
+      def execute_unless_loaded
+        unless @loaded
+          execute
+          ActiveSupport.run_load_hooks(:after_routes_loaded, Rails.application)
+          true
+        end
+      end
+
     private
       def updater
         @updater ||= begin

railties/lib/rails/commands/routes/routes_command.rb

@@ -23,6 +23,7 @@ def invoke_command(*)
       desc "routes", "List all the defined routes"
       def perform(*)
         boot_application!
+        Rails.application.reload_routes_unless_loaded
         require "action_dispatch/routing/inspector"
 
         say inspector.format(formatter, routes_filter)

railties/lib/rails/commands/unused_routes/unused_routes_command.rb

@@ -41,6 +41,7 @@ def action_missing?
 
       def perform(*)
         boot_application!
+        Rails.application.reload_routes_unless_loaded
         require "action_dispatch/routing/inspector"
 
         say(inspector.format(formatter, routes_filter))