kaminari-cache 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d81b9849b289d81b82e69d267d2545ebd1b8dfd
-  data.tar.gz: c8e200c01ea5902312bc445efbe49dc48a6503d8
+  metadata.gz: fe0585f499877dc7c90c86a7846b9aaee148974d
+  data.tar.gz: da3a8d4d8619676d20ceaf9b75ebe311a278741d
 SHA512:
-  metadata.gz: b1c389bb91168c6f88a6adae8e31f1af7c55050c56ce21daccaaf3209b6da75856a3006227c8893dab834d9fb66e3f1d72cee36f1e4e4e2099737ee068aed482
-  data.tar.gz: c80f3c930b39eaee793af4325b74d41e3b9967f7cef609490c1259fcd5101516efdde8060db36ec6e2a8b16458c5dfb7dda5f241b5f086f92e7314f3b4714d54
+  metadata.gz: dabb4782cb9e18a7058a44e2ab41c4a749613456eba67c6fd7e3c3de5e3b1a87a06e93115dc0b0c752a5dd9b79e1fa66f228f59891f815acb5da5ba2d556ff17
+  data.tar.gz: 6eb38ef73808579226c561f460689c3c336b3a8bd74767e3ed9f9e156c20e6709ac10836f2a0880c43ef00f0ba5bf96d593fd5ab8c976671e62d9ec82a2f20cd

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/kaminari-cache.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "kaminari-cache"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jim"]

data/lib/kaminari-cache.rb

@@ -6,27 +6,31 @@ module KaminariCache
   end
   
   def flush_pagination_cache
-    store_class = Rails.cache.class.name.split("::").last
+    @store_class = Rails.cache.class.name.split("::").last
     if Rails.cache.respond_to? "delete_matched"
 
       self.changed.each do |field|
-        match = [:kaminari, "/#{self.class.name.downcase}", '*', "/#{:order}", '*', "/#{field}", '*']
-        
-        Rails.logger.info "Cache flush: #{match.join}"
-        case store_class
-        when "DalliStore"
-          # DalliStore uses a Regexp
-          regexp = Regexp.new match.join.gsub(/\*/,'.*?')
-          Rails.cache.delete_matched /^#{Regexp.escape(:kaminari)}\/#{Regexp.escape(self.class.name.downcase)}/
-        when "RedisStore"
-          # RedisStore uses a String
-          Rails.cache.delete_matched match.join
-        end
+        flush_match [:kaminari, "/#{self.class.name.downcase}", '*', "/#{:order}", '*', "/#{field}", '*']
       end
+      # flush scoped pagings...
+      flush_match [:kaminari, "/#{self.class.name.downcase}", '*', "/#{:scope}", '*']
 
     else
       Rails.cache.clear
-      Rails.logger.warn "#{store_class} does not support deleting matched keys. The entire cache was flushed. Consider using RedisStore (Redis) OR DalliStore (gem dalli) for memcached with dalli-store-extensions gem for improved performance."
+      Rails.logger.warn "#{@store_class} does not support deleting matched keys. The entire cache was flushed. Consider using RedisStore (Redis) OR DalliStore (gem dalli) for memcached with dalli-store-extensions gem for improved performance."
+    end
+  end
+
+  def flush_match(match) 
+    Rails.logger.info "Cache flush: #{match.join}"
+    case @store_class
+    when "DalliStore"
+      # DalliStore uses a Regexp
+      regexp = Regexp.new match.join.gsub(/\*/,'.*?')
+      Rails.cache.delete_matched /^#{Regexp.escape(:kaminari)}\/#{Regexp.escape(self.class.name.downcase)}/
+    when "RedisStore"
+      # RedisStore uses a String
+      Rails.cache.delete_matched match.join
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kaminari-cache
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jim