rails-brotli-cache 0.3.12 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 473f7e06756e422c9c3644f6eb8fbd97fb3c6929d74d5ede901c037c93df7db1
-  data.tar.gz: 25ce534d47267870cb70eb49ac849f4dc60073944372b3d26fd81a01dd360834
+  metadata.gz: cceeb82eb8c194ea2b8acd9fbdcf5a55d53fd6dbdf0f4f9aaf20ae2577fcab2c
+  data.tar.gz: 6c2bcade2408e81a303091e782d01239c625c288f63def2a6c40618fedf2bc4d
 SHA512:
-  metadata.gz: e13c7a3fb0c0591dbb9dd4ccac8bf97aaf9d51ce1ec1d793fd08c678f6d8ba75b65f45f6612a12bbf8a76fc49d7865f591d466753b0d699f474fd33cc8413ab0
-  data.tar.gz: 4f0d2fc6e0e2e17e3212a53709fc31831bc62394daad757e1060a323dd46031daaa3ac72be67df254cfd4df8dd71751d31c70567eb217e25ec614dadc29792d3
+  metadata.gz: 04bc2568e39f8f398f5cd71fd169570a07ec972d506baf33202738145e48009f6064da385b521671627e058c7fec1115db28b9dd806c0cc123ae0811af9dce5e
+  data.tar.gz: f62f95df44c1acb1ceb734299291a68323a7c093b15f7762651faf43a49f83d5e7d80054444d2d63ff38bb2758fc2909836b15b93b50f54c3e0638b2c5456ec1

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)
@@ -130,7 +130,7 @@ module RailsBrotliCache
       return value if value.is_a?(Integer)
       serialized = Marshal.dump(value)
 
-      if serialized.bytesize >= COMPRESS_THRESHOLD && !options.fetch(:compress) == false
+      if serialized.bytesize >= COMPRESS_THRESHOLD && !options.fetch(:compress, true) == false
         compressor = compressor_class(options, default: @compressor_class)
         compressed_payload = compressor.deflate(serialized)
         if compressed_payload.bytesize < serialized.bytesize

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsBrotliCache
-  VERSION = "0.3.12"
+  VERSION = "0.3.14"
 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
@@ -38,6 +38,12 @@ describe RailsBrotliCache do
         expect(cache_store.read("forced-key")).to eq 2
       end
     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 "#increment and #decrement" do

metadata

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