redis_page 0.1.20 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffdcff31aad42914f75d7a6de59f61a8168057c9
-  data.tar.gz: f5dcebef2a715a51e613bf0e55f63c483e87cb5f
+  metadata.gz: a06d2e1d0a4a723ce3e9d47a2c7f4484a3522c9b
+  data.tar.gz: 3c2a6f6b31396d1557207dc8f8cd20da2d15e9fa
 SHA512:
-  metadata.gz: a964d178847d148c10e6230bd363c2886a92536d2441f1963107f23babce690ed0f8729f611660b07bf437e306a38795039d09b3a2104e234eee1e4e1460bf1e
-  data.tar.gz: 39c8508fe6157a35fe09090ebd4d5b59029e7acfa789a9d28ff370c0053406fa2ac149a7bb4ce7dea6d8e0a31764087021bc83f7c76d55a0477b0d030ac4f0e8
+  metadata.gz: 16e73d77c06ad803d4e619b0a63fd5dec38fef56d786ca49cb059a339867109e02b8e63d49acc21d836b2fd92a558a0af418d7fd155c7117f1fca004a3236a8d
+  data.tar.gz: 6197bc33d126d55544cf153241f878fd00641703f2f4b1111d738a67e75eb55f83532fce9f3d888f442922b5bc3f27c54c3d8a98a01644f8f149d1615aac6179

data/lib/action_controller/caching/redis_pages.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/class/attribute_accessors'
+require 'zlib'
 
 module ActionController
   module Caching
@@ -12,7 +13,7 @@ module ActionController
       module ClassMethods
 
         def caches_redis_page(*actions)
-          return unless RedisPage.redis
+          return unless (RedisPage.cache_relation_redis && RedisPage.cache_page_redis)
           options = actions.extract_options!
 
           before_filter({only: actions}.merge(options)) do |c|
@@ -28,12 +29,17 @@ module ActionController
             #path = URI(request.original_url).path
             path = request.path
             path = "#{path}-#{@cache_country}" if @cache_country
-            c.cache_redis_page(response.body, path, options)
+            c.cache_redis_page(compress_content(response.body), path, options)
             c.record_cached_page
           end
         end
       end
 
+      def compress_content(content)
+        RedisPage.compress_method == :deflate ? Zlib::Deflate.deflate(content) : content
+      end
+
+      # TODO: 全球化部署时需要将一个页面写到多个redis上去，需要确保: 1. 写入速度快; 2. 确保写入成功;
       def cache_redis_page(content, path, options = {})
         key  = path
         text = "[page cache]caching: #{path}"
@@ -42,7 +48,9 @@ module ActionController
           text = "#{text} in #{namespace}"
         end
         Rails.logger.info text
-        RedisPage.redis.setex(key, RedisPage.config.ttl || 604800, content)    # 1 周后失效
+        # RedisPage.cache_page_redis.setex(key, RedisPage.config.ttl || 604800, content)    # 1 周后失效
+        # 对于某个原本带有生存时间（TTL）的键来说， 当 SET 命令成功在这个键上执行时， 这个键原有的 TTL 将被清除。
+        RedisPage.cache_page_redis.set(key, content)    # 永不失效
       end
 
       def record_cached_page

data/lib/redis_page/sweeper.rb

@@ -13,8 +13,8 @@ module RedisPage
         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)
+        RedisPage.cache_relation_redis.smembers(key).each do |info|
+          RedisPage.cache_relation_redis.srem(key, info)
           add_infos(urls, info)
         end
         add_clazz_infos(urls)
@@ -42,8 +42,8 @@ module RedisPage
       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)
+        RedisPage.cache_relation_redis.smembers(key).each do |info|
+          RedisPage.cache_relation_redis.srem(key, info)
           add_infos(urls, info)
         end
       end

data/lib/redis_page/version.rb

@@ -1,3 +1,3 @@
 module RedisPage
-  VERSION = '0.1.20'
+  VERSION = '0.1.22'
 end

data/lib/redis_page/view_helpers.rb

@@ -22,14 +22,14 @@ module RedisPage
         id   = object.id
       end
       Rails.logger.info "[page cache]record: #{name}##{id}"
-      RedisPage.redis.sadd("i:#{name}:#{id}", { url: request.base_url + request.path, country: @cache_country }.to_json)
+      RedisPage.cache_relation_redis.sadd("i:#{name}:#{id}", { url: request.base_url + request.path, 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.base_url + request.path, country: @cache_country }.to_json)
+      RedisPage.cache_relation_redis.sadd("c:#{name}", { url: request.base_url + request.path, country: @cache_country }.to_json)
     end
 
   end

data/lib/redis_page.rb

@@ -3,6 +3,8 @@ require 'redis_page/railtie'
 module RedisPage
   class Config
     attr_accessor :sweeper, :redis, :ttl
+    attr_accessor :cache_page_redis, :cache_relation_redis
+    attr_accessor :compress_method
   end
 
   def self.config
@@ -17,6 +19,19 @@ module RedisPage
     config.redis
   end
 
+  def self.cache_page_redis
+    config.cache_page_redis || config.redis
+  end
+
+  def self.cache_relation_redis
+    config.cache_relation_redis || config.redis
+  end
+
+  # :deflate or nil
+  def self.compress_method
+    config.compress_method
+  end
+
   def self.sweeper
     config.sweeper
   end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: redis_page
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.22
 platform: ruby
 authors:
 - saberma
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.9
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.9
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.6
 - !ruby/object:Gem::Dependency
   name: sidekiq-unique-jobs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.17
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: use redis to cache your rails page.
@@ -101,9 +101,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -129,17 +129,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: use redis to cache your rails page.