rails-cache-tags 1.3.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4b353fedb116bc1b8d576beb054b76a8dba9530
-  data.tar.gz: 7bc4378c384faf161f3dd4887e0b162375a57429
+  metadata.gz: 3af1f3228eb57a6a08b6a1bb904f8c1008fe6a9c
+  data.tar.gz: bb81c31d6447f9bd198cc3ef77a60d0fcc3ffefd
 SHA512:
-  metadata.gz: 1e453e001334ad6ffbc62401436fd4e6673ca567d93bc11cc5d51d6c351af1329ff686fbb8dbefde9572eec5beaf1ba3679cf7cfffddf6b5baa3ec9de9e187f8
-  data.tar.gz: 917d425de030d371e3ef44556cd280a2dab22626fa469a13c9881a708aaa993875dc97fcf19dcf1481e4d058ef114f5289b544d04c74321fc7339664a0413ff0
+  metadata.gz: 128dd18180631c49207e3070b61bbe1ba4d4ce89db46efc4ba7d2f16d5cd1a828230fa536df1a7b817b11fd9824b1de75e194a08f5e34b510ef9801260a1b02f
+  data.tar.gz: 362939552ce228fe73efc07c1698a3a48f5e0f051e2233de6db66abb8d6c03a964138435c7a16a088d7813265d9aa6fc4c27f4fa0347c4e5eded5a2c4d12d307

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

@@ -0,0 +1,38 @@
+# coding: utf-8
+
+require 'request_store'
+
+module Rails
+  module Cache
+    module Tags
+      class LocalCache
+        delegate :fetch, :exist?, :[], :[]=, to: :store
+
+        def clear
+          store.clear!
+        end
+
+        private
+
+        def store
+          if RequestStore.active?
+            RequestStore
+          else
+            DummyStore
+          end
+        end
+
+        class DummyStore
+          def self.fetch(_)
+            yield
+          end
+
+          def self.clear!; end
+          def self.exist?(_); end
+          def self.[](_); end
+          def self.[]=(*); end
+        end
+      end # class LocalCache
+    end # module Tags
+  end # module Cache
+end # module Rails

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

@@ -1,24 +1,28 @@
 # coding: utf-8
 
 require 'rails/cache/tags/tag'
+require 'rails/cache/tags/local_cache'
 
 module Rails
   module Cache
     module Tags
       class Set
-        # @param [ActiveSupport::Cache::Store] cache
-        def initialize(cache)
-          @cache = cache
+        # @param [ActiveSupport::Cache::Store] store
+        def initialize(store)
+          @store = store
+          @tags_cache = LocalCache.new
         end
 
         def current(tag)
-          @cache.fetch_without_tags(tag.to_key) { 1 }.to_i
+          key = tag.to_key
+          @tags_cache.fetch(key) do
+            @store.fetch_without_tags(key) { 1 }.to_i
+          end
         end
 
         def expire(tag)
           version = current(tag) + 1
-
-          @cache.write_without_tags(tag.to_key, version, :expires_in => nil)
+          @store.write_without_tags(tag.to_key, version, :expires_in => nil)
 
           version
         end
@@ -30,14 +34,35 @@ module Rails
           tags = Tag.build(entry.tags.keys)
 
           saved_versions = entry.tags.values.map(&:to_i)
-          current_versions = read_multi(tags).values.map(&:to_i)
 
-          saved_versions == current_versions ? entry.value : nil
+          saved_versions == current_versions(tags) ? entry.value : nil
         end
 
         private
-        def read_multi(tags)
-          @cache.read_multi_without_tags(*Array.wrap(tags).map(&:to_key))
+
+        def current_versions(tags)
+          keys = Array.wrap(tags).map(&:to_key)
+          versions = keys.inject({}) do |memo, key|
+            if @tags_cache.exist?(key)
+              memo[key] = @tags_cache[key]
+            else
+              memo[key] = nil
+            end
+
+            memo
+          end
+
+          keys = versions.map { |key, version| key if version.nil? }.compact
+          @store.read_multi_without_tags(*keys).each do |key, value|
+            @tags_cache[key] = value
+            versions[key] = value
+          end if keys.present?
+
+          versions.values.map(&:to_i)
+        end
+
+        def tags_cache
+          @tags_cache
         end
       end # class Set
     end # module Tags

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

@@ -1,7 +1,7 @@
 module Rails
   module Cache
     module Tags
-      VERSION = "1.3.3"
+      VERSION = "2.0.0"
     end
   end
 end

data/spec/cache_tags_spec.rb

@@ -67,58 +67,144 @@ describe Rails::Cache::Tags do
     #  assert_blank 'foo'
     #end
 
-    it 'reads and writes a key if hash of tags given' do
-      cache.write('foo', object, options.merge(:tags => {:baz => 1}))
-      assert_read 'foo', object
+    context 'when no tags local cache' do
+      before do
+        RequestStore.end!
+      end
 
-      cache.delete_tag :baz => 2
-      assert_read 'foo', object
+      it 'reads and writes a key if hash of tags given' do
+        cache.write('foo', object, options.merge(:tags => {:baz => 1}))
+        assert_read 'foo', object
 
-      cache.delete_tag :baz => 1
-      assert_blank 'foo'
-    end
+        cache.delete_tag :baz => 2
+        assert_read 'foo', object
 
-    it 'reads and writes a key if array of object given as tags' do
-      tag1 = 1.day.ago
-      tag2 = 2.days.ago
+        cache.delete_tag :baz => 1
+        assert_blank 'foo'
+      end
 
-      cache.write 'foo', object, options.merge(:tags => [tag1, tag2])
-      assert_read 'foo', object
+      it 'reads and writes a key if array of object given as tags' do
+        tag1 = 1.day.ago
+        tag2 = 2.days.ago
 
-      cache.delete_tag tag1
-      assert_blank 'foo'
-    end
+        cache.write 'foo', object, options.merge(:tags => [tag1, tag2])
+        assert_read 'foo', object
 
-    it 'reads multiple keys with tags check' do
-      cache.write 'foo', object, options.merge(:tags => :bar)
-      cache.write 'bar', object, options.merge(:tags => :baz)
+        cache.delete_tag tag1
+        assert_blank 'foo'
+      end
 
-      assert_read 'foo', object
-      assert_read 'bar', object
+      it 'reads multiple keys with tags check' do
+        cache.write 'foo', object, options.merge(:tags => :bar)
+        cache.write 'bar', object, options.merge(:tags => :baz)
 
-      cache.delete_tag :bar
+        assert_read 'foo', object
+        assert_read 'bar', object
 
-      assert_blank 'foo'
-      assert_read 'bar', object
+        cache.delete_tag :bar
 
-      expect(cache.read_multi('foo', 'bar', options)).to eq('foo' => nil, 'bar' => object)
+        assert_blank 'foo'
+        assert_read 'bar', object
+
+        expect(cache.read_multi('foo', 'bar', options)).to eq('foo' => nil, 'bar' => object)
+      end
+
+      it 'fetches key with tag check' do
+        cache.write 'foo', object, options.merge(:tags => :bar)
+
+        expect(cache.fetch('foo', options) { 'baz' }).to eq object
+        expect(cache.fetch('foo', options)).to eq object
+
+        cache.delete_tag :bar
+
+        expect(cache.fetch('foo', options)).to be_nil
+        expect(cache.fetch('foo', options.merge(:tags => :bar)) { object }).to eq object
+        assert_read 'foo', object
+
+        cache.delete_tag :bar
+
+        assert_blank 'foo'
+      end
     end
 
-    it 'fetches key with tag check' do
-      cache.write 'foo', object, options.merge(:tags => :bar)
+    context 'when tags local cache' do
+      before do
+        RequestStore.clear!
+        RequestStore.begin!
+      end
 
-      expect(cache.fetch('foo', options) { 'baz' }).to eq object
-      expect(cache.fetch('foo', options)).to eq object
+      after do
+        RequestStore.end!
+      end
 
-      cache.delete_tag :bar
+      it 'reads and writes a key if hash of tags given' do
+        cache.write('foo', object, options.merge(:tags => {:baz => 1}))
+        assert_read 'foo', object
 
-      expect(cache.fetch('foo', options)).to be_nil
-      expect(cache.fetch('foo', options.merge(:tags => :bar)) { object }).to eq object
-      assert_read 'foo', object
+        cache.delete_tag :baz => 2
+        assert_read 'foo', object
 
-      cache.delete_tag :bar
+        cache.delete_tag :baz => 1
+        assert_read 'foo', object
 
-      assert_blank 'foo'
+        cache.tag_set.send(:tags_cache).clear
+        assert_blank 'foo'
+      end
+
+      it 'reads and writes a key if array of object given as tags' do
+        tag1 = 1.day.ago
+        tag2 = 2.days.ago
+
+        cache.write 'foo', object, options.merge(:tags => [tag1, tag2])
+        assert_read 'foo', object
+
+        cache.delete_tag tag1
+        assert_read 'foo', object
+
+        cache.tag_set.send(:tags_cache).clear
+        assert_blank 'foo'
+      end
+
+      it 'reads multiple keys with tags check' do
+        cache.write 'foo', object, options.merge(:tags => :bar)
+        cache.write 'bar', object, options.merge(:tags => :baz)
+
+        assert_read 'foo', object
+        assert_read 'bar', object
+
+        cache.delete_tag :bar
+
+        assert_read 'foo', object
+
+        cache.tag_set.send(:tags_cache).clear
+        assert_blank 'foo'
+        assert_read 'bar', object
+
+        expect(cache.read_multi('foo', 'bar', options)).to eq('foo' => nil, 'bar' => object)
+      end
+
+      it 'fetches key with tag check' do
+        cache.write 'foo', object, options.merge(:tags => :bar)
+
+        expect(cache.fetch('foo', options) { 'baz' }).to eq object
+        expect(cache.fetch('foo', options)).to eq object
+
+        cache.delete_tag :bar
+
+        expect(cache.fetch('foo', options)).to eq object
+
+        cache.tag_set.send(:tags_cache).clear
+
+        expect(cache.fetch('foo', options)).to be_nil
+        expect(cache.fetch('foo', options.merge(:tags => :bar)) { object }).to eq object
+        assert_read 'foo', object
+
+        cache.delete_tag :bar
+        assert_read 'foo', object
+
+        cache.tag_set.send(:tags_cache).clear
+        assert_blank 'foo'
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-cache-tags
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Alexei Mikhailov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: request_store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +173,7 @@ extra_rdoc_files: []
 files:
 - lib/rails-cache-tags.rb
 - lib/rails/cache/tags/action_controller.rb
+- lib/rails/cache/tags/local_cache.rb
 - lib/rails/cache/tags/set.rb
 - lib/rails/cache/tags/store.rb
 - lib/rails/cache/tags/tag.rb
@@ -184,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Tagged caching support for Rails