sidekiq_smart_cache 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bfe51b0884c74e8f916b2e07a756b14fa41810dc3c137225bc978ac6a41ab81
-  data.tar.gz: e5c34d6795f47aa5b4ba17e7ca538ada975cdef8406c113a8107b205cd540955
+  metadata.gz: e5e2eaeccb56ff1b361713b28c59b5535ba4dcb03ce09892b78829452733e204
+  data.tar.gz: 7d2223177c94a71ff9d00aa8eb7a37ecb80b6c8c5777c7d5321043220563d730
 SHA512:
-  metadata.gz: b66ae306d585ac20cf6b0e5d47bd634cb1fb36ba4e51b041c33eb3f77471190405cb4a64face8a53b578425e85f9bf85a345fd869f262ce91516941fab17e168
-  data.tar.gz: 2fc77d0ad12e9c317dddb1d6a8358256fb86f74330ed1fde78a71e61fa9914a6dd55ff8406a57770de8b0476615ff0ac7ceba6ddf3dc0f93d999c3007d896249
+  metadata.gz: 5f2d87f31936b45cb6636536117d8b4625efd7f180d41b3b3fb1b8182adca8af567896809ae0991bb29babf63abd9a06f2bb439cc894b2f2c16757181ae0db7a
+  data.tar.gz: 399039ca0b02a6818d291f02295e0e9bf42ebe0cc33aea2fb846094287328c33b75198a15f8ca10a6abfbf49ed586341a5e34f6c4168cffcc5f0ab56c570833a

data/lib/sidekiq_smart_cache/redis.rb

@@ -1,6 +1,6 @@
 module SidekiqSmartCache
   BLOCKING_COMMANDS = %i[ brpop ].freeze
-  COMMANDS = BLOCKING_COMMANDS + %i[ get set lpush expire flushdb del ].freeze
+  COMMANDS = BLOCKING_COMMANDS + %i[get set lpush expire flushdb del ttl].freeze
 
   ERROR_TO_CATCH = if defined?(::RedisClient)
     ::RedisClient::CommandError
@@ -14,7 +14,7 @@ module SidekiqSmartCache
     end
 
     def job_completion_key(key)
-      key + '/done'
+      "#{key}/done"
     end
 
     def send_done_message(key)
@@ -25,31 +25,60 @@ module SidekiqSmartCache
     def wait_for_done_message(key, timeout)
       return true if defined?(Sidekiq::Testing) && Sidekiq::Testing.inline?
 
-      if brpop(job_completion_key(key), timeout: timeout.to_i)
-        # log_msg("got done message for #{key}")
-        send_done_message(key) # put it back for any other readers
-        true
-      end
+      return unless brpop(job_completion_key(key), timeout: timeout.to_i)
+
+      # log_msg("got done message for #{key}")
+      send_done_message(key) # put it back for any other readers
+      true
     end
 
     def log_msg(msg) # WIP all this
       Rails.logger.info("#{Time.now.iso8601(3)} #{Thread.current[:name]} redis #{msg}")
     end
 
-    def method_missing(name, ...)
-      @pool.with do |r|
-        if COMMANDS.include? name
+    # In support of syntax like redis.set('foo', 'bar', nx: true, ex: 60)
+    # the new client wants that called like redis.set('foo', 'bar', 'NX', 'EX', '60')
+    def arrayify_args(args)
+      out = []
+      args.each do |arg|
+        if arg.is_a?(Hash)
+          arg.each do |kw, val|
+            # nx: true becomes 'NX'
+            if val == true
+              out << kw.upcase.to_s
+            elsif val
+              # ex: 60 becomes ['EX', '60']
+              out << kw.upcase.to_s
+              out << val.to_s
+            end
+          end
+        else
+          out << arg
+        end
+      end
+      out.presence
+    end
+
+    # Defining methods like `redis.set('foo', 'bar')`
+    COMMANDS.each do |name|
+      define_method(name) do |*args|
+        @pool.with do |r|
           retryable = true
           begin
             # log_msg("#{name} #{args}")
-            if r.respond_to?(name)
-              # old redis gem implements methods including `brpop` and `flusdb`
-              r.send(name, ...)
+            if defined?(::Redis) && r.is_a?(::Redis)
+              if r.respond_to?(name)
+                # old redis gem implements methods including `brpop` and `flusdb`
+                r.send(name, *args)
+              else
+                r.call(name.to_s.upcase, *args)
+              end
             elsif BLOCKING_COMMANDS.include? name
               # support redis-client semantics
-              make_blocking_call(r, name, ...)
+              make_blocking_call(r, name, *args)
             else
-              r.call(name.to_s.upcase, ...)
+              # Translate keyword args to new style array on RedisClient (even wrapped by Sidekiq)
+              r.send(name, *arrayify_args(args))
             end
             # stolen from sidekiq - Thanks Mike!
             # Quietly consume this one and return nil
@@ -63,8 +92,6 @@ module SidekiqSmartCache
             end
             raise
           end
-        else
-          super
         end
       end
     end

data/lib/sidekiq_smart_cache/result.rb

@@ -18,7 +18,7 @@ class Result
 
   def self.load_from(cache_tag)
     raw = redis.get(cache_tag)
-    new(YAML.safe_load(raw, allowed_classes)) if raw
+    new(YAML.safe_load(raw, permitted_classes: allowed_classes)) if raw
   end
 
   def initialize(result)

data/lib/sidekiq_smart_cache/version.rb

@@ -1,3 +1,3 @@
 module SidekiqSmartCache
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_smart_cache
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Bill Kirtley
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-16 00:00:00.000000000 Z
+date: 2023-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Cache objects in redis, generated with thundering herd prevention via sidekiq.