From 8dc784292b67b842e437632a4ff883572ff97a3e Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 24 Sep 2018 11:30:15 -0700
Subject: Eagerly build the routing helper module after routes are committed

This commit eagerly builds the route helper module after the routes have
been drawn and finalized.  This allows us to cache the helper module but
not have to worry about people accessing the module while route
definition is "in-flight", and automatically deals with cache
invalidation as the module is regenerated anytime someone redraws the
routes.

The restriction this commit introduces is that the url helper module can
only be accessed *after* the routes are done being drawn.

Refs #24554 and #32892
---
 actionpack/lib/action_dispatch/routing/route_set.rb | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/action_dispatch/routing/route_set.rb')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index acce8a7ef3..8f21722a6a 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -378,6 +378,7 @@ module ActionDispatch
         @disable_clear_and_finalize = false
         @finalized                  = false
         @env_key                    = "ROUTES_#{object_id}_SCRIPT_NAME".freeze
+        @url_helpers                = nil
 
         @set    = Journey::Routes.new
         @router = Journey::Router.new @set
@@ -437,6 +438,7 @@ module ActionDispatch
         return if @finalized
         @append.each { |blk| eval_block(blk) }
         @finalized = true
+        @url_helpers = build_url_helper_module true
       end
 
       def clear!
@@ -465,11 +467,10 @@ module ActionDispatch
         return if MountedHelpers.method_defined?(name)
 
         routes = self
-        helpers = routes.url_helpers
 
         MountedHelpers.class_eval do
           define_method "_#{name}" do
-            RoutesProxy.new(routes, _routes_context, helpers, script_namer)
+            RoutesProxy.new(routes, _routes_context, routes.url_helpers, script_namer)
           end
         end
 
@@ -480,7 +481,20 @@ module ActionDispatch
         RUBY
       end
 
+      class UnfinalizedRouteSet < StandardError
+      end
+
       def url_helpers(supports_path = true)
+        raise UnfinalizedRouteSet, "routes have not been finalized. Please call `finalize!` or use `draw(&block)`" unless @finalized
+
+        if supports_path
+          @url_helpers
+        else
+          build_url_helper_module false
+        end
+      end
+
+      def build_url_helper_module(supports_path)
         routes = self
 
         Module.new do
-- 
cgit v1.2.3