multi_fetch_fragments 0.0.9 → 0.0.10

data/lib/multi_fetch_fragments.rb

@@ -18,17 +18,19 @@ module MultiFetchFragments
 
       if ActionController::Base.perform_caching && @options[:cache].present?
 
+        additional_cache_options = @options.fetch(:cache_options, {})
         keys_to_collection_map = {}
 
-        @collection.each do |item| 
+        @collection.each do |item|
           key = @options[:cache].is_a?(Proc) ? @options[:cache].call(item) : item
           expanded_key = ActiveSupport::Cache.expand_cache_key(key)
-          keys_to_collection_map[expanded_key] = item 
+          keys_to_collection_map[expanded_key] = item
         end
 
-        collection_to_keys_map = keys_to_collection_map.invert
+        # cache.read_multi & cache.write interfaces may require mutable keys, ie. dalli 2.6.0
+        mutable_keys = keys_to_collection_map.keys.collect { |key| key.dup }
 
-        result_hash = Rails.cache.read_multi(keys_to_collection_map.keys)
+        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 it wasn't cached, we need to render those objects as before
@@ -43,22 +45,18 @@ module MultiFetchFragments
 
         # sequentially render any non-cached objects remaining
         if @collection.any?
-
-          #store these to use later for sorting the results
-          collection_objects_clone = @collection.clone
-
           non_cached_results = @template ? collection_with_template : collection_without_template
         end
 
         # sort the result according to the keys that were fed in, cache the non-cached results
-        keys_to_collection_map.each do |key, value|
+        mutable_keys.each do |key|
 
           cached_value = result_hash[key]
           if cached_value
             results << cached_value
           else
             non_cached_result = non_cached_results.shift
-            Rails.cache.write(key, non_cached_result)
+            Rails.cache.write(key, non_cached_result, additional_cache_options)
 
             results << non_cached_result
           end
@@ -67,7 +65,7 @@ module MultiFetchFragments
       else
         results = @template ? collection_with_template : collection_without_template
       end
-      
+
       results.join(spacer).html_safe
     end
 
@@ -78,4 +76,4 @@ module MultiFetchFragments
       end
     end
   end
-end
+end

metadata

@@ -1,46 +1,73 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: multi_fetch_fragments
-version: !ruby/object:Gem::Version
-  version: 0.0.9
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 10
+  version: 0.0.10
 platform: ruby
-authors:
+authors: 
 - Nathan Kontny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
-dependencies: []
+
+date: 2012-12-17 00:00:00 -06:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        version: "2"
+  type: :development
+  version_requirements: *id001
 description: 
 email: nate.kontny@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/multi_fetch_fragments.rb
+has_rdoc: true
 homepage: 
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: multi_fetch_fragments allows you to render a collection of partials through
-  Rails multi read caching mechanism.
+summary: multi_fetch_fragments allows you to render a collection of partials through Rails multi read caching mechanism.
 test_files: []
+