rails-cache-tags 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fec05417aaeacefe45090371a1987e97811b4a5
-  data.tar.gz: 80ab586b1cece89e8463d5306a5f072dcae869bd
+  metadata.gz: e8dbeafaeb77ad8bf678216ab5394736222e516e
+  data.tar.gz: ff7fd4145f49196921987c8a3822b4b19f5cb7a6
 SHA512:
-  metadata.gz: 4c4926e08c481634ad5d0307b671fd3103258876c9ab51533364313f79c4ed27ff950396493bb140f7a4905341b0fd7161ddb93a99ae9116ad0c17a2dafbb03b
-  data.tar.gz: 2663ab5400dde3728d4cf4187c2190910be91babbde55070fdab636b319fa1429b60ba78dce8e51bb26d32ab3c6f4a5f9b77e35811ddd45d9a5d8ed800d5aa49
+  metadata.gz: efe9e5258b6f846832daac2ba26df2754e1ea8b1251d4ad0256bf0fcf7a685082f65a32239d5b04f9fc390a336b4f56405f64465d06f5ee167a233feed569489
+  data.tar.gz: ac90ec2a280d85e0e07498909e5aaedd441afcb6867ccf771bb3ff78b05a9fc870feba10fc18bd4da5a1a9919876e47519470bef75da52bcbcde911160b33e01

data/lib/rails-cache-tags.rb

@@ -1,44 +1,47 @@
+# coding: utf-8
 require 'active_support'
+require 'active_support/concern'
 require 'active_support/cache'
-
 require 'rails/cache/tags/store'
 
-module ActiveSupport
+module Rails
   module Cache
-    class Entry
-      attr_accessor :tags
-    end
+    module Tags
+      module Extensions
+        module ActiveSupportCache
+          extend ActiveSupport::Concern
+
+          included do
+            class << self
+              alias_method :old_lookup_store, :lookup_store
+
+              def lookup_store(*store_option)
+                store = old_lookup_store(*store_option)
+                store.class.send :include, Rails::Cache::Tags::Store
+
+                store
+              end
+            end
+          end
+        end
 
-    # patch built-in stores
-    [:FileStore, :MemCacheStore, :MemoryStore].each do |const|
-      if const_defined?(const)
-        begin
-          const_get(const).send(:include, Rails::Cache::Tags::Store)
-        rescue LoadError, NameError
-          # ignore
+        module ActiveSupportCacheEntry
+          extend ActiveSupport::Concern
+
+          included do
+            attr_accessor :tags
+          end
         end
       end
     end
   end
 end
 
-# Patch ActionController
+::ActiveSupport::Cache::Entry.send :include, ::Rails::Cache::Tags::Extensions::ActiveSupportCacheEntry
+::ActiveSupport::Cache.send :include, ::Rails::Cache::Tags::Extensions::ActiveSupportCache
+
 ActiveSupport.on_load(:action_controller) do
   require 'rails/cache/tags/action_controller'
 
-  ActionController::Base.send(:include, Rails::Cache::Tags::ActionController)
-end
-
-# Patch Dalli store
-begin
-  require 'dalli'
-  require 'dalli/version'
-
-  if Dalli::VERSION.to_f > 2
-    require 'active_support/cache/dalli_store'
-
-    ActiveSupport::Cache::DalliStore.send(:include, Rails::Cache::Tags::Store)
-  end
-rescue LoadError, NameError
-  # ignore
+  ::ActionController::Base.send(:include, Rails::Cache::Tags::ActionController)
 end

data/lib/rails/cache/tags/store.rb

@@ -13,7 +13,6 @@ module Rails
         extend ActiveSupport::Concern
 
         included do
-          alias_method_chain :initialize, :tags
           alias_method_chain :exist?, :tags
           alias_method_chain :read, :tags
           alias_method_chain :read_multi, :tags
@@ -24,17 +23,13 @@ module Rails
         # cache entry (for Dalli mainly)
         Entry = Struct.new(:value, :tags)
 
-        attr_reader :tag_set
-
-        def initialize_with_tags(*args)
-          initialize_without_tags(*args)
-
-          @tag_set = Set.new(self)
+        def tag_set
+          @tag_set ||= Set.new(self)
         end
 
         def read_with_tags(name, options = nil)
           result = read_without_tags(name, options)
-          entry = @tag_set.check(result)
+          entry = tag_set.check(result)
 
           if entry
             entry
@@ -66,7 +61,7 @@ module Rails
           result = read_multi_without_tags(*names)
 
           names.each_with_object(Hash.new) do |name, hash|
-            hash[name.to_s] = @tag_set.check(result[name.to_s])
+            hash[name.to_s] = tag_set.check(result[name.to_s])
           end
         end
 
@@ -84,7 +79,7 @@ module Rails
             result
           else # only :read occured
             # read occured, and result is fresh
-            if (entry = @tag_set.check(result))
+            if (entry = tag_set.check(result))
               entry
             else # result is stale
               delete(name)

data/lib/rails/cache/tags/version.rb

@@ -1,7 +1,7 @@
 module Rails
   module Cache
     module Tags
-      VERSION = "1.3.0"
+      VERSION = "1.3.1"
     end
   end
 end

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: rails-cache-tags
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Alexei Mikhailov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
   name: memcache-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dalli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Tagged caching support for Rails
@@ -174,17 +174,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.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Tagged caching support for Rails