rails-brotli-cache 0.3.7 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80eea251ed8707e59e4f8a9b829c7046dd9343edcd045e4ef83aa840d8fc5fae
-  data.tar.gz: fbe018c38651848f9aba05d3b59e96c802b7afddc36099cc8d5a5a1099fd3975
+  metadata.gz: 4d2d42ab4cc77a7965e7d04b70b07a672b657d9b4b54be4814f8716595254d8e
+  data.tar.gz: f81c51e38be663e108538b138fecc80ed726fa701f00e98b658ec028a49528ba
 SHA512:
-  metadata.gz: c4b1622f27a59b6b46067a5ee1d354a0696029e6ebdd71b8be913c59f021251a9862600b08ed12fb7111c7a9183bc07903227a3dc0f3d9ee1563e60de0546dc8
-  data.tar.gz: 80a043902519762f273c65ce864ed0c9e64397c72a3a750f513e335502b46e7c1876a8d28653147db01b4762ba28be3c8f2dd4657e06671d140959a4aa0f3c09
+  metadata.gz: cd18abde6498cd2fd982deb14eac6150c6cddbad7ec418a24fe5bf8dca78458354b5b5419f572311652369ff0f1c20e9d398c7b340195e48028ef6f3ce39a517
+  data.tar.gz: a5b278df40d8afd4f48e0bf3f1e2c0487b2b3e66e75ecb2c6c937aac483426ea3309081cce6af946e94a88dd984160b5b91ee318129d8b1c92b3a3e41a33d29f

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,39 +65,35 @@ module RailsBrotliCache
         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.inflate(payload.byteslice(1..-1))
-      else
-        payload
-      end
-
-      Marshal.load(serialized)
+      uncompressed(payload)
     end
 
     def write_multi(hash, options = nil)
-      hash.each do |key, val|
-        write(key, val, options)
+      new_hash = hash.map do |key, val|
+        [
+          cache_key(key),
+          compressed(val, options)
+        ]
       end
+
+      @core_store.write_multi(new_hash, options)
     end
 
     def read_multi(*names)
       options = names.extract_options!
+      names = names.map { |name| cache_key(name) }
 
-      Hash[names.map do |name|
-        [name, read(name, options)]
+      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) }
 
-      names.each do |name|
-        fetch(name, options) { yield(name) }
+      @core_store.fetch_multi(*names, options) do |name|
+        compressed(yield(name), options)
       end
     end
 
@@ -141,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])
@@ -154,6 +170,10 @@ module RailsBrotliCache
       "#{@prefix}#{name}"
     end
 
+    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)

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

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

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

@@ -62,43 +62,38 @@ describe RailsBrotliCache do
       end
 
       it "for #write_multi and #read_multi" do
-        if standard_cache.class != ActiveSupport::Cache::NullStore ## NullStore does not support read/write multi
-          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 "val_1"
-          expect(brotli_store.read("key_2")).to eq "val_2"
-          expect(standard_cache.read("key_1")).to eq "val_1"
-          expect(standard_cache.read("key_2")).to eq "val_2"
-
-          expect(brotli_store.read_multi("key_1", "key_2")).to eq(standard_cache.read_multi("key_1", "key_2"))
-        end
+        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
-        if standard_cache.class != ActiveSupport::Cache::NullStore ## NullStore does not support fetch multi
-          values = {
-            "key_1" => "val_1",
-            "key_2" => "val_2"
-          }
+        values = {
+          "key_1" => "val_1",
+          "key_2" => "val_2"
+        }
 
-          brotli_store.fetch_multi("key_1", "key_2") do |key|
-            "val_#{key.split('_').last}"
-          end
+        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
+        standard_cache.fetch_multi("key_1", "key_2") do |key|
+          "val_#{key.split('_').last}"
+        end
 
-          expect(brotli_store.read("key_1")).to eq "val_1"
-          expect(brotli_store.read("key_2")).to eq "val_2"
+        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
+        expect(brotli_store.read_multi("key_1", "key_2")).to eq(standard_cache.read_multi("key_1", "key_2"))
       end
     end
   end

metadata

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