rails-brotli-cache 0.3.14 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cceeb82eb8c194ea2b8acd9fbdcf5a55d53fd6dbdf0f4f9aaf20ae2577fcab2c
-  data.tar.gz: 6c2bcade2408e81a303091e782d01239c625c288f63def2a6c40618fedf2bc4d
+  metadata.gz: 01a0f784d05c6228ab9f4305fddda0b0622a3b0a1dfaba079e952c051064a535
+  data.tar.gz: c12edd70df133be76fb09c2fdc179d83257307874d57f4f06fbe101fc639bc4a
 SHA512:
-  metadata.gz: 04bc2568e39f8f398f5cd71fd169570a07ec972d506baf33202738145e48009f6064da385b521671627e058c7fec1115db28b9dd806c0cc123ae0811af9dce5e
-  data.tar.gz: f62f95df44c1acb1ceb734299291a68323a7c093b15f7762651faf43a49f83d5e7d80054444d2d63ff38bb2758fc2909836b15b93b50f54c3e0638b2c5456ec1
+  metadata.gz: 7a7cc8c87363e93b947bc606f1c0811199ff47ac574fd0bf329ef6248e6305661d0f305874c950bc4c02ee86327b2029c6d22ab01be7de81ab1e94af54d111cd
+  data.tar.gz: 842e6e543337486dd313f65491ba9b56ca6fa15fcd8c94ed201d702d767d9ae41c777e240a6fd5791cbaa3d235f293a9d21281a76c8569271b7f1605b29377fe

data/benchmarks/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'rails-brotli-cache'
+gem 'rails-brotli-cache', path: "../"
 gem 'redis'
 gem 'dalli'

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

@@ -6,9 +6,25 @@ require 'brotli'
 module RailsBrotliCache
   class Store < ::ActiveSupport::Cache::Store
     COMPRESS_THRESHOLD = ENV.fetch("BR_CACHE_COMPRESS_THRESHOLD", 1).to_f * 1024.0
-    BR_COMPRESS_QUALITY = ENV.fetch("BR_CACHE_COMPRESS_QUALITY", 5).to_i
+    BR_COMPRESS_QUALITY = ENV.fetch("BR_CACHE_COMPRESS_QUALITY", 6).to_i
     MARK_BR_COMPRESSED = "\x02".b
 
+    class BrotliCompressor
+      def self.deflate(payload)
+        ::Brotli.deflate(payload, quality: BR_COMPRESS_QUALITY)
+      end
+
+      def self.inflate(payload)
+        ::Brotli.inflate(payload)
+      end
+    end
+
+    DEFAULT_OPTIONS = {
+      compress_threshold: COMPRESS_THRESHOLD,
+      compress: true,
+      compressor_class: BrotliCompressor
+    }
+
     attr_reader :core_store
 
     def initialize(core_store, options = {})
@@ -19,11 +35,11 @@ module RailsBrotliCache
         "br-"
       end
 
-      @compressor_class = compressor_class(options, default: BrotliCompressor)
+      @init_options = options.reverse_merge(DEFAULT_OPTIONS)
     end
 
     def fetch(name, options = nil, &block)
-      options ||= {}
+      options = (options || {}).reverse_merge(@init_options)
 
       if !block_given? && options[:force]
         raise ArgumentError, "Missing block: Calling `Cache#fetch` with `force: true` requires a block."
@@ -42,7 +58,7 @@ module RailsBrotliCache
     end
 
     def write(name, value, options = nil)
-      options = (options || {}).reverse_merge(compress: true)
+      options = (options || {}).reverse_merge(@init_options)
       payload = compressed(value, options)
 
       @core_store.write(
@@ -53,6 +69,8 @@ module RailsBrotliCache
     end
 
     def read(name, options = nil)
+      options = (options || {}).reverse_merge(@init_options)
+
       payload = @core_store.read(
         cache_key(name),
         options
@@ -62,7 +80,7 @@ module RailsBrotliCache
     end
 
     def write_multi(hash, options = nil)
-      options ||= {}
+      options = (options || {}).reverse_merge(@init_options)
       new_hash = hash.map do |key, val|
         [
           cache_key(key),
@@ -79,6 +97,7 @@ module RailsBrotliCache
     def read_multi(*names)
       options = names.extract_options!
       names = names.map { |name| cache_key(name) }
+      options = options.reverse_merge(@init_options)
 
       Hash[core_store.read_multi(*names, options).map do |key, val|
         [source_cache_key(key), uncompressed(val, options)]
@@ -88,6 +107,7 @@ module RailsBrotliCache
     def fetch_multi(*names)
       options = names.extract_options!
       names = names.map { |name| cache_key(name) }
+      options = options.reverse_merge(@init_options)
 
       @core_store.fetch_multi(
         *names, options.merge(compress: false)
@@ -125,13 +145,11 @@ module RailsBrotliCache
     private
 
     def compressed(value, options)
-      options ||= {}
-
       return value if value.is_a?(Integer)
       serialized = Marshal.dump(value)
 
-      if serialized.bytesize >= COMPRESS_THRESHOLD && !options.fetch(:compress, true) == false
-        compressor = compressor_class(options, default: @compressor_class)
+      if serialized.bytesize >= options.fetch(:compress_threshold) && !options.fetch(:compress) == false
+        compressor = options.fetch(:compressor_class)
         compressed_payload = compressor.deflate(serialized)
         if compressed_payload.bytesize < serialized.bytesize
           MARK_BR_COMPRESSED + compressed_payload
@@ -144,14 +162,12 @@ module RailsBrotliCache
     end
 
     def uncompressed(payload, options)
-      options ||= {}
-
       return nil unless payload.present?
 
       return payload if payload.is_a?(Integer)
 
       serialized = if payload.start_with?(MARK_BR_COMPRESSED)
-        compressor = compressor_class(options, default: @compressor_class)
+        compressor = options.fetch(:compressor_class)
         compressor.inflate(payload.byteslice(1..-1))
       else
         payload
@@ -160,15 +176,6 @@ module RailsBrotliCache
       Marshal.load(serialized)
     end
 
-    def compressor_class(options, default:)
-      options = options || {}
-      if (klass = options[:compressor_class])
-        klass
-      else
-        default
-      end
-    end
-
     def cache_key(name)
       "#{@prefix}#{name}"
     end
@@ -176,15 +183,5 @@ module RailsBrotliCache
     def source_cache_key(name)
       name.delete_prefix(@prefix.to_s)
     end
-
-    class BrotliCompressor
-      def self.deflate(payload)
-        ::Brotli.deflate(payload, quality: BR_COMPRESS_QUALITY)
-      end
-
-      def self.inflate(payload)
-        ::Brotli.inflate(payload)
-      end
-    end
   end
 end

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

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

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

@@ -4,16 +4,6 @@ require 'spec_helper'
 
 return unless ENV['RAILS_CACHE_STORE'] == 'redis_cache_store'
 
-class DummyCompressor
-  def self.deflate(payload)
-    payload
-  end
-
-  def self.inflate(payload)
-    payload
-  end
-end
-
 describe RailsBrotliCache do
   let(:options) do
     {}
@@ -49,12 +39,6 @@ describe RailsBrotliCache do
     expect($redis.get("gz-test-key").size < $redis.get("br-test-key").size).to eq true
   end
 
-  it "allows specyfing custom compressor class" do
-    Rails.cache.write("gz-test-key", json)
-    cache_store.write("test-key", json, compressor_class: DummyCompressor)
-    expect($redis.get("gz-test-key").size < $redis.get("br-test-key").size).to eq true
-  end
-
   describe "disable_prefix" do
     context "default prefix" do
       it "appends 'br-' prefix" do

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

@@ -4,7 +4,28 @@ require 'spec_helper'
 
 describe RailsBrotliCache do
   subject(:cache_store) do
-    RailsBrotliCache::Store.new(ActiveSupport::Cache::MemoryStore.new)
+    RailsBrotliCache::Store.new(
+      ActiveSupport::Cache::MemoryStore.new,
+      options
+    )
+  end
+
+  let(:big_enough_to_compress_value) do
+    SecureRandom.hex(2048)
+  end
+
+  let(:options) do
+    {}
+  end
+
+  class DummyCompressor
+    def self.deflate(payload)
+      Zlib::Deflate.deflate(payload)
+    end
+
+    def self.inflate(payload)
+      Zlib::Inflate.inflate(payload)
+    end
   end
 
   describe "#fetch" do
@@ -40,12 +61,30 @@ describe RailsBrotliCache do
     end
 
     it "stores value in the configured Rails.cache when options passed" do
-      big_enough_to_compress_value = SecureRandom.hex(2048)
       cache_store.fetch("test-key", expires_in: 5.seconds) { big_enough_to_compress_value }
       expect(cache_store.read("test-key")).to eq big_enough_to_compress_value
     end
   end
 
+  describe "#write_multi and #read_multi" do
+    it "works" do
+      values = {
+        "key_1" => big_enough_to_compress_value,
+        "key_2" => 123
+      }
+
+      cache_store.write_multi(values, expires_in: 5.seconds)
+      expect(cache_store.read_multi("key_1", "key_2")).to eq values
+    end
+  end
+
+  describe "fetch_multi" do
+    it "works" do
+      cache_store.fetch_multi("key_1", "key_2", expires_in: 5.seconds) { big_enough_to_compress_value }
+      expect(cache_store.read("key_1")).to eq big_enough_to_compress_value
+    end
+  end
+
   describe "#increment and #decrement" do
     it "works" do
       cache_store.write("integer-key", 0)
@@ -78,20 +117,60 @@ describe RailsBrotliCache do
   end
 
   describe "#read and #write" do
+    let(:one_kb_value) do
+      SecureRandom.hex(512)
+    end
+
     it "reads values stored in Rails cache with a prefix" do
       expect(cache_store.read("test-key")).to eq nil
-      expect(cache_store.write("test-key", 1234))
-      expect(cache_store.read("test-key")).to eq 1234
+      expect(cache_store.write("test-key", big_enough_to_compress_value))
+      expect(cache_store.read("test-key")).to eq big_enough_to_compress_value
     end
 
-    context "payloads smaller then 1kb" do
-      before do
-        expect(Brotli).not_to receive(:deflate)
+    describe ":compressor_class option" do
+      context "as an init config" do
+        let(:options) do
+          { compressor_class: DummyCompressor }
+        end
+
+        it "calls the custom compressor_class" do
+          expect(DummyCompressor).to receive(:deflate).and_call_original
+          cache_store.write("test-key", one_kb_value)
+          expect(DummyCompressor).to receive(:inflate).and_call_original
+          cache_store.read("test-key")
+        end
+      end
+
+      context "as an method call" do
+        it "calls the custom compressor_class" do
+          expect(DummyCompressor).to receive(:deflate).and_call_original
+          cache_store.write("test-key", one_kb_value, compressor_class: DummyCompressor)
+          expect(DummyCompressor).to receive(:inflate).and_call_original
+          cache_store.read("test-key", compressor_class: DummyCompressor)
+        end
+      end
+    end
+
+    describe ":compress_threshold option" do
+      it "applies compression for larger objects" do
+        expect(Brotli).to receive(:deflate).and_call_original
+        cache_store.write("test-key", one_kb_value)
       end
 
-      it "does not apply compression" do
+      it "does not apply compression for smaller objects" do
+        expect(Brotli).not_to receive(:deflate)
         cache_store.write("test-key", 123)
-        expect(cache_store.read("test-key")).to eq 123
+      end
+
+      context "custom :compress_threshold value" do
+        let(:options) do
+          { compress_threshold: 2.kilobyte }
+        end
+
+        it "does not apply compression for objects smaller then custom threshold" do
+          expect(Brotli).not_to receive(:deflate)
+          cache_store.write("test-key", one_kb_value)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-brotli-cache
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.4.1
 platform: ruby
 authors:
 - pawurb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-31 00:00:00.000000000 Z
+date: 2023-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails