multi_fetch_fragments 0.0.13 → 0.0.14

data/lib/multi_fetch_fragments.rb

@@ -16,17 +16,14 @@ module MultiFetchFragments
 
       results = []
 
-      if ActionController::Base.perform_caching && @options[:cache].present?
+      if cache_collection?
 
         additional_cache_options = @options.fetch(:cache_options, {})
         keys_to_collection_map = {}
 
-        # clone the original collection so we can manipulate it without affecting the original
-        @collection = @collection.clone
-
         @collection.each do |item|
-          key = @options[:cache].is_a?(Proc) ? @options[:cache].call(item) : item
- 
+          key = @options[:cache].respond_to?(:call) ? @options[:cache].call(item) : item
+
           key_with_optional_digest = nil
           if defined?(@view.fragment_name_with_digest)
             key_with_optional_digest = @view.fragment_name_with_digest(key)
@@ -34,7 +31,7 @@ module MultiFetchFragments
             key_with_optional_digest = key
           end
 
-          expanded_key = @view.controller.fragment_cache_key(key_with_optional_digest) 
+          expanded_key = @view.controller.fragment_cache_key(key_with_optional_digest)
 
           keys_to_collection_map[expanded_key] = item
         end
@@ -44,13 +41,10 @@ module MultiFetchFragments
 
         result_hash = Rails.cache.read_multi(mutable_keys)
 
-        # if we had a cached value, we don't need to render that object from the collection. 
+        # if we had a cached value, we don't need to render that object from the collection.
         # if it wasn't cached, we need to render those objects as before
-        result_hash.each do |key, value|
-          if value
-            collection_item = keys_to_collection_map[key]
-            @collection.delete(collection_item)
-          end
+        @collection = (keys_to_collection_map.keys - result_hash.keys).map do |key|
+          keys_to_collection_map[key]
         end
 
         non_cached_results = []
@@ -81,6 +75,11 @@ module MultiFetchFragments
       results.join(spacer).html_safe
     end
 
+    def cache_collection?
+      cache_option = @options[:cache].presence || @locals[:cache].presence
+      ActionController::Base.perform_caching && cache_option
+    end
+
   class Railtie < Rails::Railtie
     initializer "multi_fetch_fragments.initialize" do |app|
       ActionView::PartialRenderer.class_eval do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_fetch_fragments
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-29 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails