redis_page 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f4beebad0af5093a904e8018586f26331fdbf8c
-  data.tar.gz: b187937071618ac5b9a53a073c234de825d89e06
+  metadata.gz: df9e7a7ba2a4887f6e5c54764f503d3f887191bc
+  data.tar.gz: db82203f0bc3a2c6a2e6f49700c631a044cb8cdf
 SHA512:
-  metadata.gz: 06d3caae4fe5ea15b205236db21815d1172122a175a52974a9359e00004cd6a4660f648411a01f4881f869344ef7b4e463d6b89ec2a558b24dab07b554b3648a
-  data.tar.gz: 2e61816f7303f0a0cad3fa1d1b7e435653354b9e2b254e86cb45ea94985bcd88541162f7b047eee806e2eac72e69d163f830aedf6bc9babad62e3332fdb8e12b
+  metadata.gz: bf9aad1b991ba023712c82b448bcce3725a987cec94d900f80cd447e3b7e19c1154eb4533ce733588e6139d76c8b957e1b6efa3de69c074b207087cd79d884cb
+  data.tar.gz: cd18e97b69ea34dd509ca7bb607b4bbbe356e48971a325545dcf9346f770c34954e8da17a2a166279c282fed27cbb63c7fd434c1ca9663cd8e34e55bfa296023

data/README.md

@@ -21,18 +21,29 @@ And then execute:
 
 ## Usage
 
+### 0. Config
+
+增加文件：`config/initializers/redis_page.rb`
+
+```
+require "redis"
+RedisPage.configure do |config|
+  # 通过访问 http://cache:ewHN84JZLyRurX@example.com:8081/products/1 来刷新缓存
+  config.sweeper = { port: 8081, username: 'cache', password: 'ewHN84JZLyRurX' }
+  config.redis = Redis.new(host: "redis", port: 6379, db: 10)
+end
+```
+
 ### 1. Controller
 
 生成页面缓存
 
 ```
 class ProductController < ActionController::Base
-  caches_redis_page :show, :new
+  caches_redis_page :show
 
   def show
     @product = Product.find(params[:id])
-    @model_name = Product.table_name
-    @model_id   = @product.id
   end
 end
 ```
@@ -64,3 +75,10 @@ class Product < ActiveRecord::Base
   include RedisPage::Sweeper
 end
 ```
+
+## Contribution
+
+```
+gem build redis_page.gemspec
+gem push redis_page-0.1.0.gem
+```

data/lib/action_controller/caching/pages.rb

@@ -3,6 +3,7 @@ require 'active_support/core_ext/class/attribute_accessors'
 module ActionController
   module Caching
     module Pages
+      INSTANCE_PATH_REGEX = /^\/(\w+)\/(\d+)/
       extend ActiveSupport::Concern
 
       included do
@@ -12,18 +13,32 @@ module ActionController
         def caches_redis_page(*actions)
           options = actions.extract_options!
 
+          before_filter({only: actions}.merge(options)) do |c|
+            @page_need_to_cache = true
+            if options[:append_country]
+              # X-IP-Country 是通过 nginx GeoIP2 module 注入的 header
+              @cache_country = (cookies[:country] || request.headers['X-IP-Country']).upcase
+            end
+          end
+
           after_filter({only: actions}.merge(options)) do |c|
-            c.cache_page(response.body, request.path)
+            path = request.path
+            path = "#{path}-#{@cache_country}" if @cache_country
+            c.cache_page(response.body, path)
+            c.record_cached_page
           end
         end
       end
 
       def cache_page(content, path)
         Rails.logger.info "[page cache]caching: #{path}"
-        $redis.set(path, content)
+        RedisPage.redis.set(path, content)
+      end
 
-        if @model_name
-          mark_cache_instance(@model_name, @model_id)
+      def record_cached_page
+        path, model_name, model_id = INSTANCE_PATH_REGEX.match(request.path).to_a
+        if model_id
+          mark_cache_instance(model_name, model_id)
         end
       end
 

data/lib/redis_page/sweeper.rb

@@ -8,9 +8,10 @@ module RedisPage
       after_save :invalidate_instance_cache
 
       def invalidate_instance_cache
-        $redis.smembers("i:#{self.class.table_name}:#{self.id}").each do |url|
-          Rails.logger.info "[page cache]add sweeper job: #{url}"
-          SweeperWorker.perform_async(url)
+        RedisPage.redis.smembers("i:#{self.class.table_name}:#{self.id}").each do |info|
+          info = JSON.parse(info)
+          Rails.logger.info "[page cache]add sweeper job: #{info['url']}-#{info['country']}"
+          SweeperWorker.perform_async(info['url'], info['country'])
         end
       end
     end

data/lib/redis_page/sweeper_worker.rb

@@ -2,14 +2,16 @@ module RedisPage
   class SweeperWorker
     include Sidekiq::Worker
 
-    def perform(url)
+    def perform(url, country=nil)
       uri = URI(url)
-      uri.port = 8081
+      uri.port = RedisPage.sweeper[:port]
 
-      auth = { username: "cache", password: "ewHN84JZLyRurX" }
+      auth = { username: RedisPage.sweeper[:username], password: RedisPage.sweeper[:password] }
+      options = { basic_auth: auth }
+      options[:cookies] = { country: country } if country
 
-      Rails.logger.info "[page cache]sweeper fetching: #{url}"
-      response = HTTParty.get(uri, basic_auth: auth)
+      Rails.logger.info "[page cache]sweeper fetching: #{url}, country: #{country}"
+      response = HTTParty.get(uri, options)
       Rails.logger.debug "[page cache]sweeper response: #{response.body}"
     end
   end

data/lib/redis_page/version.rb

@@ -1,3 +1,3 @@
 module RedisPage
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/redis_page/view_helpers.rb

@@ -3,7 +3,7 @@ module RedisPage
 
     # 记录当前实体相关的页面，方便实体更新时，刷新页面缓存
     def c(object)
-      mark_cache_instance(object)
+      mark_cache_instance(object) if @page_need_to_cache
       object
     end
 
@@ -20,7 +20,8 @@ module RedisPage
         name = object.class.table_name.downcase
         id   = object.id
       end
-      $redis.sadd("i:#{name}:#{id}", request.url)
+      Rails.logger.info "[page cache]record: #{name}##{id}"
+      RedisPage.redis.sadd("i:#{name}:#{id}", { url: request.url, country: @cache_country }.to_json)
     end
 
   end

data/lib/redis_page.rb

@@ -1 +1,23 @@
 require 'redis_page/railtie'
+
+module RedisPage
+  class Config
+    attr_accessor :sweeper, :redis
+  end
+
+  def self.config
+    @@config ||= Config.new
+  end
+
+  def self.configure
+    yield self.config
+  end
+
+  def self.redis
+    config.redis
+  end
+
+  def self.sweeper
+    config.sweeper
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_page
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - saberma
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport