cached_resource 5.1.3 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 769d5356d807aba4f41cc6be8c2d256921d028b1f205350f0e77024a4db15829
-  data.tar.gz: 89d9d4bb95b3f325265124bc2d6dd877f68ce0fe6eabe5af2eb9d85327c03ca8
+  metadata.gz: 29a5076e42c43b34a6d5b430c8dc16ce062dd3f7f1ac4f63f992efef03b3ccf9
+  data.tar.gz: ff819f199885c83cb65a6e21d1a319c5bb6b747dd467870c913043765fbfa111
 SHA512:
-  metadata.gz: 6f2574db0f3bd31b1204a361c0c24c9494860947a63e9de90e5dc02762e2d78a034e6e68b380e763af574b2a5d0fc64c3107dbb86644de85fdfe0f8b16ff257c
-  data.tar.gz: 06c1087d5b036408ef7729e728ad27f8ae59dc2ec954a388fbbe455dc399fcc06b6d69a0bfa9f949c4e86761241a9a15a63d8956c18a1a3d696c4d9669a660d1
+  metadata.gz: ea526acccd50610cf5c39248c9c0180c7a6ca1ca42cb6975df9b6f97b668febda6fc17684e9a9a7ca4b371798019d7d5e818e7a34e428702aeb5f475859ddbae
+  data.tar.gz: cc087aa9dcc0ad28b8779cf4412fd999b84019b7398d610e2e9e271b14d550bb9baa9dd039a0fa10da6bd15c83f76cba843769723e7bd0ca13a8d3f2f24c0e5e

data/lib/cached_resource/caching.rb

@@ -24,8 +24,8 @@ module CachedResource
       end
 
       # Clear the cache.
-      def clear_cache
-        cache_clear
+      def clear_cache(options=nil)
+        cache_clear(options)
       end
 
       private
@@ -111,15 +111,26 @@ module CachedResource
       end
 
       # Clear the cache.
-      def cache_clear
-        cached_resource.cache.clear.tap do |result|
-          cached_resource.logger.info("#{CachedResource::Configuration::LOGGER_PREFIX} CLEAR")
+      def cache_clear(options=nil)
+        # Memcache doesn't support delete_matched, which can also be computationally expensive
+        if cached_resource.cache.class.to_s == 'ActiveSupport::Cache::MemCacheStore' || options.try(:fetch,:all)
+          cached_resource.cache.clear.tap do |result|
+            cached_resource.logger.info("#{CachedResource::Configuration::LOGGER_PREFIX} CLEAR ALL")
+          end
+        else
+          cached_resource.cache.delete_matched("^#{name_key}/*").tap do |result|
+            cached_resource.logger.info("#{CachedResource::Configuration::LOGGER_PREFIX} CLEAR #{name_key}/*")
+          end
         end
       end
 
       # Generate the request cache key.
       def cache_key(*arguments)
-        "#{name.parameterize.gsub("-", "/")}/#{arguments.join('/')}".downcase.delete(' ')
+        "#{name_key}/#{arguments.join('/')}".downcase.delete(' ')
+      end
+
+      def name_key
+        name.parameterize.gsub("-", "/")
       end
 
       # Make a full duplicate of an ActiveResource record.

data/lib/cached_resource/version.rb

@@ -1,3 +1,3 @@
 module CachedResource
-  VERSION = "5.1.3"
+  VERSION = "5.2.0"
 end

data/spec/cached_resource/caching_spec.rb

@@ -12,6 +12,11 @@ describe CachedResource do
       cached_resource
     end
 
+    class NotTheThing < ActiveResource::Base
+      self.site = "http://api.notthething.com"
+      cached_resource
+    end
+
     @thing = {:thing => {:id => 1, :name => "Ada"}}
     @other_thing = {:thing => {:id => 1, :name => "Ari"}}
     @thing2 = {:thing => {:id => 2, :name => "Joe"}}
@@ -26,11 +31,15 @@ describe CachedResource do
     @other_string_thing_json = @other_string_thing.to_json
     @date_thing_json = @date_thing.to_json
     @nil_thing = nil.to_json
+    @not_the_thing = {:not_the_thing => {:id => 1, :name => "Not"}}
+    @not_the_thing_json = @not_the_thing.to_json
   end
 
   after(:each) do
     Thing.cached_resource.cache.clear
     Object.send(:remove_const, :Thing)
+    NotTheThing.cached_resource.cache.clear
+    Object.send(:remove_const, :NotTheThing)
   end
 
   describe "when enabled" do
@@ -39,6 +48,8 @@ describe CachedResource do
       # to make sure it works
       Thing.cached_resource.cache.clear
       Thing.cached_resource.on!
+      NotTheThing.cached_resource.cache.clear
+      NotTheThing.cached_resource.on!
 
       ActiveResource::HttpMock.reset!
       ActiveResource::HttpMock.respond_to do |mock|
@@ -47,6 +58,7 @@ describe CachedResource do
         mock.get "/things/fded.json", {}, @string_thing_json
         mock.get "/things.json?name=42", {}, @nil_thing, 404
         mock.get "/things/4.json", {}, @date_thing_json
+        mock.get "/not_the_things/1.json", {}, @not_the_thing_json
       end
     end
 
@@ -77,6 +89,20 @@ describe CachedResource do
       read_from_cache("thing/1").should == nil
     end
 
+    it "should not empty the cache of NotTheThing when clear_cache is called on the Thing" do
+      result1 = Thing.find(1)
+      result2 = NotTheThing.find(1)
+      Thing.clear_cache
+      NotTheThing.send(:cache_read, 'notthething/1').should == result2
+    end
+
+    it "should empty all the cache when clear_cache is called on the Thing with :all option set" do
+      result1 = Thing.find(1)
+      result2 = NotTheThing.find(1)
+      Thing.clear_cache(all: true)
+      NotTheThing.send(:cache_read, 'notthething/1').should == nil
+    end
+
     it "should cache a response with the same persistence" do
       result1 = Thing.find(1)
       result1.persisted?.should be true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cached_resource
 version: !ruby/object:Gem::Version
-  version: 5.1.3
+  version: 5.2.0
 platform: ruby
 authors:
 - Morgan Brown
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-23 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource