cached_resource 5.1.1 → 5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2b25cc83718d786c0441bc7cb082944ac7aa4fe3d379792cacb96e87df668eb
-  data.tar.gz: 8fa4f263faee071d9e7361f27b8927113bb36e76b1e5e765e993935cadad8c22
+  metadata.gz: 9fc8b21898febeea0df40b81f91f17d8ac7243024b600f9e6b9263da77157572
+  data.tar.gz: 3cec5573bcb480d2fee60403aec06aef1c6dc588ad4feeafd4cd16d60bbe6f79
 SHA512:
-  metadata.gz: 0523763d1f6d1dd9eb1d68ddb2a196e8f737d5660c91bcb244374804b0ddc31f50037ebb19c0dc1a25b891586cf3b5025df60b16a11c209e03f0510147e78514
-  data.tar.gz: 8ae89f1cd8fcf8dccedc053c7acc15b76ea84853240b0998ee31b5a17f837d001696866262182787d315d4f432f67d87b1ef4d9ef918b530b4e884f4e2f88363
+  metadata.gz: 5f2c6fc515e5365230aaa49a12200e8e57e41f4468812cf96847b16e827e0aedd6354428d282591c85ce18ff104038b7d561d7080bb6bb973f7161da871ecf41
+  data.tar.gz: 9fb5a752cd1084d88707478fb62957a3ee78bd8cc561d809e502e908c8dbcf3d627d0d20fb02c45ad9c1d7b52fa3756b8d5677535def16a96e5d07b0fb889205

data/README.md

@@ -1,4 +1,4 @@
-# CachedResource [![Build Status](https://secure.travis-ci.org/mhgbrown/cached_resource.png)](http://travis-ci.org/mhgbrown/cached_resource)
+# CachedResource [![Build Status](https://travis-ci.org/mhgbrown/cached_resource.svg?branch=master)](http://travis-ci.org/mhgbrown/cached_resource)
 CachedResource is a Ruby gem whose goal is to increase the performance of interacting with web services via ActiveResource by caching responses based on request parameters.  It can help reduce the lag created by making repeated requests across a network.
 
 ## Installation

data/gemfiles/4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    cached_resource (5.1.0)
+    cached_resource (5.1.1)
       activeresource (>= 4.0)
       activesupport (>= 4.0)
       nilio (>= 1.0)

data/gemfiles/5.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    cached_resource (5.1.0)
+    cached_resource (5.1.1)
       activeresource (>= 4.0)
       activesupport (>= 4.0)
       nilio (>= 1.0)

data/gemfiles/5.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    cached_resource (5.1.0)
+    cached_resource (5.1.1)
       activeresource (>= 4.0)
       activesupport (>= 4.0)
       nilio (>= 1.0)

data/lib/cached_resource/caching.rb

@@ -85,13 +85,19 @@ module CachedResource
       # Read a entry from the cache for the given key.
       def cache_read(key)
         object = cached_resource.cache.read(key).try do |json_cache|
-          cache = json_to_object(JSON.parse(json_cache, :symbolize_names => true))
-          if cache.is_a? Enumerable
-            restored = cache.map { |record| full_dup(record) }
-            next restored unless respond_to?(:collection_parser)
-            collection_parser.new(restored)
-          else
-            full_dup(cache)
+
+          # In older version JSON can't deserialize 'null' to nil
+          json = json_cache == 'null' ? nil : JSON.parse(json_cache, :symbolize_names => true)
+
+          unless json.nil?
+            cache = json_to_object(json)
+            if cache.is_a? Enumerable
+              restored = cache.map { |record| full_dup(record) }
+              next restored unless respond_to?(:collection_parser)
+              collection_parser.new(restored)
+            else
+              full_dup(cache)
+            end
           end
         end
         object && cached_resource.logger.info("#{CachedResource::Configuration::LOGGER_PREFIX} READ #{key}")
@@ -137,6 +143,8 @@ module CachedResource
       def object_to_json(object)
         if object.is_a? Enumerable
            object.map { |o| { :object => o, :persistence => o.persisted? } }.to_json
+        elsif object.nil?
+          nil.to_json
         else
           { :object => object, :persistence => object.persisted? }.to_json
         end

data/lib/cached_resource/version.rb

@@ -1,3 +1,3 @@
 module CachedResource
-  VERSION = "5.1.1"
+  VERSION = "5.1.2"
 end

data/spec/cached_resource/caching_spec.rb

@@ -23,6 +23,7 @@ describe CachedResource do
     @other_thing_json = @other_thing.to_json
     @string_thing_json = @string_thing.to_json
     @other_string_thing_json = @other_string_thing.to_json
+    @nil_thing = nil.to_json
   end
 
   after(:each) do
@@ -42,6 +43,7 @@ describe CachedResource do
         mock.get "/things/1.json", {}, @thing_json
         mock.get "/things/1.json?foo=bar", {}, @thing_json
         mock.get "/things/fded.json", {}, @string_thing_json
+        mock.get "/things.json?name=42", {}, @nil_thing, 404
       end
     end
 
@@ -51,6 +53,11 @@ describe CachedResource do
       read_from_cache("thing/1").should == result
     end
 
+    it "should cache a nil response" do
+      result = Thing.find(:all, :params => { :name => '42' })
+      read_from_cache("thing/all/name/42").should == nil
+    end
+
     it "should cache a response for a string primary key" do
       result = Thing.find("fded")
       read_from_cache("thing/fded").should == result

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cached_resource
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.1.2
 platform: ruby
 authors:
 - Morgan Brown
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-12 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource