From b50f7ae627a0962efbc1805b603f2d5baa6810d7 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Wed, 26 Sep 2018 11:10:25 -0700 Subject: [PATCH] Routes from Engine Railties should not be an infinite loop --- actionpack/lib/action_dispatch/routing/route_set.rb | 6 ++++-- railties/lib/rails/engine.rb | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 183c386a0c..da4f285f61 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -444,8 +444,10 @@ module ActionDispatch end def include_helpers_now(klass, include_path_helpers) - if namespace = klass.parents.detect { |m| m.respond_to?(:railtie_routes_url_helpers) } - klass.include(namespace.railtie_routes_url_helpers(include_path_helpers)) + namespace = klass.parents.detect { |m| m.respond_to?(:railtie_include_helpers) } + + if namespace && namespace.railtie_namespace.routes != self + namespace.railtie_include_helpers(klass, include_path_helpers) else klass.include(url_helpers(include_path_helpers)) end diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index 108d654ce3..901934826b 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -403,6 +403,12 @@ module Rails define_method(:railtie_helpers_paths) { railtie.helpers_paths } end + unless mod.respond_to?(:railtie_include_helpers) + define_method(:railtie_include_helpers) { |klass, include_path_helpers| + railtie.routes.include_helpers(klass, include_path_helpers) + } + end + unless mod.respond_to?(:railtie_routes_url_helpers) define_method(:railtie_routes_url_helpers) { |include_path_helpers = true| railtie.routes.url_helpers(include_path_helpers) } end