manage_cache 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ec215d42d1220af0f9d531d8128392d156f6b88
-  data.tar.gz: 6491ed7f5dbcc10871c1f4e8c56b6589cb426707
+  metadata.gz: d086284c04b727bf43511670bb8e88bc4848e8c1
+  data.tar.gz: fefd47861d23256b765a6d4ff9fa07034ea1e833
 SHA512:
-  metadata.gz: 54e6a07d3f77d5b76f8e3ceacf14fc8ebbc3dc0865474a490d2ee0e05ac7655e425078715c715fa047489e725644456dfc6ccb8fd824f14ba2473c625408c9bf
-  data.tar.gz: b566c0381c9c34bc72ec25390aa46dda1c3062f8a8379b7072c3986a385ad41d14694a1cc3a1f29115d1f96f8950945ff8bda41697ac1516f6f69568c7e43dda
+  metadata.gz: 4831115ab6e9f5a6331c17a55f656afe9fb08f3b67e310c32698884ac7dfc42adc16c93cb52a05d2f979c97ecb16d310c14b7ec0a54f5cb4f8bdbac50639249e
+  data.tar.gz: f377bae3bc05679acd25c5ac3a9d368150a6481a7af0116ff9ab01a183d2296045ba6fc13ca77b6ab23e80ef289a522d930af5fe591c795b92aabc638e5e54a5

data/lib/manage_cache/version.rb

@@ -1,3 +1,3 @@
 module ManageCache
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/manage_cache.rb

@@ -23,19 +23,14 @@ module ManageCache
   module LocalInstanceMethods
     def dump_cache!
       self.class.cache_keys_specs.each do |key_name, key_specs|
-        # the rails helper method 'cache (name, opts) do ...'
-        # adds some extras to the cache key.
-        # To run with this gem, you have to add 'skip_digest: true'.
-        # Any other options will prevent correct cache deletion!!
-        #
-        [cache_key_for(key_name), "views/#{cache_key_for(key_name)}"].each do |key|
+        if delete_cache?(key_specs)
           if !key_specs[:regexp].blank?
-            delete_cache_w_regexp(key, key_specs)
+            delete_cache_w_regexp(key_name)
+            #delete_cache_w_regexp(key, key_specs)
           else
-            Rails.cache.delete(key)
           end
           instance_variable_set("@cache_key_for_#{key_name}", nil)
-        end if delete_cache?(key_specs)
+        end 
       end
     end
 
@@ -129,11 +124,29 @@ module ManageCache
     #
     # be aware, that the matcher_string has to be escaped (e.g. "\\d+" instead of "\d+")!
     #
-    def delete_cache_w_regexp(key, specs)
-      regexp = specs[:regexp].inject([]){|m, (k,v)| m << "#{k}=#{v}" }.join('-')
+    def delete_cache_w_regexp(key_name)
+      specs = self.class.cache_keys_specs[key_name]
+
+      regexp = specs[:regexp].inject([]) do |m, (k,v)| 
+        redis_store = Rails.cache.class == ActiveSupport::Cache::RedisStore
+        m << "#{k}=#{redis_store ? '*' : v}" 
+      end.join('-')
+
+      key = prepare_cache_key(key_name)
       Rails.cache.delete_matched("#{Regexp.escape(key)}-#{regexp}")
     end
 
+    # the rails helper method 'cache (name, opts) do ...'
+    # adds some extras to the cache key.
+    # To run with this gem, you have to add 'skip_digest: true'.
+    # Any other options will prevent correct cache deletion!!
+    #
+    def delete_cache(key_name)
+      [cache_key_for(key_name), "views/#{cache_key_for(key_name)}"].each do |key|
+        Rails.cache.delete(key)
+      end
+    end
+
     # if some attributes are specified in :if_changed
     # check whether they changed
     # and delete cache only if they changed

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manage_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - cgregor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-18 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails