rails-brotli-cache 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e109b9b356474fb8085b1cceaa892695de997465db4c90872556f76419da8f86
-  data.tar.gz: c8422310e9fed160052637a40dc7b1150b938c0f891b3b7b011eacdd11b8e4bb
+  metadata.gz: 6267cfdccacd5e402e500f1df681e16e8d0be371718e499d0abde30c64822dbd
+  data.tar.gz: 4648a2053526200a231c8cd36632715700a6ee197f672431ed2de1c150e036eb
 SHA512:
-  metadata.gz: 6b435443fbf3a6a09baed87b124429e43dcd4d3fbd06cab175a15818b397285aeab96ad0694dc8a2f0e0d91c3478400ba0e3081045e93ca63e275e62626f0e0d
-  data.tar.gz: 95af20d56721fbe1e9118b29a0fa1f7dc3fe5825d8c7ee04d77b783b96b405d6b1e765f4d8b63e8668d9414ca1e716cc010e3201d7a93340d35251ebd966f9e8
+  metadata.gz: 3dfdbc83794444e9be00962b4b5f6470f5c8803340cabbe3535f7143c87cc3bb21af6340d226e8b4b647cf6fd02a1318376daf98f4c50baa4707c70bcacca463
+  data.tar.gz: a8baf1bb1409642f3ea7e6251970a9fb8fbf1b3bbf6dade72a77f288d24de3f58fa2d00b36f24b4c82908a8f6e510564f9265b106297dcc1ddd7500b9c4f7306

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

@@ -109,16 +109,21 @@ module RailsBrotliCache
 
     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 = {})

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

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

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

@@ -17,6 +17,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 +41,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 +71,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)
@@ -86,11 +91,11 @@ describe RailsBrotliCache do
         }
 
         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/store_spec.rb

@@ -112,8 +112,41 @@ describe RailsBrotliCache do
       }
     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
 

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.2
 platform: ruby
 authors:
 - pawurb
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-12 00:00:00.000000000 Z
+date: 2023-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport