rails-brotli-cache 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01a0f784d05c6228ab9f4305fddda0b0622a3b0a1dfaba079e952c051064a535
-  data.tar.gz: c12edd70df133be76fb09c2fdc179d83257307874d57f4f06fbe101fc639bc4a
+  metadata.gz: 52fe3544e2a3d65acf1bba0cd17939e62d628f1dcd6482ec7110c730494527a8
+  data.tar.gz: 9e3d9691e99051ce29ed22ccb3a7414e6a00c8037fbc877ef8892a4f4e2a2705
 SHA512:
-  metadata.gz: 7a7cc8c87363e93b947bc606f1c0811199ff47ac574fd0bf329ef6248e6305661d0f305874c950bc4c02ee86327b2029c6d22ab01be7de81ab1e94af54d111cd
-  data.tar.gz: 842e6e543337486dd313f65491ba9b56ca6fa15fcd8c94ed201d702d767d9ae41c777e240a6fd5791cbaa3d235f293a9d21281a76c8569271b7f1605b29377fe
+  metadata.gz: d838530dedd6aea82be35754f96e9269171fe2c62f1b8654dcd0a439836d24c71b1e4d60d09931f6ed9a32d57ca6f4fe8a3e4623d04647ca8e3d46a6c020ef75
+  data.tar.gz: '058b95a3d43191462cc98b2bc0086e37b88175aff01fbf8eb6b134eb757622a5fd999acadd39594c3b6818df36103049f57917031a26111726f6b4e722109441'

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

@@ -46,7 +46,7 @@ module RailsBrotliCache
       end
 
       uncompressed(
-        @core_store.fetch(cache_key(name), options.merge(compress: false)) do
+        @core_store.fetch(expanded_cache_key(name, options[:namespace]), 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(
-        cache_key(name),
+        expanded_cache_key(name, options[:namespace]),
         payload,
         options.merge(compress: false)
       )
@@ -72,7 +72,7 @@ module RailsBrotliCache
       options = (options || {}).reverse_merge(@init_options)
 
       payload = @core_store.read(
-        cache_key(name),
+        expanded_cache_key(name, options[:namespace]),
         options
       )
 
@@ -83,7 +83,7 @@ module RailsBrotliCache
       options = (options || {}).reverse_merge(@init_options)
       new_hash = hash.map do |key, val|
         [
-          cache_key(key),
+          expanded_cache_key(key, options[:namespace]),
           compressed(val, options)
         ]
       end
@@ -96,17 +96,17 @@ module RailsBrotliCache
 
     def read_multi(*names)
       options = names.extract_options!
-      names = names.map { |name| cache_key(name) }
+      names = names.map { |name| expanded_cache_key(name, options[:namespace]) }
       options = options.reverse_merge(@init_options)
 
-      Hash[core_store.read_multi(*names, options).map do |key, val|
+      core_store.read_multi(*names, options).map do |key, val|
         [source_cache_key(key), uncompressed(val, options)]
-      end]
+      end.to_h
     end
 
     def fetch_multi(*names)
       options = names.extract_options!
-      names = names.map { |name| cache_key(name) }
+      names = names.map { |name| expanded_cache_key(name, options[:namespace]) }
       options = options.reverse_merge(@init_options)
 
       @core_store.fetch_multi(
@@ -116,26 +116,24 @@ module RailsBrotliCache
       end
     end
 
-    def exist?(name, options = nil)
-      @core_store.exist?(cache_key(name), options)
+    def exist?(name, options = {})
+      @core_store.exist?(expanded_cache_key(name, options[:namespace]), options)
     end
 
-    def delete(name, options = nil)
-      @core_store.delete(cache_key(name), options)
+    def delete(name, options = {})
+      @core_store.delete(expanded_cache_key(name, options[:namespace]), options)
     end
 
-    def clear(options = nil)
+    def clear
       @core_store.clear
     end
 
-    def increment(*args)
-      args[0] = cache_key(args[0])
-      @core_store.increment(*args)
+    def increment(name, amount = 1, **options)
+      @core_store.increment(expanded_cache_key(name, options[:namespace]), amount, **options)
     end
 
-    def decrement(*args)
-      args[0] = cache_key(args[0])
-      @core_store.decrement(*args)
+    def decrement(name, amount = 1, **options)
+      @core_store.decrement(expanded_cache_key(name, options[:namespace]), amount, **options)
     end
 
     def self.supports_cache_versioning?
@@ -176,8 +174,8 @@ module RailsBrotliCache
       Marshal.load(serialized)
     end
 
-    def cache_key(name)
-      "#{@prefix}#{name}"
+    def expanded_cache_key(name, namespace = nil)
+      "#{@prefix}#{::ActiveSupport::Cache.expand_cache_key(name, namespace)}"
     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.1"
+  VERSION = "0.4.3"
 end

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+return unless ENV['RAILS_CACHE_STORE'] == 'redis_cache_store'
+
+describe RailsBrotliCache do
+  class Post
+    include ActiveModel::Model
+
+    attr_accessor :id
+
+    def to_param
+      "post/#{id}"
+    end
+  end
+
+  let(:redis_store) do
+    ActiveSupport::Cache::RedisCacheStore.new(redis: $redis)
+  end
+
+  let(:brotli_store) do
+    RailsBrotliCache::Store.new(
+      redis_store
+    )
+  end
+
+  describe "generated cache keys are identical to standard cache stores" do
+    it "works for string keys" do
+      redis_store.fetch("string-key") { 123 }
+      brotli_store.fetch("string-key") { 123 }
+      expect($redis.get("br-string-key")).to be_present
+      expect($redis.get("string-key")).to be_present
+    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("br-post/1")).to be_present
+      expect($redis.get("post/1")).to be_present
+    end
+
+    it "ActiveModel objects complex collection keys" do
+      post_1 = Post.new(id: 1)
+      post_2 = Post.new(id: 2)
+      collection = [post_1, post_2]
+      redis_store.fetch([:views, "controller/action", collection]) { 123 }
+      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
+    end
+  end
+end

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

@@ -28,6 +28,16 @@ describe RailsBrotliCache do
     end
   end
 
+  class Post
+    include ActiveModel::Model
+
+    attr_accessor :id
+
+    def to_param
+      "post/#{id}"
+    end
+  end
+
   describe "#fetch" do
     it "stores value in the configured Rails.cache with a prefix" do
       cache_store.fetch("test-key") { 123 }
@@ -45,6 +55,15 @@ describe RailsBrotliCache do
       expect(cache_store.read("test-key")).to eq 1
     end
 
+    it "stores and reads fragment caches with complex objects as cache keys" do
+      cached_fragment = "<div>Cached fragment</div>"
+
+      collection = [Post.new(id: 1), Post.new(id: 2)]
+
+      cache_store.fetch([:views, "controller/action", collection]) { cached_fragment }
+      expect(cache_store.read([:views, "controller/action", collection])).to eq(cached_fragment)
+    end
+
     context "{ force: true }" do
       it "raises an error if block is not provided" do
         expect {
@@ -127,6 +146,15 @@ describe RailsBrotliCache do
       expect(cache_store.read("test-key")).to eq big_enough_to_compress_value
     end
 
+    it "writes and reads fragment caches with complex objects as cache keys" do
+      cached_fragment = "<div>Cached fragment</div>"
+
+      collection = [Post.new(id: 1), Post.new(id: 2)]
+
+      cache_store.write([:views, "controller/action", [collection, nil]], cached_fragment)
+      expect(cache_store.read([:views, "controller/action", [collection, nil]])).to eq(cached_fragment)
+    end
+
     describe ":compressor_class option" do
       context "as an init config" do
         let(:options) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-brotli-cache
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - pawurb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-05 00:00:00.000000000 Z
+date: 2023-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -158,6 +158,7 @@ files:
 - spec/dummy/public/robots.txt
 - spec/dummy/vendor/.keep
 - spec/fixtures/sample.json
+- spec/rails-brotli-cache/cache_keys_spec.rb
 - spec/rails-brotli-cache/compatibility_spec.rb
 - spec/rails-brotli-cache/rails_store_spec.rb
 - spec/rails-brotli-cache/redis_spec.rb
@@ -231,6 +232,7 @@ test_files:
 - spec/dummy/public/robots.txt
 - spec/dummy/vendor/.keep
 - spec/fixtures/sample.json
+- spec/rails-brotli-cache/cache_keys_spec.rb
 - spec/rails-brotli-cache/compatibility_spec.rb
 - spec/rails-brotli-cache/rails_store_spec.rb
 - spec/rails-brotli-cache/redis_spec.rb