foobara-cached-command 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c36cb25ec47a00d8754634b857722e8eb4e547fb257fa537876a7886ba93fa3a
-  data.tar.gz: 5443d74e0926fe9d769b8c371d45888d2e47cd0abcbf48a633d17b81481579bc
+  metadata.gz: 28d9ff865e9bcef1916074da6800fc794ccd1be7b476eabb0eae805cd30fd927
+  data.tar.gz: 06c371633bde1bd493a2ba945a0b68665d761a4ce13c281cb1e45532b9ca0ec3
 SHA512:
-  metadata.gz: 8e406d4e36b5758e844eb24432ea4382f7ff993ea8c62e2a58d2cc01a72d7d6478ea3e750b30ce68e6bc03d9bad60b46c44b4ddf71fb297d52b1c4ce8d279f6f
-  data.tar.gz: 30e2d6bdc35f1278bebee5a28a8b687fcd0359ac0724ebb45cf23a95f15e2f95e0071f1fd6e64464a0c66df41d622bc9e1f085f6dc96fc7b75b6d68e76b05d1e
+  metadata.gz: 8a85959c4074b29c67df622245572ffbf1842d4d5439f8bbf92b42be73ab286c595f86c5f0ef878ca3b67b4a06160facd9c6e91274a4f1de084d6e7b91f761b3
+  data.tar.gz: 8ff108e33e8c3b63e519595763e36dda8e82c9d8a3830cdfb63317c8cba04b94febd54762cdf94c42a34169176c18241328a8b8ee19db5712280c50acfd167d5

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.0.2] - 2025-02-19
+
+- Fix bugs with tmp file name
+- Fix bugs when not using an expiry
+- Give a flag to disable caching entirely
+
 ## [0.0.1]
 
 - Release as a gem

data/src/foobara/cached_command.rb

@@ -15,17 +15,22 @@ module Foobara
         unless data
           if File.exist?(file_path)
             data = Util.symbolize_keys(JSON.parse(File.read(file_path)))
-            data[:expires_at] = Time.parse(data[:expires_at])
-            cache[key] = data
+
+            if data.key?(:expires_at)
+              data[:expires_at] = Time.parse(data[:expires_at])
+              cache[key] = data
+            end
           else
             return nil
           end
         end
 
-        if Time.now > data[:expires_at]
-          cache.delete(key)
-          FileUtils.rm_f(file_path)
-          data = nil
+        if data.key?(:expires_at)
+          if Time.now > data[:expires_at]
+            cache.delete(key)
+            FileUtils.rm_f(file_path)
+            data = nil
+          end
         end
 
         data
@@ -40,13 +45,20 @@ module Foobara
           data[:expires_at] = created_at + expiry
         end
 
+        basedir = File.dirname(file_path)
+
+        FileUtils.mkdir_p(basedir)
+
         File.write(file_path, JSON.fast_generate(data))
         cache[key] = data
       end
     end
 
+    # We need to prepend this so that we're overriding the method defined in the class we're mixed into
     module Execute
       def execute
+        return super if foobara_cache_disabled
+
         if foobara_cached_value_present?
           foobara_cached_value
         else
@@ -60,7 +72,8 @@ module Foobara
     include Concern
 
     inherited_overridable_class_attr_accessor :foobara_cache_expiry,
-                                              :foobara_cache_serializer
+                                              :foobara_cache_serializer,
+                                              :foobara_cache_disabled
 
     on_include do
       prepend Execute
@@ -83,7 +96,7 @@ module Foobara
 
     # TODO: support various caching strategies like memcached or redis, not just local files
     def foobara_cache_path
-      "tmp/#{foobara_cache_key}.json"
+      @foobara_cache_path ||= "tmp/cached_command/#{foobara_cache_key}.json".gsub("::", "/")
     end
 
     # TODO: support caching based on certain inputs...
@@ -121,5 +134,9 @@ module Foobara
     def foobara_cache_expiry
       self.class.foobara_cache_expiry
     end
+
+    def foobara_cache_disabled
+      self.class.foobara_cache_disabled
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foobara-cached-command
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Miles Georgi