From 8a5059383e7bf4bfe0bfd308ab511d578b1a6ce8 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 18 Feb 2016 15:12:18 -0800 Subject: push partial name regexp up we know that all child templates will be considered as "partials", so the only one that needs detection by name is the root node --- actionview/lib/action_view/digestor.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionview/lib/action_view') diff --git a/actionview/lib/action_view/digestor.rb b/actionview/lib/action_view/digestor.rb index d0b86b4c03..b99d1af998 100644 --- a/actionview/lib/action_view/digestor.rb +++ b/actionview/lib/action_view/digestor.rb @@ -28,7 +28,8 @@ module ActionView # (Concurrent::Map's lookups have volatile semantics) finder.digest_cache[cache_key] || @@digest_mutex.synchronize do finder.digest_cache.fetch(cache_key) do # re-check under lock - root = tree(name, finder) + partial = name.include?("/_") + root = tree(name, finder, partial) dependencies.each do |injected_dep| root.children << Injected.new(injected_dep, nil, nil) end @@ -44,7 +45,6 @@ module ActionView # Create a dependency tree for template named +name+. def tree(name, finder, partial = false, seen = {}) logical_name = name.gsub(%r|/_|, "/") - partial = partial || name.include?("/_") if finder.disable_cache { finder.exists?(logical_name, [], partial) } template = finder.disable_cache { finder.find(logical_name, [], partial) } -- cgit v1.2.3