rails-brotli-cache 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52fe3544e2a3d65acf1bba0cd17939e62d628f1dcd6482ec7110c730494527a8
-  data.tar.gz: 9e3d9691e99051ce29ed22ccb3a7414e6a00c8037fbc877ef8892a4f4e2a2705
+  metadata.gz: 25d1a71b5e57f6f4c61612ff8c4cfb99d88aba2ed41b8f2436191c5c3e31904b
+  data.tar.gz: c9305dc9477b54c0072395d6e55ede962b9c311e907025c84d1ab5dc6fdf648d
 SHA512:
-  metadata.gz: d838530dedd6aea82be35754f96e9269171fe2c62f1b8654dcd0a439836d24c71b1e4d60d09931f6ed9a32d57ca6f4fe8a3e4623d04647ca8e3d46a6c020ef75
-  data.tar.gz: '058b95a3d43191462cc98b2bc0086e37b88175aff01fbf8eb6b134eb757622a5fd999acadd39594c3b6818df36103049f57917031a26111726f6b4e722109441'
+  metadata.gz: b890c5e6b89cd6150fb5e965adecfa2963cce3de9ef4a474c70a66ba7e91f5dc21bba69eed3963e7ec84ddece396cc22be18150a2d0dc54fcf0ea92c4b7be877
+  data.tar.gz: 00d8463045555382d2d59bfff056470c6066042860332d30b9cd127166be119a70c28bf39241c144413a032a6fbc87127872945213d56fbb8bf52bf86d36a73c

data/lib/rails-brotli-cache/store.rb

@@ -46,7 +46,7 @@ module RailsBrotliCache
       end
 
       uncompressed(
-        @core_store.fetch(expanded_cache_key(name, options[:namespace]), options.merge(compress: false)) do
+        @core_store.fetch(expanded_cache_key(name), options.merge(compress: false)) do
           if block_given?
             compressed(block.call, options)
           else
@@ -62,7 +62,7 @@ module RailsBrotliCache
       payload = compressed(value, options)
 
       @core_store.write(
-        expanded_cache_key(name, options[:namespace]),
+        expanded_cache_key(name),
         payload,
         options.merge(compress: false)
       )
@@ -72,7 +72,7 @@ module RailsBrotliCache
       options = (options || {}).reverse_merge(@init_options)
 
       payload = @core_store.read(
-        expanded_cache_key(name, options[:namespace]),
+        expanded_cache_key(name),
         options
       )
 
@@ -83,7 +83,7 @@ module RailsBrotliCache
       options = (options || {}).reverse_merge(@init_options)
       new_hash = hash.map do |key, val|
         [
-          expanded_cache_key(key, options[:namespace]),
+          expanded_cache_key(key),
           compressed(val, options)
         ]
       end
@@ -96,7 +96,7 @@ module RailsBrotliCache
 
     def read_multi(*names)
       options = names.extract_options!
-      names = names.map { |name| expanded_cache_key(name, options[:namespace]) }
+      names = names.map { |name| expanded_cache_key(name) }
       options = options.reverse_merge(@init_options)
 
       core_store.read_multi(*names, options).map do |key, val|
@@ -106,7 +106,7 @@ module RailsBrotliCache
 
     def fetch_multi(*names)
       options = names.extract_options!
-      names = names.map { |name| expanded_cache_key(name, options[:namespace]) }
+      names = names.map { |name| expanded_cache_key(name) }
       options = options.reverse_merge(@init_options)
 
       @core_store.fetch_multi(
@@ -117,11 +117,11 @@ module RailsBrotliCache
     end
 
     def exist?(name, options = {})
-      @core_store.exist?(expanded_cache_key(name, options[:namespace]), options)
+      @core_store.exist?(expanded_cache_key(name), options)
     end
 
     def delete(name, options = {})
-      @core_store.delete(expanded_cache_key(name, options[:namespace]), options)
+      @core_store.delete(expanded_cache_key(name), options)
     end
 
     def clear
@@ -129,11 +129,11 @@ module RailsBrotliCache
     end
 
     def increment(name, amount = 1, **options)
-      @core_store.increment(expanded_cache_key(name, options[:namespace]), amount, **options)
+      @core_store.increment(expanded_cache_key(name), amount, **options)
     end
 
     def decrement(name, amount = 1, **options)
-      @core_store.decrement(expanded_cache_key(name, options[:namespace]), amount, **options)
+      @core_store.decrement(expanded_cache_key(name), amount, **options)
     end
 
     def self.supports_cache_versioning?
@@ -174,8 +174,8 @@ module RailsBrotliCache
       Marshal.load(serialized)
     end
 
-    def expanded_cache_key(name, namespace = nil)
-      "#{@prefix}#{::ActiveSupport::Cache.expand_cache_key(name, namespace)}"
+    def expanded_cache_key(name)
+      "#{@prefix}#{::ActiveSupport::Cache.expand_cache_key(name)}"
     end
 
     def source_cache_key(name)

data/lib/rails-brotli-cache/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsBrotliCache
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/spec/rails-brotli-cache/cache_keys_spec.rb

@@ -15,13 +15,18 @@ describe RailsBrotliCache do
     end
   end
 
+  let(:options) do
+    {}
+  end
+
   let(:redis_store) do
-    ActiveSupport::Cache::RedisCacheStore.new(redis: $redis)
+    ActiveSupport::Cache::RedisCacheStore.new({ redis: $redis }.merge(options))
   end
 
   let(:brotli_store) do
     RailsBrotliCache::Store.new(
-      redis_store
+      ActiveSupport::Cache::RedisCacheStore.new(redis: $redis),
+      options
     )
   end
 
@@ -49,6 +54,42 @@ describe RailsBrotliCache do
       brotli_store.fetch([:views, "controller/action", collection]) { 123 }
       expect($redis.get("views/controller/action/post/1/post/2")).to be_present
       expect($redis.get("br-views/controller/action/post/1/post/2")).to be_present
+      expect(brotli_store.read([:views, "controller/action", collection])).to eq 123
+    end
+
+    context "custom namespace string is not duplicated" do
+      let(:options) do
+        {
+          namespace: "myapp"
+        }
+      end
+
+      it "activemodel object keys" do
+        post_1 = Post.new(id: 1)
+        redis_store.fetch(post_1) { 123 }
+        brotli_store.fetch(post_1) { 123 }
+        expect($redis.get("myapp:post/1")).to be_present
+        expect($redis.get("myapp:br-post/1")).to be_present
+        expect(brotli_store.read(post_1)).to eq 123
+      end
+    end
+
+    context "custom namespace proc" do
+      @@counter = 0
+      let(:options) do
+        {
+          namespace: -> { "myapp" }
+        }
+      end
+
+      it "activemodel object keys" do
+        post_1 = Post.new(id: 1)
+        redis_store.fetch(post_1) { 123 }
+        brotli_store.fetch(post_1) { 123 }
+        expect($redis.get("myapp:post/1")).to be_present
+        expect($redis.get("myapp:br-post/1")).to be_present
+        expect(brotli_store.read(post_1)).to eq 123
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-brotli-cache
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - pawurb