unique_job 0.4.1 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9d6d855680edc62ab346669253c4673b6876f6661641a6b8be4228da95790b6
-  data.tar.gz: a50467a6416a3e8d38982a8cf183aaa93def34e8a0a6f647a43b954a8a6d4860
+  metadata.gz: 3a0a010e61296a6a1fdf584470177a01db0325a899ee6a6cae9e683b6a498b5c
+  data.tar.gz: 077e870580c431a04c1c73797b8cf4fe8364289f3a11c4d15788045f65f069be
 SHA512:
-  metadata.gz: 2a63e1bea71e94f76e050cf68442cb7503259a25995ea66501da6946c82a2a9dcdcd4cd2190d778fa16829c46e34051023cadb695b473d843baae984cf32b7a3
-  data.tar.gz: c7e82bd747e21a6bdbf1b12a479eb35b9f102f3466d8d87ebc7eba8e03951ace19219cb482ea86ed9762fec27c306a579609d7004a41be1bf7e05aca6132bdc6
+  metadata.gz: 9cca947e010dec20bf88146f014caa1021091034ce1709e4e1f60db189da51aefc198a3fb53bde6d1be4206271576fe87ef012f7d6533f9f272ee3755b0585fc
+  data.tar.gz: ce2b3b6191f93fee6dcaaf9ddeac62750d4d3cbb1218a6540fd47367ce74dea0370a05793d61840c645f9e4377f978f091f2a558f8f2fb4434985f449ecb3b74

data/.ruby-version

@@ -1 +1 @@
-2.7.4
+3.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    unique_job (0.4.1)
+    unique_job (0.4.4)
       redis
       sidekiq (> 6.0, < 7.0)
 
@@ -40,4 +40,4 @@ DEPENDENCIES
   unique_job!
 
 BUNDLED WITH
-   2.1.4
+   2.2.22

data/lib/unique_job/client_middleware.rb

@@ -18,7 +18,7 @@ module UniqueJob
         else
           worker = worker_str.new
         end
-        perform_if_unique(worker, job['args'], &block)
+        perform(worker, job, &block)
       end
     end
   end

data/lib/unique_job/job_history.rb

@@ -42,8 +42,15 @@ module UniqueJob
     class << self
       attr_accessor :redis_options
 
+      MX = Mutex.new
+
       def redis
-        @redis ||= Redis.new(redis_options)
+        MX.synchronize do
+          unless @redis
+            @redis = Redis.new(redis_options)
+          end
+        end
+        @redis
       end
     end
 

data/lib/unique_job/server_middleware.rb

@@ -9,7 +9,7 @@ module UniqueJob
     end
 
     def call(worker, msg, queue, &block)
-      perform_if_unique(worker, msg['args'], &block)
+      perform(worker, msg, &block)
     end
   end
 end

data/lib/unique_job/util.rb

@@ -5,16 +5,17 @@ module UniqueJob
   module Util
     include Logging
 
-    def perform_if_unique(worker, args, &block)
+    def perform(worker, job, &block)
       if worker.respond_to?(:unique_key)
-        unique_key = worker.unique_key(*args)
-        logger.debug { "[UniqueJob] Calculate unique key worker=#{worker.class} key=#{unique_key}" }
+        unique_key = worker.unique_key(*job['args'])
+        logger.debug { "[UniqueJob] Unique key calculated worker=#{job['class']} key=#{unique_key}" }
 
-        if check_uniqueness(worker, unique_key)
+        if unique?(worker, unique_key)
+        elsif unique?(worker, unique_key)
           yield
         else
-          logger.debug { "[UniqueJob] Duplicate job skipped worker=#{worker.class} key=#{unique_key}" }
-          perform_callback(worker, :after_skip, args)
+          logger.debug { "[UniqueJob] Duplicate job skipped worker=#{job['class']} key=#{unique_key}" }
+          perform_callback(worker, :after_skip, job['args'])
           nil
         end
       else
@@ -22,7 +23,7 @@ module UniqueJob
       end
     end
 
-    def check_uniqueness(worker, key)
+    def unique?(worker, key)
       if key.nil? || key.to_s.empty?
         logger.warn { "[UniqueJob] Don't check a job with a blank key worker=#{worker.class} key=#{key}" }
         return false
@@ -44,14 +45,6 @@ module UniqueJob
       JobHistory.new(worker.class, self.class, ttl)
     end
 
-    def truncate(text, length: 100)
-      if text.length > length
-        text.slice(0, length)
-      else
-        text
-      end
-    end
-
     def perform_callback(worker, callback_name, args)
       if worker.respond_to?(callback_name)
         parameters = worker.method(callback_name).parameters

data/lib/unique_job/version.rb

@@ -1,3 +1,3 @@
 module UniqueJob
-  VERSION = "0.4.1"
+  VERSION = "0.4.4"
 end

data/lib/unique_job.rb

@@ -1,3 +1,5 @@
+require 'redis'
+
 require "unique_job/client_middleware"
 require "unique_job/job_history"
 require "unique_job/server_middleware"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unique_job
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.4
 platform: ruby
 authors:
 - ts-3156
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-26 00:00:00.000000000 Z
+date: 2022-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -78,7 +78,7 @@ metadata:
   homepage_uri: https://github.com/egotter/unique_job
   source_code_uri: https://github.com/egotter/unique_job
   changelog_uri: https://github.com/egotter/unique_job
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -93,8 +93,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Set a uniqueness to Sidekiq jobs
 test_files: []