unique_job 0.3.1.pre → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10d542ca656951df33aad35ccc2bc6a7084e817440b5350589f29d318200be78
-  data.tar.gz: 1c029a320d84f7dc509a0315c1420e07fac331119ea643b58b391516c0f14804
+  metadata.gz: 01dffe52b964b3fc02be0786f8b7f8ebd8345a02640344a1125a8fc16317ce0c
+  data.tar.gz: 2acd9dcd223fbaac2933f2ddc6c9572d0c259dfb5395b73df83660de12a3e593
 SHA512:
-  metadata.gz: 99507fb879e9708a1488081d7cc5b6115c77f2b38915a3a23e162b2b862ea090d5ffd368ac5fb777629523218529acf5635bc9fa47156b9c5de6e1d4e746393f
-  data.tar.gz: 34d3309e4c134e5e8b03bf931473b84722d9393fc42d581acde96bdf7e268b410a38073ba25b2b8d797e8394df6ca344bee3ed2eb5ed93905cea84a1f9721b4a
+  metadata.gz: f03e34e0838f166986a4890519f38dbc6c80f4df8c0034e8a61179775a7b0013f4ab51bb5f54e1651f06e0997017a21da913fcbf9d3a06a90f8570ebcaf6fcb7
+  data.tar.gz: 492759ef2b1b96def0b35e0b2a315ec46b2e5004ed9882728998f741d6f4a10a3dda047413d570caf7e3e5a5acad75f15da7e5b02b48c33099a793888521bfe9

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.1.pre)
+    unique_job (0.4.2)
       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,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,19 +22,25 @@ 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
 
     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.1.pre"
+  VERSION = "0.4.2"
 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.1.pre
+  version: 0.4.2
 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: