rails-brotli-cache 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e109b9b356474fb8085b1cceaa892695de997465db4c90872556f76419da8f86
-  data.tar.gz: c8422310e9fed160052637a40dc7b1150b938c0f891b3b7b011eacdd11b8e4bb
+  metadata.gz: deb7fb5b6df5533b08e76b59062ff0a1897822e74031108ae45efbff9612cc74
+  data.tar.gz: cbfe23f39e63c70e30d3ac1dc412d38ab9a0b725e6da63f6a724423774d6c99b
 SHA512:
-  metadata.gz: 6b435443fbf3a6a09baed87b124429e43dcd4d3fbd06cab175a15818b397285aeab96ad0694dc8a2f0e0d91c3478400ba0e3081045e93ca63e275e62626f0e0d
-  data.tar.gz: 95af20d56721fbe1e9118b29a0fa1f7dc3fe5825d8c7ee04d77b783b96b405d6b1e765f4d8b63e8668d9414ca1e716cc010e3201d7a93340d35251ebd966f9e8
+  metadata.gz: 9e28ac7994f28b176b086f80ae3bdd163a72c285a094d0b51bfa55ffee4f75b845414ed6a30487db60a158ad2e66795eae17ccde70a5f06cf4a1f84d0d5e7e3c
+  data.tar.gz: 2490251b4a3f29f0121132b18b127c23c152b07a7e187844fb061aacb76e448342de0cf8f1c5b20ea203371c7da9d6dc3b26fe4332f2f862c2bcf8726f316137

data/.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['3.2', '3.1', '3.0', '2.7', '2.6']
+        ruby-version: ['3.2', '3.1', '3.0', '2.7']
     steps:
       - uses: actions/checkout@v3
       - name: Set up Ruby ${{ matrix.ruby-version }}

data/Gemfile

@@ -1,3 +1,3 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec

data/README.md

@@ -134,7 +134,7 @@ By default gem uses a Brotli compression, but you can customize the algorithm. Y
 ```ruby
 config.cache_store = RailsBrotliCache::Store.new(
   ActiveSupport::Cache::RedisCacheStore.new,
-  { compressor_class: Snappy }
+  { compressor_class: ZSTDCompressor }
 )
 ```
 
@@ -142,7 +142,7 @@ config.cache_store = RailsBrotliCache::Store.new(
 
 class ZSTDCompressor
   def self.deflate(payload)
-    ::Zstd.compress(payload, 10)
+    ::Zstd.compress(payload, level: 10)
   end
 
   def self.inflate(payload)
@@ -150,7 +150,7 @@ class ZSTDCompressor
   end
 end
 
-Rails.cache.write('test-key', json, compressor_class: Snappy)
+Rails.cache.write('test-key', json, compressor_class: ZSTDCompressor)
 ```
 
 This config expects a class that defines two methods, `inflate` and `deflate`. It allows to use, for example, a [ZSTD by Facebook](https://github.com/SpringMT/zstd-ruby), offering even better performance and compression.

data/Rakefile

@@ -1,11 +1,11 @@
 require "bundler/gem_tasks"
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
 
-desc 'Test all cache_stores'
+desc "Test all cache_stores"
 task :test_all do
   system("TEST_RAILS_CACHE_STORE=redis_cache_store bundle exec rspec spec && TEST_RAILS_CACHE_STORE=brotli_cache_store bundle exec rspec spec && TEST_RAILS_CACHE_STORE=mem_cache_store bundle exec rspec spec && bundle exec rspec spec")
 end

data/benchmarks/Gemfile

@@ -1,7 +1,8 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'brotli'
-gem 'rails-brotli-cache', path: "../"
-gem 'redis'
-gem 'dalli'
-gem 'zstd-ruby'
+gem "brotli"
+gem "rails-brotli-cache", path: "../"
+gem "redis"
+gem "dalli"
+gem "zstd-ruby"
+gem "lz4-ruby"

data/benchmarks/main.rb

@@ -1,14 +1,15 @@
-require 'active_support'
-require 'active_support/core_ext/hash'
-require 'net/http'
-require 'brotli'
-require 'rails-brotli-cache'
-require 'benchmark'
-require 'zstd-ruby'
+require "active_support"
+require "active_support/core_ext/hash"
+require "net/http"
+require "brotli"
+require "rails-brotli-cache"
+require "benchmark"
+require "zstd-ruby"
+require "lz4-ruby"
 
 class ZSTDCompressor
   def self.deflate(payload)
-    ::Zstd.compress(payload, 10)
+    ::Zstd.compress(payload, level: 10)
   end
 
   def self.inflate(payload)
@@ -16,21 +17,49 @@ class ZSTDCompressor
   end
 end
 
+class LZ4Compressor
+  def self.deflate(payload)
+    ::LZ4::compress(payload)
+  end
+
+  def self.inflate(payload)
+    ::LZ4::uncompress(payload)
+  end
+end
+
+class LZ4HCCompressor
+  def self.deflate(payload)
+    ::LZ4::compressHC(payload)
+  end
+
+  def self.inflate(payload)
+    ::LZ4::uncompress(payload)
+  end
+end
+
 memory_cache = ActiveSupport::Cache::MemoryStore.new(compress: true) # memory store does not use compression by default
 brotli_memory_cache = RailsBrotliCache::Store.new(memory_cache)
 zstd_memory_cache = RailsBrotliCache::Store.new(memory_cache, compressor_class: ZSTDCompressor, prefix: "zs-")
+lz4_memory_cache = RailsBrotliCache::Store.new(memory_cache, compressor_class: LZ4Compressor, prefix: "lz4-")
+lz4hc_memory_cache = RailsBrotliCache::Store.new(memory_cache, compressor_class: LZ4HCCompressor, prefix: "lz4hc-")
 
 redis_cache = ActiveSupport::Cache::RedisCacheStore.new
 brotli_redis_cache = RailsBrotliCache::Store.new(redis_cache)
 zstd_redis_cache = RailsBrotliCache::Store.new(redis_cache, compressor_class: ZSTDCompressor, prefix: "zs-")
+lz4_redis_cache = RailsBrotliCache::Store.new(redis_cache, compressor_class: LZ4Compressor, prefix: "lz4-")
+lz4hc_redis_cache = RailsBrotliCache::Store.new(redis_cache, compressor_class: LZ4HCCompressor, prefix: "lz4hc-")
 
 memcached_cache = ActiveSupport::Cache::MemCacheStore.new
 brotli_memcached_cache = RailsBrotliCache::Store.new(memcached_cache)
 zstd_memcached_cache = RailsBrotliCache::Store.new(memcached_cache, compressor_class: ZSTDCompressor, prefix: "zs-")
+lz4_memcached_cache = RailsBrotliCache::Store.new(memcached_cache, compressor_class: LZ4Compressor, prefix: "lz4-")
+lz4hc_memcached_cache = RailsBrotliCache::Store.new(memcached_cache, compressor_class: LZ4HCCompressor, prefix: "lz4hc-")
 
-file_cache = ActiveSupport::Cache::FileStore.new('/tmp')
+file_cache = ActiveSupport::Cache::FileStore.new("/tmp")
 brotli_file_cache = RailsBrotliCache::Store.new(file_cache)
 zstd_file_cache = RailsBrotliCache::Store.new(file_cache, compressor_class: ZSTDCompressor, prefix: "zs-")
+lz4_file_cache = RailsBrotliCache::Store.new(file_cache, compressor_class: LZ4Compressor, prefix: "lz4-")
+lz4hc_file_cache = RailsBrotliCache::Store.new(file_cache, compressor_class: LZ4HCCompressor, prefix: "lz4hc-")
 
 json_uri = URI("https://raw.githubusercontent.com/pawurb/rails-brotli-cache/main/spec/fixtures/sample.json")
 json = Net::HTTP.get(json_uri)
@@ -46,7 +75,7 @@ br_json_size = redis_cache.redis.with do |conn|
   conn.get("br-json").size
 end
 puts "Brotli JSON size: #{br_json_size}"
-puts "~#{((gzip_json_size - br_json_size).to_f / gzip_json_size.to_f * 100).round}% improvment"
+puts "~#{((gzip_json_size - br_json_size).to_f / gzip_json_size.to_f * 100).round}% difference"
 puts ""
 
 zstd_redis_cache.write("json", json)
@@ -54,7 +83,23 @@ zs_json_size = redis_cache.redis.with do |conn|
   conn.get("zs-json").size
 end
 puts "ZSTD JSON size: #{zs_json_size}"
-puts "~#{((gzip_json_size - zs_json_size).to_f / gzip_json_size.to_f * 100).round}% improvment"
+puts "~#{((gzip_json_size - zs_json_size).to_f / gzip_json_size.to_f * 100).round}% difference"
+puts ""
+
+lz4_redis_cache.write("json", json)
+lz4_json_size = redis_cache.redis.with do |conn|
+  conn.get("lz4-json").size
+end
+puts "LZ4 JSON size: #{lz4_json_size}"
+puts "~#{((gzip_json_size - lz4_json_size).to_f / gzip_json_size.to_f * 100).round}% difference"
+puts ""
+
+lz4hc_redis_cache.write("json", json)
+lz4hc_json_size = redis_cache.redis.with do |conn|
+  conn.get("lz4hc-json").size
+end
+puts "LZ4HC JSON size: #{lz4hc_json_size}"
+puts "~#{((gzip_json_size - lz4hc_json_size).to_f / gzip_json_size.to_f * 100).round}% difference"
 puts ""
 
 iterations = 100
@@ -81,6 +126,20 @@ Benchmark.bm do |x|
     end
   end
 
+  x.report("lz4_memory_cache") do
+    iterations.times do
+      lz4_memory_cache.write("test", json)
+      lz4_memory_cache.read("test")
+    end
+  end
+
+  x.report("lz4hc_memory_cache") do
+    iterations.times do
+      lz4hc_memory_cache.write("test", json)
+      lz4hc_memory_cache.read("test")
+    end
+  end
+
   x.report("redis_cache") do
     iterations.times do
       redis_cache.write("test", json)
@@ -102,6 +161,20 @@ Benchmark.bm do |x|
     end
   end
 
+  x.report("lz4_redis_cache") do
+    iterations.times do
+      lz4_redis_cache.write("test", json)
+      lz4_redis_cache.read("test")
+    end
+  end
+
+  x.report("lz4hc_redis_cache") do
+    iterations.times do
+      lz4hc_redis_cache.write("test", json)
+      lz4hc_redis_cache.read("test")
+    end
+  end
+
   x.report("memcached_cache") do
     iterations.times do
       memcached_cache.write("test", json)
@@ -123,6 +196,20 @@ Benchmark.bm do |x|
     end
   end
 
+  x.report("lz4_memcached_cache") do
+    iterations.times do
+      lz4_memcached_cache.write("test", json)
+      lz4_memcached_cache.read("test")
+    end
+  end
+
+  x.report("lz4hc_memcached_cache") do
+    iterations.times do
+      lz4hc_memcached_cache.write("test", json)
+      lz4hc_memcached_cache.read("test")
+    end
+  end
+
   x.report("file_cache") do
     iterations.times do
       file_cache.write("test", json)
@@ -143,4 +230,18 @@ Benchmark.bm do |x|
       zstd_file_cache.read("test")
     end
   end
+
+  x.report("lz4_file_cache") do
+    iterations.times do
+      lz4_file_cache.write("test", json)
+      lz4_file_cache.read("test")
+    end
+  end
+
+  x.report("lz4hc_file_cache") do
+    iterations.times do
+      lz4hc_file_cache.write("test", json)
+      lz4hc_file_cache.read("test")
+    end
+  end
 end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'active_support/cache'
+require "active_support/cache"
 begin
-  require 'brotli'
+  require "brotli"
 rescue LoadError
 end
 
@@ -25,7 +25,7 @@ module RailsBrotliCache
     DEFAULT_OPTIONS = {
       compress_threshold: COMPRESS_THRESHOLD,
       compress: true,
-      compressor_class: BrotliCompressor
+      compressor_class: BrotliCompressor,
     }
 
     attr_reader :core_store
@@ -33,10 +33,10 @@ module RailsBrotliCache
     def initialize(core_store, options = {})
       @core_store = core_store
       @prefix = if options.key?(:prefix)
-        options.fetch(:prefix)
-      else
-        "br-"
-      end
+          options.fetch(:prefix)
+        else
+          "br-"
+        end
 
       @init_options = options.reverse_merge(DEFAULT_OPTIONS)
     end
@@ -87,9 +87,9 @@ module RailsBrotliCache
       new_hash = hash.map do |key, val|
         [
           expanded_cache_key(key),
-          compressed(val, options)
+          compressed(val, options),
         ]
-      end
+      end.to_h
 
       @core_store.write_multi(
         new_hash,
@@ -107,18 +107,30 @@ module RailsBrotliCache
       end.to_h
     end
 
+    def delete_multi(names, options = nil)
+      options = (options || {}).reverse_merge(@init_options)
+      names = names.map { |name| expanded_cache_key(name) }
+
+      core_store.delete_multi(names, options)
+    end
+
     def fetch_multi(*names)
       options = names.extract_options!
-      names = names.map { |name| expanded_cache_key(name) }
+      expanded_names = names.map { |name| expanded_cache_key(name) }
       options = options.reverse_merge(@init_options)
 
-      @core_store.fetch_multi(
-        *names, options.merge(compress: false)
-      ) do |name|
-        compressed(yield(source_cache_key(name)), options)
-      end.map do |key, val|
+      reads = core_store.send(:read_multi_entries, expanded_names, **options)
+      reads.map do |key, val|
         [source_cache_key(key), uncompressed(val, options)]
       end.to_h
+
+      writes = {}
+      ordered = names.index_with do |name|
+        reads.fetch(name) { writes[name] = yield(name) }
+      end
+
+      write_multi(writes)
+      ordered
     end
 
     def exist?(name, options = {})
@@ -170,11 +182,11 @@ module RailsBrotliCache
       return payload if payload.is_a?(Integer)
 
       serialized = if payload.start_with?(MARK_BR_COMPRESSED)
-        compressor = options.fetch(:compressor_class)
-        compressor.inflate(payload.byteslice(1..-1))
-      else
-        payload
-      end
+          compressor = options.fetch(:compressor_class)
+          compressor.inflate(payload.byteslice(1..-1))
+        else
+          payload
+        end
 
       Marshal.load(serialized)
     end

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

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

data/lib/rails-brotli-cache.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-require 'rails-brotli-cache/store'
+require "rails-brotli-cache/store"
 
 module RailsBrotliCache
 end
-

data/rails-brotli-cache.gemspec

@@ -1,20 +1,20 @@
 # -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'rails-brotli-cache/version'
+require "rails-brotli-cache/version"
 
 Gem::Specification.new do |gem|
-  gem.name          = "rails-brotli-cache"
-  gem.version       = RailsBrotliCache::VERSION
-  gem.authors       = ["pawurb"]
-  gem.email         = ["contact@pawelurbanek.com"]
-  gem.summary       = %q{ Drop-in enhancement for Rails cache, offering better performance and compression with Brotli algorithm. }
-  gem.description   = %q{ This gem reduces storage needed for Rails cache by using Brotli compression, which can produce outputs smaller by ~20% and offers better performance than Gzip. }
-  gem.homepage      = "https://github.com/pawurb/rails-brotli-cache"
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = gem.files.grep(%r{^(spec)/})
+  gem.name = "rails-brotli-cache"
+  gem.version = RailsBrotliCache::VERSION
+  gem.authors = ["pawurb"]
+  gem.email = ["contact@pawelurbanek.com"]
+  gem.summary = %q{ Drop-in enhancement for Rails cache, offering better performance and compression with Brotli algorithm. }
+  gem.description = %q{ This gem reduces storage needed for Rails cache by using Brotli compression, which can produce outputs smaller by ~20% and offers better performance than Gzip. }
+  gem.homepage = "https://github.com/pawurb/rails-brotli-cache"
+  gem.files = `git ls-files`.split("\n")
+  gem.test_files = gem.files.grep(%r{^(spec)/})
   gem.require_paths = ["lib"]
-  gem.license       = "MIT"
+  gem.license = "MIT"
   gem.add_dependency "activesupport"
   gem.add_development_dependency "brotli"
   gem.add_development_dependency "rspec"
@@ -24,6 +24,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "redis"
   gem.add_development_dependency "dalli"
   gem.add_development_dependency "byebug"
+  gem.add_development_dependency "rufo"
 
   if gem.respond_to?(:metadata=)
     gem.metadata = { "rubygems_mfa_required" => "true" }

data/spec/dummy/Gemfile

@@ -42,4 +42,3 @@ group :development do
   # Speed up commands on slow machines / big apps [https://github.com/rails/spring]
   # gem "spring"
 end
-

data/spec/dummy/config/application.rb

@@ -22,7 +22,7 @@ module Dummy
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
 
-    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7')
+    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.7")
       config.load_defaults 7.0
     else
       config.load_defaults 6.0

data/spec/dummy/config/environments/production.rb

@@ -13,7 +13,7 @@ Rails.application.configure do
   config.eager_load = true
 
   # Full error reports are disabled and caching is turned on.
-  config.consider_all_requests_local       = false
+  config.consider_all_requests_local = false
   config.action_controller.perform_caching = true
 
   # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
@@ -45,7 +45,7 @@ Rails.application.configure do
   config.log_level = :info
 
   # Prepend all log lines with the following tags.
-  config.log_tags = [ :request_id ]
+  config.log_tags = [:request_id]
 
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
@@ -65,8 +65,8 @@ Rails.application.configure do
   # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new "app-name")
 
   if ENV["RAILS_LOG_TO_STDOUT"].present?
-    logger           = ActiveSupport::Logger.new(STDOUT)
+    logger = ActiveSupport::Logger.new(STDOUT)
     logger.formatter = config.log_formatter
-    config.logger    = ActiveSupport::TaggedLogging.new(logger)
+    config.logger = ActiveSupport::TaggedLogging.new(logger)
   end
 end

data/spec/dummy/config/environments/test.rb

@@ -19,11 +19,11 @@ Rails.application.configure do
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true
   config.public_file_server.headers = {
-    "Cache-Control" => "public, max-age=#{1.hour.to_i}"
+    "Cache-Control" => "public, max-age=#{1.hour.to_i}",
   }
 
   # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
+  config.consider_all_requests_local = true
   config.action_controller.perform_caching = false
   config.cache_store = :null_store
 

data/spec/dummy/config/initializers/filter_parameter_logging.rb

@@ -4,5 +4,5 @@
 # sensitive information. See the ActiveSupport::ParameterFilter documentation for supported
 # notations and behaviors.
 Rails.application.config.filter_parameters += [
-  :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
+  :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn,
 ]

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
-return unless ENV['TEST_RAILS_CACHE_STORE'] == 'redis_cache_store'
+return unless ENV["TEST_RAILS_CACHE_STORE"] == "redis_cache_store"
 
 describe RailsBrotliCache do
   class Post
@@ -60,7 +60,7 @@ describe RailsBrotliCache do
     context "custom namespace string is not duplicated" do
       let(:options) do
         {
-          namespace: "myapp"
+          namespace: "myapp",
         }
       end
 
@@ -77,7 +77,7 @@ describe RailsBrotliCache do
     context "custom namespace proc" do
       let(:options) do
         {
-          namespace: -> { "myapp" }
+          namespace: -> { "myapp" },
         }
       end
 

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

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 describe RailsBrotliCache do
-
   CACHE_STORE_TYPES = [
     [ActiveSupport::Cache::MemoryStore.new, ActiveSupport::Cache::MemoryStore.new],
     [ActiveSupport::Cache::RedisCacheStore.new, ActiveSupport::Cache::RedisCacheStore.new],
     [ActiveSupport::Cache::MemCacheStore.new, ActiveSupport::Cache::MemCacheStore.new],
-    [ActiveSupport::Cache::FileStore.new('./tmp'), ActiveSupport::Cache::FileStore.new('./tmp')],
-    [ActiveSupport::Cache::NullStore.new, ActiveSupport::Cache::NullStore.new]
+    [ActiveSupport::Cache::FileStore.new("./tmp"), ActiveSupport::Cache::FileStore.new("./tmp")],
+    [ActiveSupport::Cache::NullStore.new, ActiveSupport::Cache::NullStore.new],
   ]
 
   CACHE_STORE_TYPES.each do |cache_store_types|
@@ -17,6 +16,11 @@ describe RailsBrotliCache do
       SecureRandom.hex(2048)
     end
 
+    after do
+      brotli_store.clear
+      standard_cache.clear
+    end
+
     describe "Brotli cache has the same API as #{cache_store_types[0].class}" do
       subject(:brotli_store) do
         RailsBrotliCache::Store.new(cache_store_types[0])
@@ -36,15 +40,15 @@ describe RailsBrotliCache do
 
       it "for #read and #write" do
         int_val = 123
-        expect(brotli_store.write("int_val_key", big_enough_to_compress_value).class).to eq(standard_cache.write("int_val_key", big_enough_to_compress_value).class)
+        expect(brotli_store.write("int_val_key", int_val).class).to eq(standard_cache.write("int_val_key", int_val).class)
         expect(brotli_store.read("int_val_key")).to eq(standard_cache.read("int_val_key"))
 
-        str_val = "str"
-        expect(brotli_store.write("str_val_key", int_val).class).to eq(standard_cache.write("str_val_key", int_val).class)
+        str_val = big_enough_to_compress_value
+        expect(brotli_store.write("str_val_key", str_val).class).to eq(standard_cache.write("str_val_key", str_val).class)
         expect(brotli_store.read("str_val_key")).to eq(standard_cache.read("str_val_key"))
 
         complex_val = OpenStruct.new(a: 1, b: 2)
-        expect(brotli_store.write("complex_val_key", int_val).class).to eq(standard_cache.write("complex_val_key", int_val).class)
+        expect(brotli_store.write("complex_val_key", complex_val).class).to eq(standard_cache.write("complex_val_key", complex_val).class)
         expect(brotli_store.read("complex_val_key")).to eq(standard_cache.read("complex_val_key"))
       end
 
@@ -66,8 +70,8 @@ describe RailsBrotliCache do
 
       it "for #write_multi and #read_multi" do
         values = {
-          "key_1" => "val_1",
-          "key_2" => big_enough_to_compress_value
+          "key_1" => big_enough_to_compress_value,
+          "key_2" => "val_2",
         }
 
         brotli_store.write_multi(values)
@@ -82,15 +86,15 @@ describe RailsBrotliCache do
       it "for #fetch_multi" do
         values = {
           "key_1" => big_enough_to_compress_value,
-          "key_2" => "val_2"
+          "key_2" => "val_2",
         }
 
         brotli_store.fetch_multi("key_1", "key_2") do |key|
-          "val_#{key.split('_').last}"
+          values[key]
         end
 
         standard_cache.fetch_multi("key_1", "key_2") do |key|
-          "val_#{key.split('_').last}"
+          values[key]
         end
 
         expect(brotli_store.read("key_1")).to eq standard_cache.read("key_1")

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
-return unless ENV['TEST_RAILS_CACHE_STORE'] == 'brotli_cache_store'
+return unless ENV["TEST_RAILS_CACHE_STORE"] == "brotli_cache_store"
 
 describe RailsBrotliCache do
   subject(:cache_store) do

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
-return unless ENV['TEST_RAILS_CACHE_STORE'] == 'redis_cache_store'
+return unless ENV["TEST_RAILS_CACHE_STORE"] == "redis_cache_store"
 
 describe RailsBrotliCache do
   let(:options) do
@@ -24,7 +24,7 @@ describe RailsBrotliCache do
   end
 
   let(:json) do
-    File.read('spec/fixtures/sample.json')
+    File.read("spec/fixtures/sample.json")
   end
 
   it "applies more efficient brotli compression" do

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 describe RailsBrotliCache do
   subject(:cache_store) do
@@ -89,7 +89,7 @@ describe RailsBrotliCache do
     it "works" do
       values = {
         "key_1" => big_enough_to_compress_value,
-        "key_2" => 123
+        "key_2" => 123,
       }
 
       cache_store.write_multi(values, expires_in: 5.seconds)
@@ -107,13 +107,46 @@ describe RailsBrotliCache do
     let(:keys) { %w[key_1 key_2] }
     let(:response) do
       {
-        'key_1' => big_enough_to_compress_value + 'key_1',
-        'key_2' => big_enough_to_compress_value + 'key_2'
+        "key_1" => big_enough_to_compress_value + "key_1",
+        "key_2" => big_enough_to_compress_value + "key_2",
       }
     end
 
-    it "works" do
+    it "works for store and reread" do
       expect(subject).to eq response
+
+      expect(cache_store.fetch_multi(*keys) do |key|
+        big_enough_to_compress_value + key
+      end).to eq response
+    end
+
+    context "with a complex object that responds to #cache_key" do
+      subject do
+        cache_store.fetch_multi(*keys) do |key|
+          big_enough_to_compress_value + key.id
+        end
+      end
+
+      let(:keys) do
+        [
+          OpenStruct.new(cache_key: "key_1", id: "12345"),
+          OpenStruct.new(cache_key: "key_2", id: "54321"),
+        ]
+      end
+      let(:response) do
+        {
+          keys[0] => big_enough_to_compress_value + "12345",
+          keys[1] => big_enough_to_compress_value + "54321",
+        }
+      end
+
+      it "works for store and reread" do
+        expect(subject).to eq response
+
+        expect(cache_store.fetch_multi(*keys) do |key|
+          big_enough_to_compress_value + key.id
+        end).to eq response
+      end
     end
   end
 
@@ -225,6 +258,58 @@ describe RailsBrotliCache do
     end
   end
 
+  describe "#delete_multi" do
+    it "removes multiple previously stored cache entries" do
+      cache_store.write("key_1", 1234)
+      cache_store.write("key_2", 5678)
+      cache_store.write("key_3", 9012)
+
+      expect(cache_store.read("key_1")).to eq 1234
+      expect(cache_store.read("key_2")).to eq 5678
+      expect(cache_store.read("key_3")).to eq 9012
+
+      cache_store.delete_multi(["key_1", "key_3"])
+
+      expect(cache_store.read("key_1")).to eq nil
+      expect(cache_store.read("key_2")).to eq 5678
+      expect(cache_store.read("key_3")).to eq nil
+    end
+
+    it "works with complex objects as cache keys" do
+      collection1 = [Post.new(id: 1), Post.new(id: 2)]
+      collection2 = [Post.new(id: 3), Post.new(id: 4)]
+
+      cache_store.write([:views, "controller/action", collection1], "fragment1")
+      cache_store.write([:views, "controller/action", collection2], "fragment2")
+
+      expect(cache_store.read([:views, "controller/action", collection1])).to eq "fragment1"
+      expect(cache_store.read([:views, "controller/action", collection2])).to eq "fragment2"
+
+      cache_store.delete_multi([[:views, "controller/action", collection1]])
+
+      expect(cache_store.read([:views, "controller/action", collection1])).to eq nil
+      expect(cache_store.read([:views, "controller/action", collection2])).to eq "fragment2"
+    end
+
+    it "handles empty array gracefully" do
+      cache_store.write("test-key", 1234)
+      expect(cache_store.read("test-key")).to eq 1234
+
+      cache_store.delete_multi([])
+
+      expect(cache_store.read("test-key")).to eq 1234
+    end
+
+    it "handles non-existent keys gracefully" do
+      cache_store.write("existing-key", 1234)
+      expect(cache_store.read("existing-key")).to eq 1234
+
+      cache_store.delete_multi(["existing-key", "non-existent-key"])
+
+      expect(cache_store.read("existing-key")).to eq nil
+    end
+  end
+
   describe "#clear" do
     it "clears the cache" do
       expect(cache_store.write("test-key", 1234))

data/spec/spec_helper.rb

@@ -1,28 +1,27 @@
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 require "active_support"
 require "active_support/core_ext/hash"
-require 'redis'
+require "redis"
 
-require_relative '../lib/rails-brotli-cache'
+require_relative "../lib/rails-brotli-cache"
 
 $redis = Redis.new
-$test_rails_cache_store = if ENV['TEST_RAILS_CACHE_STORE'] == 'redis_cache_store'
-  ActiveSupport::Cache::RedisCacheStore.new(redis: $redis)
-elsif ENV['TEST_RAILS_CACHE_STORE'] == 'brotli_cache_store'
-  RailsBrotliCache::Store.new(ActiveSupport::Cache::MemoryStore.new)
-elsif ENV['TEST_RAILS_CACHE_STORE'] == 'memcache_cache_store'
-  ActiveSupport::Cache::ActiveSupport::Cache::MemCacheStore.new
-else
-  ActiveSupport::Cache::MemoryStore.new
-end
+$test_rails_cache_store = if ENV["TEST_RAILS_CACHE_STORE"] == "redis_cache_store"
+    ActiveSupport::Cache::RedisCacheStore.new(redis: $redis)
+  elsif ENV["TEST_RAILS_CACHE_STORE"] == "brotli_cache_store"
+    RailsBrotliCache::Store.new(ActiveSupport::Cache::MemoryStore.new)
+  elsif ENV["TEST_RAILS_CACHE_STORE"] == "memcache_cache_store"
+    ActiveSupport::Cache::ActiveSupport::Cache::MemCacheStore.new
+  else
+    ActiveSupport::Cache::MemoryStore.new
+  end
 
-require_relative '../spec/dummy/config/environment'
-ENV['RAILS_ROOT'] ||= "#{File.dirname(__FILE__)}../../../spec/dummy"
+require_relative "../spec/dummy/config/environment"
+ENV["RAILS_ROOT"] ||= "#{File.dirname(__FILE__)}../../../spec/dummy"
 
 RSpec.configure do |config|
   config.before(:each) do
     Rails.cache.clear
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-brotli-cache
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.3
 platform: ruby
 authors:
 - pawurb
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-12 00:00:00.000000000 Z
+date: 2025-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rufo
+  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: " This gem reduces storage needed for Rails cache by using Brotli compression,
   which can produce outputs smaller by ~20% and offers better performance than Gzip. "
 email:
@@ -226,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Drop-in enhancement for Rails cache, offering better performance and compression