From 42fd563f66798ab286699520dc5f3550a6e4c575 Mon Sep 17 00:00:00 2001 From: Kasper Timm Hansen Date: Fri, 12 Feb 2016 23:17:13 +0100 Subject: Inline `fetch_or_cache_partial`. Wasn't pulling its weight for a simple yield anymore. --- .../renderer/partial_renderer/collection_caching.rb | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'actionview/lib/action_view') diff --git a/actionview/lib/action_view/renderer/partial_renderer/collection_caching.rb b/actionview/lib/action_view/renderer/partial_renderer/collection_caching.rb index a037424498..e13943499c 100644 --- a/actionview/lib/action_view/renderer/partial_renderer/collection_caching.rb +++ b/actionview/lib/action_view/renderer/partial_renderer/collection_caching.rb @@ -15,13 +15,15 @@ module ActionView return yield unless cache_collection? keyed_collection = collection_by_cache_keys - partial_cache = collection_cache.read_multi(*keyed_collection.keys) + cached_partials = collection_cache.read_multi(*keyed_collection.keys) - @collection = keyed_collection.reject { |key, _| partial_cache.key?(key) }.values + @collection = keyed_collection.reject { |key, _| cached_partials.key?(key) }.values rendered_partials = @collection.any? ? yield.dup : [] - fetch_or_cache_partial(partial_cache, order_by: keyed_collection.each_key) do - rendered_partials.shift + keyed_collection.map do |cache_key, _| + cached_partials.fetch(cache_key) do + rendered_partials.shift + end end end @@ -50,12 +52,6 @@ module ActionView key.frozen? ? key.dup : key # #read_multi & #write may require mutability, Dalli 2.6.0. end - def fetch_or_cache_partial(cached_partials, order_by:) - order_by.map do |key| - cached_partials.fetch(key) { yield } - end - end - def collection_cache_rendered_partial(rendered_partial, key_by) if callable_cache_key? key = expanded_cache_key(@options[:cache].call(key_by)) -- cgit v1.2.3