diff options
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/template/resolver.rb | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb index 8f87d6da8b..ab09dbece4 100644 --- a/actionpack/lib/action_view/template/resolver.rb +++ b/actionpack/lib/action_view/template/resolver.rb @@ -56,21 +56,14 @@ module ActionView # on the CacheEntry itself cache_entry.synchronize do if Resolver.caching? - # all templates are cached forever the first time they are accessed cache_entry.templates ||= yield else - # templates are still cached, but are only returned if they are - # all still current - fresh = yield + fresh_templates = yield - mtime = cache_entry.templates && cache_entry.templates.map(&:updated_at).max - - newer = !mtime || fresh.empty? || fresh.any? { |t| t.updated_at > mtime } - - if newer - cache_entry.templates = fresh + if templates_have_changed?(cache_entry.templates, fresh_templates) + cache_entry.templates = fresh_templates else - cache_entry.templates + cache_entry.templates ||= [] end end end @@ -81,6 +74,21 @@ module ActionView @data.clear end end + + private + + def templates_have_changed?(cached_templates, fresh_templates) + # if either the old or new template list is empty, we don't need to (and can't) + # compare modification times, and instead just check whether the lists are different + if cached_templates.blank? || fresh_templates.blank? + return fresh_templates.blank? != cached_templates.blank? + end + + cached_templates_max_updated_at = cached_templates.map(&:updated_at).max + + # if a template has changed, it will be now be newer than all the cached templates + fresh_templates.any? { |t| t.updated_at > cached_templates_max_updated_at } + end end cattr_accessor :caching |