multi_fetch_fragments 0.0.16 → 0.0.17

data/lib/multi_fetch_fragments.rb

@@ -18,7 +18,7 @@ module MultiFetchFragments
 
       if cache_collection?
 
-        additional_cache_options = @options.fetch(:cache_options, {})
+        additional_cache_options = @options[:cache_options] || @locals[:cache_options] || {}
         keys_to_collection_map = {}
 
         @collection.each do |item|
@@ -33,7 +33,8 @@ module MultiFetchFragments
             key_with_optional_digest = key
           end
 
-          expanded_key = @view.controller.fragment_cache_key(key_with_optional_digest)
+
+          expanded_key = fragment_cache_key(key_with_optional_digest)
 
           keys_to_collection_map[expanded_key] = item
         end
@@ -41,7 +42,7 @@ module MultiFetchFragments
         # 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(mutable_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
@@ -82,6 +83,12 @@ module MultiFetchFragments
       ActionController::Base.perform_caching && cache_option
     end
 
+    # from Rails fragment_cache_key in ActionController::Caching::Fragments. Adding it here since it's tucked inside an instance method on the controller, and 
+    # it's utility could be used in a view without a controller
+    def fragment_cache_key(key)
+      ActiveSupport::Cache.expand_cache_key(key.is_a?(Hash) ? url_for(key).split("://").last : key, :views)
+    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.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -54,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: multi_fetch_fragments allows you to render a collection of partials through