rails-cache-tags 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8dbeafaeb77ad8bf678216ab5394736222e516e
-  data.tar.gz: ff7fd4145f49196921987c8a3822b4b19f5cb7a6
+  metadata.gz: ffa3ee36a2bbbdb72b538b31309db833ca3b5edd
+  data.tar.gz: d3e0272f5c56ec204d27f64b2eec55809c8f25bc
 SHA512:
-  metadata.gz: efe9e5258b6f846832daac2ba26df2754e1ea8b1251d4ad0256bf0fcf7a685082f65a32239d5b04f9fc390a336b4f56405f64465d06f5ee167a233feed569489
-  data.tar.gz: ac90ec2a280d85e0e07498909e5aaedd441afcb6867ccf771bb3ff78b05a9fc870feba10fc18bd4da5a1a9919876e47519470bef75da52bcbcde911160b33e01
+  metadata.gz: 61f8d07dfb0a900e18d82ffb4ec53b760d68e4aebc36fd134dbecdce4052bf0a753d6fb47e82cae24e04de19cee164c6aaef8050216cc1bad2ebaf02d126305a
+  data.tar.gz: 3e15df9a5b8aa84b1e5e875c9736d6bba08da4d1f0e946009d38f64d08abc3d9a6169bd8df40238d157bfa0da2d489939a9968a7095a19c3a443c8bf57fd7fa7

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

@@ -6,8 +6,6 @@ module Rails
   module Cache
     module Tags
       class Set
-        KEY_PREFIX = '_tags'
-
         # @param [ActiveSupport::Cache::Store] cache
         def initialize(cache)
           @cache = cache

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

@@ -34,7 +34,7 @@ module Rails
           if entry
             entry
           else
-            delete(name)
+            delete(name, options)
 
             nil
           end
@@ -54,12 +54,13 @@ module Rails
         end
 
         def exist_with_tags?(name, options = nil)
-          exist_without_tags?(name, options) && !read(name).nil?
+          exist_without_tags?(name, options) && !read(name, options).nil?
         end
 
         def read_multi_with_tags(*names)
           result = read_multi_without_tags(*names)
 
+          names.extract_options!
           names.each_with_object(Hash.new) do |name, hash|
             hash[name.to_s] = tag_set.check(result[name.to_s])
           end
@@ -82,7 +83,7 @@ module Rails
             if (entry = tag_set.check(result))
               entry
             else # result is stale
-              delete(name)
+              delete(name, options)
               fetch(name, options) { yield }
             end
           end

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

@@ -23,7 +23,7 @@ module Rails
 
         # Tag constructor
         def initialize(name)
-          @name = ActiveSupport::Cache.expand_cache_key name
+          @name = ActiveSupport::Cache.expand_cache_key(name)
         end
 
         # real cache key

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

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

data/spec/cache_tags_spec.rb

@@ -9,8 +9,8 @@ describe Rails::Cache::Tags do
     before { cache.clear }
 
     def assert_read(key, object)
-      expect(cache.exist?(key)).to eq !!object
-      expect(cache.read(key)).to eq object
+      expect(cache.exist?(key, options)).to eq !!object
+      expect(cache.read(key, options)).to eq object
     end
 
     def assert_blank(key)
@@ -18,33 +18,33 @@ describe Rails::Cache::Tags do
     end
 
     it 'reads and writes a key with tags' do
-      cache.write 'foo', object, :tags => 'baz'
+      cache.write('foo', object, options.merge(:tags => 'baz'))
 
       assert_read 'foo', object
     end
 
     it 'deletes a key if tag is deleted' do
-      cache.write('foo', object, :tags => 'baz')
+      cache.write('foo', object, options.merge(:tags => 'baz'))
       cache.delete_tag 'baz'
 
       assert_blank 'foo'
     end
 
     it 'reads a key if another tag was deleted' do
-      cache.write('foo', object, :tags => 'baz')
+      cache.write('foo', object, options.merge(:tags => 'baz'))
       cache.delete_tag 'fu'
 
       assert_read 'foo', object
     end
 
     it 'reads and writes if multiple tags given' do
-      cache.write('foo', object, :tags => [:baz, :kung])
+      cache.write('foo', object, options.merge(:tags => [:baz, :kung]))
 
       assert_read 'foo', object
     end
 
     it 'deletes a key if one of tags is deleted' do
-      cache.write('foo', object, :tags => [:baz, :kung])
+      cache.write('foo', object, options.merge(:tags => [:baz, :kung]))
       cache.delete_tag :kung
 
       assert_blank 'foo'
@@ -63,7 +63,7 @@ describe Rails::Cache::Tags do
     #end
 
     it 'reads and writes a key if hash of tags given' do
-      cache.write('foo', object, :tags => {:baz => 1})
+      cache.write('foo', object, options.merge(:tags => {:baz => 1}))
       assert_read 'foo', object
 
       cache.delete_tag :baz => 2
@@ -77,7 +77,7 @@ describe Rails::Cache::Tags do
       tag1 = 1.day.ago
       tag2 = 2.days.ago
 
-      cache.write 'foo', object, :tags => [tag1, tag2]
+      cache.write 'foo', object, options.merge(:tags => [tag1, tag2])
       assert_read 'foo', object
 
       cache.delete_tag tag1
@@ -85,8 +85,8 @@ describe Rails::Cache::Tags do
     end
 
     it 'reads multiple keys with tags check' do
-      cache.write 'foo', object, :tags => :bar
-      cache.write 'bar', object, :tags => :baz
+      cache.write 'foo', object, options.merge(:tags => :bar)
+      cache.write 'bar', object, options.merge(:tags => :baz)
 
       assert_read 'foo', object
       assert_read 'bar', object
@@ -96,19 +96,19 @@ describe Rails::Cache::Tags do
       assert_blank 'foo'
       assert_read 'bar', object
 
-      expect(cache.read_multi('foo', 'bar')).to eq('foo' => nil, '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, :tags => :bar
+      cache.write 'foo', object, options.merge(:tags => :bar)
 
-      expect(cache.fetch('foo') { 'baz' }).to eq object
-      expect(cache.fetch('foo')).to eq object
+      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')).to be_nil
-      expect(cache.fetch('foo', :tags => :bar) { object }).to eq 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 :bar
@@ -124,28 +124,40 @@ describe Rails::Cache::Tags do
   COMPLEX_OBJECT = ComplexObject.new('bar')
 
   shared_examples 'cache with tags support' do |*tags|
-    context '', tags do
-      include_examples 'cache with tags support for', SCALAR_OBJECT
-      include_examples 'cache with tags support for', COMPLEX_OBJECT
+    shared_examples 'cache with tags support with options' do
+      context '', tags do
+        include_examples 'cache with tags support for', SCALAR_OBJECT
+        include_examples 'cache with tags support for', COMPLEX_OBJECT
+
+        # test everything with locale cache
+        include_examples 'cache with tags support for', SCALAR_OBJECT do
+          include ActiveSupport::Cache::Strategy::LocalCache
+
+          around(:each) do |example|
+            if cache.respond_to?(:with_local_cache)
+              cache.with_local_cache { example.run }
+            end
+          end
+        end
 
-      # test everything with locale cache
-      include_examples 'cache with tags support for', SCALAR_OBJECT do
-        include ActiveSupport::Cache::Strategy::LocalCache
+        include_examples 'cache with tags support for', COMPLEX_OBJECT do
+          include ActiveSupport::Cache::Strategy::LocalCache
 
-        around(:each) do |example|
-          if cache.respond_to?(:with_local_cache)
+          around(:each) do |example|
             cache.with_local_cache { example.run }
           end
         end
       end
+    end
 
-      include_examples 'cache with tags support for', COMPLEX_OBJECT do
-        include ActiveSupport::Cache::Strategy::LocalCache
+    context "without namespace option" do
+      let(:options) { {} }
+      include_examples 'cache with tags support with options'
+    end
 
-        around(:each) do |example|
-          cache.with_local_cache { example.run }
-        end
-      end
+    context "with namespace option" do
+      let(:options) { {namespace: 'namespace'} }
+      include_examples 'cache with tags support with options'
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-cache-tags
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Alexei Mikhailov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Tagged caching support for Rails