rails-brotli-cache 0.3.6 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d61874a96a2402ac69abd17762f98531de0a5b2c2749447f3c34d03dc76b57b
-  data.tar.gz: dff930d1caf6e592d207db48ffb175ebcd06bc59d228a9b5a78e3185672ee72d
+  metadata.gz: 3bb8214df1fb2d155f5ae121938b65e447206dba8480066ce6fe0ae3224a18f5
+  data.tar.gz: 9831643f175b1e5b7d8904ca696302640bd7fc5f3216f93575795ee4192d1fd1
 SHA512:
-  metadata.gz: f3d3cda105423ff917c8b7bd1785cbad9c4577fe773d9573995f1341a6fb3093538e67febe45e6c4449c80398c5edfc95770c7b968fae78524f55bdefa92bd92
-  data.tar.gz: b705720c468a0c85e2b7cf3ff72a2c320ab0beefa3d0889c862b716d1d8d26146e5f2afe9f08bb2101e0ddc07e313cf06a85095f6b778ab8d11ef3f4977a4783
+  metadata.gz: 0c8297ac281da41e9923721bc24984aa5f795eede3748ee93aa4a47c2d614dfbfe5641255217b010d126852723c69858f27b58f985125fd1b024472641ac46ff
+  data.tar.gz: 7ad44d4c2c4f1a9411d13fa44d11cbea56b262328e1a62b72f6b14ad8d397f6a53cc09542d5b918d80b504bcd4df6f27c08cec8ae4467a26ab494f1644ab1159

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

@@ -49,20 +49,8 @@ module RailsBrotliCache
         )
       end
 
-      serialized = Marshal.dump(value)
       options = (options || {}).reverse_merge(compress: true)
-
-      payload = if serialized.bytesize >= COMPRESS_THRESHOLD && !options.fetch(:compress) == false
-        compressor = compressor_class(options, default: @compressor_class)
-        compressed_payload = compressor.deflate(serialized)
-        if compressed_payload.bytesize < serialized.bytesize
-          MARK_BR_COMPRESSED + compressed_payload
-        else
-          serialized
-        end
-      else
-        serialized
-      end
+      payload = compressed(value, options)
 
       @core_store.write(
         cache_key(name),
@@ -77,21 +65,39 @@ module RailsBrotliCache
         options
       )
 
-      return nil unless payload.present?
-
-      return payload if payload.is_a?(Integer)
+      uncompressed(payload)
+    end
 
-      serialized = if payload.start_with?(MARK_BR_COMPRESSED)
-        compressor = compressor_class(options, default: @compressor_class)
-        compressor.inflate(payload.byteslice(1..-1))
-      else
-        payload
+    def write_multi(hash, options = nil)
+      new_hash = hash.map do |key, val|
+        [
+          cache_key(key),
+          compressed(val, options)
+        ]
       end
 
-      Marshal.load(serialized)
+      @core_store.write_multi(new_hash, options)
     end
 
-     def exist?(name, options = nil)
+    def read_multi(*names)
+      options = names.extract_options!
+      names = names.map { |name| cache_key(name) }
+
+      Hash[core_store.read_multi(*names, options).map do |key, val|
+        [source_cache_key(key), uncompressed(val)]
+      end]
+    end
+
+    def fetch_multi(*names)
+      options = names.extract_options!
+      names = names.map { |name| cache_key(name) }
+
+      @core_store.fetch_multi(*names, options) do |name|
+        compressed(yield(name), options)
+      end
+    end
+
+    def exist?(name, options = nil)
       @core_store.exist?(cache_key(name), options)
     end
 
@@ -119,6 +125,38 @@ module RailsBrotliCache
 
     private
 
+    def compressed(value, options)
+      options ||= {}
+      serialized = Marshal.dump(value)
+
+      if serialized.bytesize >= COMPRESS_THRESHOLD && !options.fetch(:compress) == false
+        compressor = compressor_class(options, default: @compressor_class)
+        compressed_payload = compressor.deflate(serialized)
+        if compressed_payload.bytesize < serialized.bytesize
+          MARK_BR_COMPRESSED + compressed_payload
+        else
+          serialized
+        end
+      else
+        serialized
+      end
+    end
+
+    def uncompressed(payload)
+      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.inflate(payload.byteslice(1..-1))
+      else
+        payload
+      end
+
+      Marshal.load(serialized)
+    end
+
     def compressor_class(options, default:)
       options = options || {}
       if (klass = options[:compressor_class])
@@ -132,6 +170,10 @@ module RailsBrotliCache
       "#{@prefix}#{name}"
     end
 
+    def source_cache_key(name)
+      name.remove(@prefix)
+    end
+
     class BrotliCompressor
       def self.deflate(payload)
         ::Brotli.deflate(payload, quality: BR_COMPRESS_QUALITY)

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

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

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

@@ -60,6 +60,41 @@ describe RailsBrotliCache do
         expect(brotli_store.fetch("val_key", force: true) { val }).to eq(standard_cache.fetch("val_key", force: true) { val })
         expect(brotli_store.fetch("val_key")).to eq(standard_cache.fetch("val_key"))
       end
+
+      it "for #write_multi and #read_multi" do
+          values = {
+            "key_1" => "val_1",
+            "key_2" => "val_2"
+          }
+
+          brotli_store.write_multi(values)
+          standard_cache.write_multi(values)
+
+          expect(brotli_store.read("key_1")).to eq standard_cache.read("key_1")
+          expect(brotli_store.read("key_2")).to eq standard_cache.read("key_2")
+
+          expect(brotli_store.read_multi("key_1", "key_2")).to eq(standard_cache.read_multi("key_1", "key_2"))
+      end
+
+      it "for #fetch_multi" do
+          values = {
+            "key_1" => "val_1",
+            "key_2" => "val_2"
+          }
+
+          brotli_store.fetch_multi("key_1", "key_2") do |key|
+            "val_#{key.split('_').last}"
+          end
+
+          standard_cache.fetch_multi("key_1", "key_2") do |key|
+            "val_#{key.split('_').last}"
+          end
+
+          expect(brotli_store.read("key_1")).to eq standard_cache.read("key_1")
+          expect(brotli_store.read("key_2")).to eq standard_cache.read("key_2")
+
+          expect(brotli_store.read_multi("key_1", "key_2")).to eq(standard_cache.read_multi("key_1", "key_2"))
+      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.6
+  version: 0.3.8
 platform: ruby
 authors:
 - pawurb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2023-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails