unique_job 0.3.0.pre → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b63e8007f726ff6fa7024e33e896356a0f0a8165b811ef8df75fa890275e498
-  data.tar.gz: 763c15b9b7b7f68c98977c9c12fb91ab000fa3b884de9992de6a37d34a28c390
+  metadata.gz: e9d6d855680edc62ab346669253c4673b6876f6661641a6b8be4228da95790b6
+  data.tar.gz: a50467a6416a3e8d38982a8cf183aaa93def34e8a0a6f647a43b954a8a6d4860
 SHA512:
-  metadata.gz: f1e5231116d67db01e395a3788b54d9a94cf94dd0ea691fe6feff2a5e7f7a79008b9b011badce76074dd03bd1c4857a633b6cc1975644a313b5d0c633f5ba6e7
-  data.tar.gz: dcc61ef6f05b02d7bb8a285e429ff7499332341ba2ba10a7a6f6609e8505dbf065f227aa08eec3460b9c981f7cc5ae2c5977ba9aeecf9355ec21c85904d675af
+  metadata.gz: 2a63e1bea71e94f76e050cf68442cb7503259a25995ea66501da6946c82a2a9dcdcd4cd2190d778fa16829c46e34051023cadb695b473d843baae984cf32b7a3
+  data.tar.gz: c7e82bd747e21a6bdbf1b12a479eb35b9f102f3466d8d87ebc7eba8e03951ace19219cb482ea86ed9762fec27c306a579609d7004a41be1bf7e05aca6132bdc6

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.0.pre)
+    unique_job (0.4.1)
       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/client_middleware.rb

@@ -4,6 +4,10 @@ module UniqueJob
   class ClientMiddleware
     include Util
 
+    def initialize(redis_options)
+      @redis_options = redis_options
+    end
+
     def call(worker_str, job, queue, redis_pool, &block)
       if job.has_key?('at')
         # perform_in or perform_at

data/lib/unique_job/job_history.rb

@@ -40,8 +40,10 @@ module UniqueJob
     end
 
     class << self
+      attr_accessor :redis_options
+
       def redis
-        @redis ||= Redis.client(ENV['REDIS_HOST'])
+        @redis ||= Redis.new(redis_options)
       end
     end
 
@@ -58,7 +60,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/server_middleware.rb

@@ -4,6 +4,10 @@ module UniqueJob
   class ServerMiddleware
     include Util
 
+    def initialize(redis_options)
+      @redis_options = redis_options
+    end
+
     def call(worker, msg, queue, &block)
       perform_if_unique(worker, msg['args'], &block)
     end

data/lib/unique_job/util.rb

@@ -10,34 +10,37 @@ 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 perform_unique_check(worker, args, unique_key.to_s)
+        if check_uniqueness(worker, unique_key)
           yield
+        else
+          logger.debug { "[UniqueJob] Duplicate job skipped worker=#{worker.class} key=#{unique_key}" }
+          perform_callback(worker, :after_skip, args)
+          nil
         end
       else
         yield
       end
     end
 
-    def perform_unique_check(worker, args, unique_key)
-      history = job_history(worker)
-
-      if history.exists?(unique_key)
-        logger.info { "[UniqueJob] Skip duplicate job worker=#{worker.class} key=#{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
 
-        perform_callback(worker, :after_skip, args)
+      history = job_history(worker)
 
+      if history.exists?(key)
         false
       else
-        history.add(unique_key)
+        history.add(key)
         true
       end
     end
 
     def job_history(worker)
       ttl = worker.respond_to?(:unique_in) ? worker.unique_in : 3600
+      JobHistory.redis_options = @redis_options
       JobHistory.new(worker.class, self.class, ttl)
     end
 

data/lib/unique_job/version.rb

@@ -1,3 +1,3 @@
 module UniqueJob
-  VERSION = "0.3.0.pre"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unique_job
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre
+  version: 0.4.1
 platform: ruby
 authors:
 - ts-3156
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2021-11-26 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: