redis_page 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df9e7a7ba2a4887f6e5c54764f503d3f887191bc
-  data.tar.gz: db82203f0bc3a2c6a2e6f49700c631a044cb8cdf
+  metadata.gz: a87ae8bca8efe4f64fc7e239db928ffa43f11c5c
+  data.tar.gz: 75fa6d003cf7f20c05fd46f1e41b55175b6b4bf9
 SHA512:
-  metadata.gz: bf9aad1b991ba023712c82b448bcce3725a987cec94d900f80cd447e3b7e19c1154eb4533ce733588e6139d76c8b957e1b6efa3de69c074b207087cd79d884cb
-  data.tar.gz: cd18e97b69ea34dd509ca7bb607b4bbbe356e48971a325545dcf9346f770c34954e8da17a2a166279c282fed27cbb63c7fd434c1ca9663cd8e34e55bfa296023
+  metadata.gz: f0544aa6f3ce114bbb5dd97fb7b471fd8ad767e4f32fbfed50ba246fc12193f017142f643963877eab816b50bd7f8043c96aa7d4b3dee05e3b1a8dd2d6fb1051
+  data.tar.gz: 2d377e66c5364b47ff1900376db164ce66ecbf6d84205bdd34d9930a68ae215e8ea58925564d29d53b529527885b5a83813e6facefc962552202e1263a903515

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+*.gem

data/README.md

@@ -21,7 +21,7 @@ And then execute:
 
 ## Usage
 
-### 0. Config
+### 1. Config
 
 增加文件：`config/initializers/redis_page.rb`
 
@@ -32,9 +32,17 @@ RedisPage.configure do |config|
   config.sweeper = { port: 8081, username: 'cache', password: 'ewHN84JZLyRurX' }
   config.redis = Redis.new(host: "redis", port: 6379, db: 10)
 end
+
+Sidekiq.configure_server do |config|
+  config.redis = { url: "redis://redis:6379/15" }
+end
+
+Sidekiq.configure_client do |config|
+  config.redis = { url: "redis://redis:6379/15" }
+end
 ```
 
-### 1. Controller
+### 2. Controller
 
 生成页面缓存
 
@@ -48,7 +56,7 @@ class ProductController < ActionController::Base
 end
 ```
 
-### 2. View
+### 3. View
 
 记录哪些实体更新时要刷新的 url，例如：iPhone 在首页中显示了，则记录下 iPhone 实体与首页的关联关系
 
@@ -66,7 +74,7 @@ end
 
 c 方法会记录当前页面 url
 
-### 3. Model
+### 4. Model
 
 更新实体后刷新所有关联的页面缓存
 
@@ -80,5 +88,5 @@ end
 
 ```
 gem build redis_page.gemspec
-gem push redis_page-0.1.0.gem
+gem push redis_page-0.1.1.gem
 ```

data/lib/action_controller/caching/{pages.rb → redis_pages.rb}

@@ -2,7 +2,7 @@ require 'active_support/core_ext/class/attribute_accessors'
 
 module ActionController
   module Caching
-    module Pages
+    module RedisPages
       INSTANCE_PATH_REGEX = /^\/(\w+)\/(\d+)/
       extend ActiveSupport::Concern
 
@@ -10,6 +10,7 @@ module ActionController
       end
 
       module ClassMethods
+
         def caches_redis_page(*actions)
           options = actions.extract_options!
 
@@ -17,7 +18,7 @@ module ActionController
             @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
+              @cache_country = (cookies[:country] || request.headers['X-IP-Country']).try(:upcase)
             end
           end
 

data/lib/action_controller/{page_caching.rb → redis_page_caching.rb}

@@ -1,14 +1,14 @@
-require 'action_controller/caching/pages'
+require 'action_controller/caching/redis_pages'
 
 module ActionController
   module Caching
     eager_autoload do
-      autoload :Pages
+      autoload :RedisPages
     end
 
-    include Pages
+    include RedisPages
   end
 end
 
-ActionController::Base.send(:include, ActionController::Caching::Pages)
+ActionController::Base.send(:include, ActionController::Caching::RedisPages)
 ActionController::Base.send(:include, RedisPage::ViewHelpers)

data/lib/redis_page/railtie.rb

@@ -4,7 +4,7 @@ module RedisPage
   class Railtie < Rails::Railtie
     initializer "redis_page" do
       ActiveSupport.on_load(:action_controller) do
-        require 'action_controller/page_caching'
+        require 'action_controller/redis_page_caching'
       end
     end
 

data/lib/redis_page/sweeper_worker.rb

@@ -1,3 +1,5 @@
+require "sidekiq"
+
 module RedisPage
   class SweeperWorker
     include Sidekiq::Worker

data/lib/redis_page/version.rb

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

data/redis_page.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activesupport", "~> 4.0.9"
   spec.add_dependency "actionpack", "~> 4.0.9"
-  spec.add_dependency "sidekiq", "~> 3.5.0"
+  spec.add_dependency "sidekiq", "~> 3.2.6"
 
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_page
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - saberma
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.2.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -96,8 +96,8 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- lib/action_controller/caching/pages.rb
-- lib/action_controller/page_caching.rb
+- lib/action_controller/caching/redis_pages.rb
+- lib/action_controller/redis_page_caching.rb
 - lib/redis_page.rb
 - lib/redis_page/railtie.rb
 - lib/redis_page/sweeper.rb