composite_cache_store 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcf1949baebddee06f0ba0ec038fed2c56885f10558cc8fa7a362d96dbd7b112
-  data.tar.gz: 435c6f4599e46a80235d8867d3d2812c61fbd012c425f74cce13cbd07df96dd8
+  metadata.gz: 689876c5fc7b2bd00343817eac73b522a0687482aaaeb1058a471c7fcac275e7
+  data.tar.gz: dba46b9f25d1302377dd0fb64c9765a8c6016545f78fdb57444282e6b4d94cd8
 SHA512:
-  metadata.gz: b75956e16c3e2f1d6f2142f661e59b54e6b5ef3f9efa5c7630e7fd580d8f1e74354df78f0e4eab54c0573d1926ce47b6dae7ccd371cc2a54c1e052a76184b1e2
-  data.tar.gz: 1b756102d631603fead6e33fa37e7e8c2f58a60dc7b428d3c7f5d0e81913a6350b244aedef0386930a1ee37609fdccc034efb816fe29fc33b9ac3f6c8d85af34
+  metadata.gz: a04ad705343eea18cdd44d399cbd2264b11fa7eb91a6be8c0d98960b8937510abd77a780a95c816217bf2752cf7fde885dbf423b04aaee11024280876e19f994
+  data.tar.gz: 72bcee27ef6647b444582c481dfa011fedbb587d540537d193a3f1042965bf16e7cb740ed059f6483b7926afdd99dd2b84fe80715665ea8908dcf2c3efc1ca0f

data/README.md

@@ -1,6 +1,6 @@
 # CompositeCacheStore
 
-### A composite cache store comprised of 2 ActiveSupport::Cache::Store instances
+### A composite cache store comprised of layered ActiveSupport::Cache::Store instances
 
 <!-- Tocer[start]: Auto-generated, don't remove. -->
 
@@ -27,10 +27,10 @@ While these services are robust and performant, they can also be a source of lat
 __A composite (or layered) cache can mitigate these risks__
 by reducing traffic and backpressure on the persistence service.
 
-Consider a composite cache that wraps a remote Redis-backed "outer cache" with a local in-memory "inner cache".
-When both caches are warm, a read hit on the local in-memory cache returns instantly and avoids the overhead of
+Consider a composite cache that wraps a remote Redis-backed "layer 2 cache" with a local in-memory "layer 1 cache".
+When both caches are warm, a read hit on the local in-memory "layer 1 cache" returns instantly and avoids the overhead of
 inter-process communication (IPC) and/or network traffic _(with its attendant data marshaling and socket/wire noise)_
-associated with accessing the remote Redis-backed cache.
+associated with accessing the remote Redis-backed "layer 2 cache".
 
 To summarize: __Reads prioritize the inner cache and fall back to the outer cache.__
 
@@ -79,7 +79,7 @@ def Rails.composite_cache
     ),
 
     # Layer 2 cache (outer)
-    Rails.cache, # use whatever makes sense for your app as the remote inner-cache
+    Rails.cache, # use whatever makes sense for your app
 
     # additional layers are optional
   )

data/lib/composite_cache_store/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class CompositeCacheStore
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/composite_cache_store.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "active_support/cache"
+require "active_support/all"
 require_relative "composite_cache_store/version"
 
 class CompositeCacheStore
@@ -100,40 +100,50 @@ class CompositeCacheStore
   end
 
   def read_multi(...)
+    missed_layers = []
     layers.each do |store|
-      result = store.read_multi(...)
-      return result if result.present?
+      hash = store.read_multi(...)
+      if hash.present?
+        missed_layers.each { |s| s.write_multi(hash) }
+        return hash
+      end
+      missed_layers << store
     end
-    nil
+    {}
   end
 
   def silence!
     layers.each { |store| store.silence! }
   end
 
-  # Only applies expiration options to the outermost cache
-  # Inner caches use their global expiration options
   def write(name, value, options = nil)
-    options ||= {}
     layers.each do |store|
-      if store == layers.last
-        store.write(name, value, options)
-      else
-        store.write(name, value, options.except(:expires_in, :expires_at))
-      end
+      store.write name, value, permitted_options(store, options)
     end
   end
 
-  # Only applies expiration options to the outermost cache
-  # Inner caches use their global expiration options
   def write_multi(hash, options = nil)
-    options ||= {}
     layers.each do |store|
-      if store == layers.last
-        store.write_multi(hash, options)
-      else
-        store.write_multi(hash, options.except(:expires_in, :expires_at))
-      end
+      store.write_multi hash, permitted_options(store, options)
     end
   end
+
+  private
+
+  def permitted_options(store, options = {})
+    return options if options.blank?
+    return options if keep_expiration?(store, options)
+    options.except(:expires_in, :expires_at)
+  end
+
+  def keep_expiration?(store, options = {})
+    return true if store == layers.last
+    return true unless store.options[:expires_in]
+
+    expires_in = options[:expires_in]
+    expires_in ||= Time.current - options[:expires_at] if options[:expires_at]
+    return false unless expires_in
+
+    expires_in < store.options[:expires_in]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_cache_store
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nate Hopkins (hopsoft)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-13 00:00:00.000000000 Z
+date: 2023-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -82,7 +82,7 @@ dependencies:
         version: '0'
 description: |
   Enhanced application performance with faster reads, data redundancy,
-  and reduced backpressure on the inner cache store.
+  and reduced backpressure on the outer cache store.
 email:
 - natehop@gmail.com
 executables: []
@@ -118,5 +118,6 @@ requirements: []
 rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
-summary: A composite cache store comprised of 2 ActiveSupport::Cache::Store instances
+summary: A composite cache store comprised of layered ActiveSupport::Cache::Store
+  instances
 test_files: []