mongoid-cached-json 1.4.2 → 1.4.3

data/lib/mongoid-cached-json/cached_json.rb

@@ -157,21 +157,31 @@ module Mongoid
     # Check whether the cache supports :read_multi and prefetch the data if it does.
     def self.materialize_json_references_with_read_multi(key_refs, partial_json)
       unfrozen_keys = key_refs.keys.to_a.map(&:dup) if key_refs # see https://github.com/mperham/dalli/pull/320
-      local_cache = unfrozen_keys && Mongoid::CachedJson.config.cache.respond_to?(:read_multi) ? Mongoid::CachedJson.config.cache.read_multi(unfrozen_keys) : {}
-      Mongoid::CachedJson.materialize_json_references(key_refs, local_cache) if key_refs
+      read_multi = unfrozen_keys && Mongoid::CachedJson.config.cache.respond_to?(:read_multi)
+      local_cache = read_multi ? Mongoid::CachedJson.config.cache.read_multi(unfrozen_keys) : {}
+      Mongoid::CachedJson.materialize_json_references(key_refs, local_cache, read_multi) if key_refs
       partial_json
     end
 
     # Materialize all the JSON references in place.
-    def self.materialize_json_references(key_refs, local_cache = {})
+    def self.materialize_json_references(key_refs, local_cache = {}, read_multi = false)
       key_refs.each_pair do |key, refs|
         refs.each do |ref|
           _ref = ref.delete(:_ref)
           key = _ref[:_key]
           fetched_json = local_cache[key] if local_cache.has_key?(key)
-          fetched_json ||= (local_cache[key] = Mongoid::CachedJson.config.cache.fetch(key, { :force => !! Mongoid::CachedJson.config.disable_caching }) do
-            _ref[:_clazz].materialize_cached_json(* _ref[:_materialize_cached_json])
-          end)
+          if ! fetched_json
+            if read_multi
+              # no value in cache, materialize and write
+              fetched_json = (local_cache[key] = _ref[:_clazz].materialize_cached_json(* _ref[:_materialize_cached_json]))
+              Mongoid::CachedJson.config.cache.write(key, fetched_json) unless !! Mongoid::CachedJson.config.disable_caching
+            else
+              # fetch/write from cache
+              fetched_json = (local_cache[key] = Mongoid::CachedJson.config.cache.fetch(key, { :force => !! Mongoid::CachedJson.config.disable_caching }) do
+                _ref[:_clazz].materialize_cached_json(* _ref[:_materialize_cached_json])
+              end)
+            end
+          end
           if fetched_json
             ref.merge! fetched_json
           elsif _ref[:_parent]

data/lib/mongoid-cached-json/version.rb

@@ -1,6 +1,6 @@
 module Mongoid
   module CachedJson
-    VERSION = '1.4.2'
+    VERSION = '1.4.3'
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-cached-json
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -174,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3841515240372741329
+      hash: -3669552343151646894
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: