gitlab-client-cache 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d350a75806d888f784565799473875ef199104536103de749aaaef8b53f98c78
-  data.tar.gz: 2b71a182d6c912140bbf9838ed9210e080c4dc2ce077957797f7f1609437e500
+  metadata.gz: 2dda76e9f1f1172d8de24dd9bfa27ec091bb26588ea054c17a40f19ae12a3ab2
+  data.tar.gz: fe3fcd64125ecc3f9126b44c77778b94881200350c9fe0cb48cc9a69fb59fbe8
 SHA512:
-  metadata.gz: 26883d8c2693da2bf08e33366eac75772f39bbb2948229c5110ffe4937757088f6f5f6410a1e76db6414b832e93fa8ac3c148e8e69133d5a4ec29cba17533542
-  data.tar.gz: 516973e271b58a4bff32383024dbaa7b72310ffc63be65d09c6b1e49bcc35a0c69abea9b6bc0c7227287298ae9ac02856a8a618f120a8847804cba5304fb837b
+  metadata.gz: 00ab1a36bd9e1c7f0f41b0564fccfebf6a7b586a885d60ad5b764bacad9610a5dab2e79095ae268178b9235778b907790e68b9f1049b8419fceb4043d8999c10
+  data.tar.gz: 41f244bcad85e4bb8f14b84452a5b6128e591a2c21685dce19dbb2e33085ff6ebb6de4134d5dab34d03aadead48106513f1e3980bc93057d3b4a027a824fb1a6

data/lib/gitlab/client/cache/caching.rb

@@ -11,30 +11,39 @@ class Gitlab::Client::Cache::Caching
     @config = config
   end
 
-  def cached(http_path, http_params)
-    path = path_to(http_path, http_params)
+  def cached(*args)
+    path = path_to(args)
 
-    if path.exist? && path_fresh?(path, http_path, http_params)
+    expires_in = determine_expires_in(args)
+
+    if expires_in != :skip_caching && path.exist? && path_fresh?(path, expires_in)
       load(path)
     else
-      dump(path, yield)
+      result = yield
+      dump(path, result) unless expires_in == :skip_caching
+      result
     end
   end
 
   private
 
-  def path_fresh?(path, http_path, http_params)
+  def determine_expires_in(args)
     expires_in = @config.expires_in
 
     if expires_in.is_a?(Array)
       expires_in = \
         expires_in.each do |block|
-          result = block.is_a?(Proc) ? block.call(http_path, http_params) : block
+          result = block.is_a?(Proc) ? block.call(*args) : block
           break result unless result == :default
         end
+      expires_in = nil if expires_in.is_a?(Array)
     end
 
-    return true unless expires_in
+    expires_in
+  end
+
+  def path_fresh?(path, expires_in)
+    return true if expires_in.nil?
 
     path.mtime + expires_in >= Time.now
   end
@@ -51,11 +60,9 @@ class Gitlab::Client::Cache::Caching
     Object.const_get(klass).inflate(content)
   end
 
-  def dump(path, response)
+  def dump(path, content)
     path.dirname.mkpath
-    path.write(deflate(Marshal.dump(response)))
-
-    response
+    path.write(deflate(Marshal.dump(content)))
   end
 
   def deflate(content)
@@ -70,9 +77,8 @@ class Gitlab::Client::Cache::Caching
     end
   end
 
-  def path_to(http_path, http_params)
-    params = clean_params(http_params)
-    plain = JSON.generate([http_path, params])
+  def path_to(args)
+    plain = JSON.generate(args)
     key = Digest::SHA256.hexdigest(plain)
 
     parts = [
@@ -84,14 +90,6 @@ class Gitlab::Client::Cache::Caching
     Pathname.new(parts.join("/"))
   end
 
-  def clean_params(params)
-    params = params.dup
-    params.delete(:logger)
-    params.delete(:log_level)
-
-    params
-  end
-
   def clean_path(path)
     CGI.escape(path)
        .gsub(".", "_")

data/lib/gitlab/client/cache/patch.rb

@@ -2,7 +2,11 @@
 
 module Gitlab::Client::Cache::Patch
   def get(path, params = {})
-    Gitlab::Client::Cache::Caching.new(Gitlab::Client::Cache.config).cached(path, params) { super }
+    params_for_path = params.dup
+    params_for_path.delete(:logger)
+    params_for_path.delete(:log_level)
+
+    Gitlab::Client::Cache::Caching.new(Gitlab::Client::Cache.config).cached(path, params_for_path) { super }
   end
 end
 

data/lib/gitlab/client/cache/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitlabClientCache
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-client-cache
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Peter Leitzen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-15 00:00:00.000000000 Z
+date: 2024-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab