covercache 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55e16d283b58bb6ebd956383b4566649afc61921
-  data.tar.gz: 22a54a11b422d63e722474e81d1bda1107e93a2a
+  metadata.gz: 962f6170e0cb39b16f31357115797b453742a570
+  data.tar.gz: 3baac74848597eb9c13234c78d7bf8c9ca4a0e93
 SHA512:
-  metadata.gz: 87f3fdcb8117a30cda97a7c028d2e59f0bb6889e2f71868e4a08847381c3c4d8f86755df2bfb418206274a046a60d9a66784f642ca47e24db98db0059fa8846c
-  data.tar.gz: 960ad18ab101b9a696e384965c011c7d11e864b4298bb0bf19aa0a3e653dc972366306c5e3880beb01166a95ded3f1a5da892ad86cf8b235057db344d24504b8
+  metadata.gz: 4ab5fb62d99dadec2dc2a480f2fe324e92b778c733dbbd1db419278dfacab7645b9639afefdc320ccb0d4d54482e9efbdfa6857f40d2c02fa8aad5584ab95cef
+  data.tar.gz: b0e6e4a5148499ad78f4b8d8c5811825c082402d808d2138ce37dec53bd8a7af16af623517528c653bf5da16d10490df3c9a73aae40d53edfe78234bf86ab3e5

data/lib/covercache.rb

@@ -115,8 +115,7 @@ module Covercache
     end
     
     def push_covercache_key(key)
-      self.covercache_keys << key
-      self.covercache_keys.uniq!
+      self.covercache_keys = (covercache_keys << key).uniq
     end
     
     def get_auto_cache_key(_caller)
@@ -127,7 +126,7 @@ module Covercache
     end
     
     def get_class_name
-      self.instance_of?(Class) ? self.name : self.class.name
+      self.instance_of?(Class) ? name : self.class.name
     end
     
     def extract_cache_key(*args)
@@ -192,11 +191,7 @@ module Covercache
   module ModelConcern
     extend ActiveSupport::Concern
 
-    included do      
-      cattr_accessor :covercache_keys do 
-        []
-      end
-      
+    included do
       cattr_accessor :covercache_model_source do
         @covercache_caller_source
       end
@@ -204,7 +199,7 @@ module Covercache
       cattr_accessor :covercache_model_digest
       generate_model_digest!
       
-      after_commit :covercache_flush_cache!
+      after_commit :expire_covercache
 
       extend  Base
       include Base
@@ -212,9 +207,17 @@ module Covercache
     
     # Support class methods
     module ClassMethods
+      def covercache_keys
+        Rails.cache.fetch(cache_keys_key) {[]}
+      end
+      
+      def covercache_keys=(keys)
+        Rails.cache.write(cache_keys_key, keys)
+      end
+      
       def generate_model_digest
         return unless covercache_model_source.present?
-        file = File.read self.covercache_model_source
+        file = File.read covercache_model_source
         Digest::MD5.hexdigest(file)
       rescue
         nil
@@ -225,19 +228,36 @@ module Covercache
         self.covercache_model_digest = generate_model_digest
       end
       
-      def covercache_flush!
-        self.covercache_keys.each do |key| 
+      def expire_covercache
+        covercache_keys.each do |key| 
           Rails.cache.delete(key)
-        end # if Rails.cache.exist?(key)
-        self.covercache_keys.clear
+        end
+        self.covercache_keys = []
         covercache_keys.empty?
       end
+      
+      alias_method :covercache_flush!, :expire_covercache
+      
+      private
+      def cache_keys_key
+        "covercache_keys/#{name}/#{covercache_model_digest}"
+      end
+    end
+    
+    def covercache_keys
+      self.class.send :covercache_keys
+    end
+    
+    def covercache_keys=(keys)
+      self.class.send :covercache_keys=, keys
     end
     
     # flush cache on after_commit callback
-    def covercache_flush_cache!
-      self.class.send :covercache_flush!
+    def expire_covercache
+      self.class.send :expire_covercache
     end
+    
+    alias_method :covercache_flush_cache!, :expire_covercache
   end
   
   # module CoversWithCache

data/lib/covercache/version.rb

@@ -1,3 +1,3 @@
 module Covercache
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: covercache
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Tõnis Simo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-08 00:00:00.000000000 Z
+date: 2014-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport