iknow_cache 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2f251be058a4e00de4f8dc19eef0cfe2fd35423fe954d74648a51e45b11ee4c
-  data.tar.gz: 807534bc5abde0fe64d7d8a6a419d71e21695617b01e58b94d5da5dc90a39746
+  metadata.gz: b80c0ec650d3fd5801512fefc162526b6502da2553e1640a3495defe4f7c5195
+  data.tar.gz: e5aa1520f3ffe851ca6bf37fd71946e44dd9706b1cf38b781c88cdfd11494607
 SHA512:
-  metadata.gz: 98c3d4cbb6e4f2dd6d6d0c145c3be61734e562927dca4be79ce2f91226faba0633da677be77459fd7b3c47d5a015808da8ab318fb3182f481e31a43d2b3681ce
-  data.tar.gz: c89989310153a661059cd79c58f337263ac711f65f8dc38cd259e2bd5ed0fae03421d1b5e3539fc6a3995c6bb6a8a91169530d8ab37d1042e7fc02a1dcd57b70
+  metadata.gz: 50155988a7d4926758e063c06d01e0791e646ce0177ee33652384079fb88e403dc62718cc648f14115b8596f776f619f6e64ea64d2b3a9189a67c764720f083a
+  data.tar.gz: 8e4464752708f4e966822a08b05c68d514fa31b90ecad296748f2fdacb1e735ab379e2a135b0c7a50f338de88ce2e128c408f17046455a4b1fd565cedcc84ec1

data/lib/iknow_cache/version.rb

@@ -1,3 +1,3 @@
 class IknowCache
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/lib/iknow_cache.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_support/version'
+
 class IknowCache
   Config = Struct.new(:logger, :cache)
 
@@ -18,11 +20,11 @@ class IknowCache
   end
 
   def self.configured?
-    ! config.nil?
+    !config.nil?
   end
 
   def self.configure!(&block)
-    raise ArgumentError.new("Already configured!") if configured?
+    raise ArgumentError.new('Already configured!') if configured?
 
     config = Config.new
     ConfigWriter.new(config).instance_eval(&block)
@@ -69,8 +71,8 @@ class IknowCache
       group
     end
 
-    def register_cache(name, cache_options: nil)
-      c = Cache.new(self, name, cache_options)
+    def register_cache(name, static_version: nil, cache_options: nil)
+      c = Cache.new(self, name, static_version, cache_options)
       @caches << c
       c
     end
@@ -193,12 +195,13 @@ class IknowCache
   class Cache
     DEBUG = false
 
-    attr_reader :name, :cache_options, :cache_group
+    attr_reader :name, :static_version, :cache_options, :cache_group
 
-    def initialize(cache_group, name, cache_options)
-      @cache_group   = cache_group
-      @name          = name
-      @cache_options = IknowCache.merge_options(cache_group.default_options, cache_options).try { |x| x.dup.freeze }
+    def initialize(cache_group, name, static_version, cache_options)
+      @cache_group    = cache_group
+      @name           = name
+      @static_version = static_version
+      @cache_options  = IknowCache.merge_options(cache_group.default_options, cache_options).try { |x| x.dup.freeze }
     end
 
     def fetch(key, parent_path: nil, **options, &block)
@@ -232,6 +235,19 @@ class IknowCache
       IknowCache.cache.delete(p, IknowCache.merge_options(cache_options, options))
     end
 
+    def fetch_multi(keys, write_options = nil)
+      results = read_multi(keys)
+
+      missing_keys = keys - results.keys
+      if missing_keys.present?
+        loaded_results = yield(missing_keys)
+        write_multi(loaded_results, write_options)
+        results.merge!(loaded_results)
+      end
+
+      results
+    end
+
     def read_multi(keys)
       return {} if keys.blank?
 
@@ -240,9 +256,7 @@ class IknowCache
 
       IknowCache.logger.debug("Cache Multi-Read: #{key_paths.values.inspect}") if DEBUG
       raw = IknowCache.cache.read_multi(*key_paths.values)
-      vs = raw.each_with_object({}) do |(path, value), h|
-        h[path_keys[path]] = value
-      end
+      vs = raw.transform_keys { |path| path_keys[path] }
       IknowCache.logger.debug("=> #{vs.inspect}") if DEBUG
       vs
     end
@@ -259,6 +273,23 @@ class IknowCache
       end
     end
 
+    if Gem::Version.new(ActiveSupport::VERSION::STRING) >= Gem::Version.new('6.1')
+      def delete_multi(keys, **options)
+        return if keys.blank?
+
+        key_paths = path_multi(keys)
+
+        IknowCache.logger.debug("Cache Delete Multi: #{key_paths}") if DEBUG
+        IknowCache.cache.delete_multi(key_paths.values, IknowCache.merge_options(cache_options, options))
+      end
+    else
+      def delete_multi(keys, **options)
+        keys.each do |key|
+          delete(key, **options)
+        end
+      end
+    end
+
     def key
       cache_group.key
     end
@@ -277,7 +308,9 @@ class IknowCache
     end
 
     def path_string(group_path)
-      "#{group_path}/#{self.name}"
+      path = "#{group_path}/#{self.name}"
+      path = "#{path}/#{self.static_version}" if static_version
+      path
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iknow_cache
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Chris Andreae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2024-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest