cached_resource 7.1.0 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0895f45566dd7c4ee2f394be6dda1c7a86aed9ad4e7c6a470d9a59d584c529c1'
-  data.tar.gz: 16106c7680c3cd6708b8171aa5db5f3993f3a77368685876e3e125b03e2d8e85
+  metadata.gz: d1c2150c2dc21cf091c9b26674b3e52a7bd43938318704f7c2f0739a0b9756aa
+  data.tar.gz: 2f7b9665c688f2a60b7def43cfafbe2701accded9fcf9aabc371fe91bf78362d
 SHA512:
-  metadata.gz: 0dbb4bc9fc1019dbf38dce7553b1ad15a964ca3699a461d551b892a26608b53ab0dbe4d8dbcce3878977f4b00debd88affa6494ad52d4fb2fb739a3ca6d239c3
-  data.tar.gz: 689a7edad73b7de5cff68c17d34135422d7166b1ae2745ae3be398cc77399e1ccd2d09a8423a3c7fda00f647216834e4b93c0a82287c39dd5ea5177d3fc7072f
+  metadata.gz: c0c94c6b77f623a49a3259a69a4bb1b1d2d7fc219d590b740d5a86c71f3cfbf7eb783a2e8a2c06631c926bd2679b220341d8fbf03b77a3651d5219a70bb8d779
+  data.tar.gz: 207c37429a14511fb788d21bc69e86b01f8f59a303b20aebafb2f07e54aba48546c03a5ac7fa4b99da0bd9b7cd53d385ddb73306c643d9044d113ea638949e61

data/lib/cached_resource/caching.rb

@@ -40,7 +40,7 @@ module CachedResource
       # Re/send the request to fetch the resource
       def find_via_reload(key, *arguments)
         object = find_without_cache(*arguments)
-        return object unless cached_resource.enabled
+        return object unless should_cache?(object)
 
         cache_collection_synchronize(object, *arguments) if cached_resource.collection_synchronize
         return object if !cached_resource.cache_collections && is_any_collection?(*arguments)
@@ -79,6 +79,12 @@ module CachedResource
         end
       end
 
+      # Avoid cache nil or [] objects
+      def should_cache?(object)
+        return false unless cached_resource.enabled
+        object.respond_to?(:empty?) ? !object.empty? : !!object
+      end
+
       # Determine if the given arguments represent
       # the entire collection of objects.
       def is_collection?(*arguments)

data/lib/cached_resource/version.rb

@@ -1,3 +1,3 @@
 module CachedResource
-  VERSION = "7.1.0"
+  VERSION = "7.2.0"
 end

data/spec/cached_resource/caching_spec.rb

@@ -33,6 +33,7 @@ describe CachedResource do
     @other_string_thing_json = @other_string_thing.to_json
     @date_thing_json = @date_thing.to_json
     @nil_thing = nil.to_json
+    @empty_array_thing = [].to_json
     @not_the_thing = {:not_the_thing => {:id => 1, :name => "Not"}}
     @not_the_thing_json = @not_the_thing.to_json
   end
@@ -59,6 +60,7 @@ describe CachedResource do
         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
+        mock.get "/things.json?name=43", {}, @empty_array_thing
         mock.get "/things/4.json", {}, @date_thing_json
         mock.get "/not_the_things/1.json", {}, @not_the_thing_json
       end
@@ -66,15 +68,19 @@ describe CachedResource do
 
     it "should cache a response" do
       result = Thing.find(1)
-
       read_from_cache("thing/1").should == result
     end
 
-    it "should cache a nil response" do
-      result = Thing.find(:all, :params => { :name => '42' })
+    it "shouldn't cache nil response" do
+      Thing.find(:all, :params => { :name => '42' })
       read_from_cache("thing/all/name/42").should == nil
     end
 
+    it "shouldn't cache [] response" do
+      Thing.find(:all, :params => { :name => '43' })
+      read_from_cache("thing/all/name/43").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: 7.1.0
+  version: 7.2.0
 platform: ruby
 authors:
 - Morgan Brown
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-18 00:00:00.000000000 Z
+date: 2024-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource