redis_page 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 032b69aeb3e0c9a5194b31c53010fd157783e068
-  data.tar.gz: ccc7bca4c5a88df4cda1120d2800b9c000d3c3ac
+  metadata.gz: 37a41cb3eb5f4307328c97116e992ccff5ebcba2
+  data.tar.gz: 15305dfc72280bf9cb96cf950df92021df3bda9a
 SHA512:
-  metadata.gz: fba5ee5ea042f5d1b3c5fe45e59fbcfb6b9b3ceb1a70708cd61ae9358ff4a33a85f5546250fef458d21d41b6d84fe32d761eba495c5581c759e0852f9b481c59
-  data.tar.gz: 43be76db053d6ddf298182d617d03a77389e0ff6ffb1da0084b5a42335f8d67230132afb2dc5ba7cd2c55e9b24ed5f602c7a040dc56e7e5907e00776c421241f
+  metadata.gz: f638a549e0152e3a9dac2aca65a6a2651eeabb7e48a54ba09aa486f19593aebf55afd648c599638b7a5c5f0a78b95d9bd757ce77a42168625b896d4828bbe7ea
+  data.tar.gz: d0ebdf75cd3ea216172172bb60ce1ac590a610774c4ba3276d9b3a8e1605a55fcfcf7890f46fbf7298db40b6789e69ae9bf791e610d615794a70681308dd7d84

data/README.md

@@ -68,15 +68,15 @@ end
 修改为：
 
 ```
-- Product.all.each do |product|
+- c(Product).all.each do |product|
   = c(@product).title
 ```
 
-c 方法会记录当前页面 url
+c 方法会记录当前页面 url, c(Product) 表示添加、删除商品也会刷新当前页面
 
 ### 4. Model
 
-更新实体后刷新所有关联的页面缓存
+更新、删除、添加实体后刷新所有关联的页面缓存
 
 ```
 class Product < ActiveRecord::Base

data/lib/redis_page/sweeper.rb

@@ -6,10 +6,44 @@ module RedisPage
 
     included do
       after_save :invalidate_instance_cache
+      after_destroy :invalidate_clazz_cache
 
       def invalidate_instance_cache
-        RedisPage.redis.smembers("i:#{self.class.table_name}:#{self.id}").each do |info|
-          info = JSON.parse(info)
+        urls = {}
+        key = "i:#{self.class.table_name}:#{self.id}"
+        Rails.logger.info "[page cache]invalidate: #{key}"
+        RedisPage.redis.smembers(key).each do |info|
+          RedisPage.redis.srem(key, info)
+          add_infos(urls, info)
+        end
+        add_clazz_infos(urls)
+        fetch_infos(urls)
+      end
+
+      def invalidate_clazz_cache
+        urls = {}
+        add_clazz_infos(urls)
+        fetch_infos(urls)
+      end
+
+      private
+      def add_infos(urls, info)
+        info = JSON.parse(info)
+        key = "#{info['url']}-#{info['country']}"
+        urls[key] = info unless urls[key]
+      end
+
+      def add_clazz_infos(urls)
+        key = "c:#{self.class.table_name}"
+        Rails.logger.info "[page cache]invalidate: #{key}"
+        RedisPage.redis.smembers(key).each do |info|
+          RedisPage.redis.srem(key, info)
+          add_infos(urls, info)
+        end
+      end
+
+      def fetch_infos(urls)
+        urls.values.each do |info|
           Rails.logger.info "[page cache]add sweeper job: #{info['url']}-#{info['country']}"
           SweeperWorker.perform_async(info['url'], info['country'])
         end

data/lib/redis_page/version.rb

@@ -1,3 +1,3 @@
 module RedisPage
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/redis_page/view_helpers.rb

@@ -1,10 +1,11 @@
 module RedisPage
   module ViewHelpers
-
     # 记录当前实体相关的页面，方便实体更新时，刷新页面缓存
-    def c(object)
-      mark_cache_instance(object) if @page_need_to_cache
-      object
+    def c(object_or_clazz)
+      if @page_need_to_cache
+        object_or_clazz.is_a?(Class) ? mark_cache_clazz(object_or_clazz) : mark_cache_instance(object_or_clazz)
+      end
+      object_or_clazz
     end
 
     # 记录当前实体相关的页面，方便实体更新时，刷新页面缓存
@@ -24,5 +25,12 @@ module RedisPage
       RedisPage.redis.sadd("i:#{name}:#{id}", { url: request.url, country: @cache_country }.to_json)
     end
 
+    # 记录类相关的页面，方便实体创建时，刷新页面缓存
+    def mark_cache_clazz(clazz)
+      name = clazz.table_name
+      Rails.logger.info "[page cache]class: #{name}"
+      RedisPage.redis.sadd("c:#{name}", { url: request.url, country: @cache_country }.to_json)
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_page
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - saberma