unique_job 0.3.2.pre → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae29717a10f707ecb27c4ee636e28fc13c7b113ac48cf1837f353c5c2cceee39
-  data.tar.gz: 8a0da599c02f6935a80717afa2e9dcf387722fa768b5b5593323b4041e483402
+  metadata.gz: 6d4face3e0849052a2927072c56bf46be03935a30396a753cd77b1e7eaf7f712
+  data.tar.gz: 8ef8a5cfc6300c524ba994c4a3f1376e3b3f3858618a155bf2919131bed3de3c
 SHA512:
-  metadata.gz: 9e173de697ab852500f66d3fe0dc938ae1d0883ab8cf7b0f0d918043af38490936e3d7917da2ce38deac90f4f68131758eb5d6e001691014465536b2acaacab9
-  data.tar.gz: f17a814a35307b00a4ae7b3347bb7c33690e6db4baa678964fa94db7022505fd6cb5f12d25d7f7c8b8ca3a8ff3f4a3278e2eff400a0ec84e6e1781321dc03be9
+  metadata.gz: 144457fd0ad603ed99e494070837c8b2cb30505a0bc0048a48ea9087026de410391a78a0c82a5e3c886777d04e8fa632324a4c4c73690310572108f0fbf4761f
+  data.tar.gz: 9396809dd975fee4a0a7447aa7ba53f1054b07356bda808d6c36344be3e8bf7dc431cb5916d5fdf9df2f7cc668bd464157d583ac2e338df5adcb686254ac3750

data/.rspec

@@ -0,0 +1,2 @@
+-fd
+--require spec_helper

data/Gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 gemspec
 
 gem "rake", "~> 12.0"
-gem "minitest", "~> 5.0"
+gem "rspec"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    unique_job (0.3.2.pre)
+    unique_job (0.4.3)
       redis
       sidekiq (> 6.0, < 7.0)
 
@@ -9,10 +9,23 @@ GEM
   remote: https://rubygems.org/
   specs:
     connection_pool (2.2.3)
-    minitest (5.14.2)
+    diff-lcs (1.4.4)
     rack (2.2.3)
     rake (12.3.3)
     redis (4.2.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
     sidekiq (6.1.2)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
@@ -22,8 +35,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  minitest (~> 5.0)
   rake (~> 12.0)
+  rspec
   unique_job!
 
 BUNDLED WITH

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
 
@@ -60,7 +67,7 @@ module UniqueJob
           super(*args, &blk)
         rescue => e
           elapsed = Time.now - start
-          logger.warn "Rescue all errors in #{self.class}##{method_name} #{e.inspect} elapsed=#{sprintf("%.3f sec", elapsed)}"
+          logger.warn "[UniqueJob] Rescue all errors in #{self.class}##{method_name} #{e.inspect} elapsed=#{sprintf("%.3f sec", elapsed)}"
           logger.debug { e.backtrace.join("\n") }
           nil
         end

data/lib/unique_job/util.rb

@@ -10,10 +10,7 @@ module UniqueJob
         unique_key = worker.unique_key(*args)
         logger.debug { "[UniqueJob] Calculate unique key worker=#{worker.class} key=#{unique_key}" }
 
-        if unique_key.nil? || unique_key.to_s.empty?
-          logger.warn { "[UniqueJob] Don't check a job with a blank key worker=#{worker.class} key=#{unique_key}" }
-          yield
-        elsif check_uniqueness(worker, unique_key.to_s)
+        if check_uniqueness(worker, unique_key)
           yield
         else
           logger.debug { "[UniqueJob] Duplicate job skipped worker=#{worker.class} key=#{unique_key}" }
@@ -25,13 +22,18 @@ module UniqueJob
       end
     end
 
-    def check_uniqueness(worker, unique_key)
+    def check_uniqueness(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
+      end
+
       history = job_history(worker)
 
-      if history.exists?(unique_key)
+      if history.exists?(key)
         false
       else
-        history.add(unique_key)
+        history.add(key)
         true
       end
     end

data/lib/unique_job/version.rb

@@ -1,3 +1,3 @@
 module UniqueJob
-  VERSION = "0.3.2.pre"
+  VERSION = "0.4.3"
 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.3.2.pre
+  version: 0.4.3
 platform: ruby
 authors:
 - ts-3156
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2021-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -52,6 +52,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
@@ -88,9 +89,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: