rails-brotli-cache 0.3.11 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2870c72930bbed4f3ccdc807cf5f62e692bc56456a1c456c123fc4d3b14b537c
-  data.tar.gz: c12a04062bdae8ca70535ca15aad9a77953dff01618d544f9bd28408e222cfde
+  metadata.gz: b682e9036d04afd87ca6369b612d524f65cf698ad53f23f06828d7e74690cd3a
+  data.tar.gz: 55a11863fc1e5027be392685beb2cdcb39ed12ea3b66f2761dc4ecfacea49eaa
 SHA512:
-  metadata.gz: 5683b7363fc845e04739e077315fc0d0e363d8dda8fc6dcc9d3f44eb2d0ec5e8a4dc4d45ef8e6d1354f7ba669c9befae4cd30dda3f1da553eec1ed73d4e41076
-  data.tar.gz: 636786c88da156a5938cb8a637deebb916c354b0e0171ae0389085dae69dce5dbe10a627468432f217aaa3aba74fbdc03f957284607ab658713f2c6bbfa320fe
+  metadata.gz: bfc5e4b2224c5525c91ec7061263dac04cb6f4d0b045000977cd9c1ca90bcf2e07579e08083c4fc3621760b4cc887645c4408d0695da6a98dc54a170a6200f0d
+  data.tar.gz: 2fc5a1e3773b7d310e4b34b46f9209169dab055f02a8cbd7403ad8db467c399a517c7ca66d3a69e0feb89109a0596c8c1a9cd91f24ac533b05890921f6d7bfba

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

@@ -23,22 +23,22 @@ module RailsBrotliCache
     end
 
     def fetch(name, options = nil, &block)
-      value = read(name, options)
-
-      if value.present? && !options&.fetch(:force, false) == true
-        return value
-      end
-
-      if block_given?
-        value = block.call
-        write(name, value, options)
+      options ||= {}
 
-        value
-      elsif options && options[:force]
+      if !block_given? && options[:force]
         raise ArgumentError, "Missing block: Calling `Cache#fetch` with `force: true` requires a block."
-      else
-        read(name, options)
       end
+
+      uncompressed(
+        @core_store.fetch(cache_key(name), options.merge(compress: false)) do
+          if block_given?
+            compressed(block.call, options)
+          else
+            nil
+          end
+        end,
+        options
+      )
     end
 
     def write(name, value, options = nil)
@@ -62,6 +62,7 @@ module RailsBrotliCache
     end
 
     def write_multi(hash, options = nil)
+      options ||= {}
       new_hash = hash.map do |key, val|
         [
           cache_key(key),
@@ -69,7 +70,10 @@ module RailsBrotliCache
         ]
       end
 
-      @core_store.write_multi(new_hash, options)
+      @core_store.write_multi(
+        new_hash,
+        options.merge(compress: false)
+      )
     end
 
     def read_multi(*names)
@@ -85,7 +89,9 @@ module RailsBrotliCache
       options = names.extract_options!
       names = names.map { |name| cache_key(name) }
 
-      @core_store.fetch_multi(*names, options) do |name|
+      @core_store.fetch_multi(
+        *names, options.merge(compress: false)
+      ) do |name|
         compressed(yield(name), options)
       end
     end

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

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

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

@@ -19,9 +19,9 @@ describe RailsBrotliCache do
 
     it "executes block only once" do
       counter = 0
-      cache_store.fetch("forced-key") { counter += 1 }
-      cache_store.fetch("forced-key") { counter += 1 }
-      expect(cache_store.read("forced-key")).to eq 1
+      cache_store.fetch("test-key") { counter += 1 }
+      cache_store.fetch("test-key") { counter += 1 }
+      expect(cache_store.read("test-key")).to eq 1
     end
 
     context "{ force: true }" do

metadata

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