unique_job 0.2.0 → 0.3.2.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c480f4b0fe78931cf109fbca3db98032cd5bc2e1ad065dc218c56e1ac00361b5
-  data.tar.gz: e67b02dd3bde8bfb46d417e46bac20780f7c05eb67dcd44f93d9fda831ecde15
+  metadata.gz: ae29717a10f707ecb27c4ee636e28fc13c7b113ac48cf1837f353c5c2cceee39
+  data.tar.gz: 8a0da599c02f6935a80717afa2e9dcf387722fa768b5b5593323b4041e483402
 SHA512:
-  metadata.gz: 44785d034535d444ee219a7b0ad0dd064b02b85aee5289f13ba74a1c2d4fded15898ed2b974c4be4fbc5d6644bf4ba4e704a461c2f3f96b8341e93ea9aeb6dbc
-  data.tar.gz: bd9b4b1ef9d56ae58f724d1dc827f3747895154b0f7fd978dfd1739e02fdb547fb1d3ee1d2ea5d667e92b572ad1bc1448e579fcd181b7da53acd1c811ab16f55
+  metadata.gz: 9e173de697ab852500f66d3fe0dc938ae1d0883ab8cf7b0f0d918043af38490936e3d7917da2ce38deac90f4f68131758eb5d6e001691014465536b2acaacab9
+  data.tar.gz: f17a814a35307b00a4ae7b3347bb7c33690e6db4baa678964fa94db7022505fd6cb5f12d25d7f7c8b8ca3a8ff3f4a3278e2eff400a0ec84e6e1781321dc03be9

data/.ruby-version

@@ -0,0 +1 @@
+2.7.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    unique_job (0.2.0)
+    unique_job (0.3.2.pre)
       redis
       sidekiq (> 6.0, < 7.0)
 
@@ -9,17 +9,14 @@ GEM
   remote: https://rubygems.org/
   specs:
     connection_pool (2.2.3)
-    minitest (5.11.3)
-    rack (2.2.2)
-    rack-protection (2.0.8.1)
-      rack
-    rake (12.3.2)
-    redis (4.2.1)
-    sidekiq (6.0.7)
+    minitest (5.14.2)
+    rack (2.2.3)
+    rake (12.3.3)
+    redis (4.2.2)
+    sidekiq (6.1.2)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
-      rack-protection (>= 2.0.0)
-      redis (>= 4.1.0)
+      redis (>= 4.2.0)
 
 PLATFORMS
   ruby

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
 

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

@@ -8,26 +8,27 @@ module UniqueJob
     def perform_if_unique(worker, args, &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}" }
 
         if unique_key.nil? || unique_key.to_s.empty?
-          logger.warn { "#{self.class}##{__method__} Key is blank worker=#{worker.class} args=#{truncate(args.inspect)}" }
+          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)
+        elsif check_uniqueness(worker, unique_key.to_s)
           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)
+    def check_uniqueness(worker, unique_key)
       history = job_history(worker)
 
       if history.exists?(unique_key)
-        logger.info { "#{self.class}##{__method__} Skip duplicate job for #{history.ttl} seconds, remaining #{history.ttl(unique_key)} seconds worker=#{worker.class} args=#{truncate(args.inspect)}" }
-
-        perform_callback(worker, :after_skip, args)
-
         false
       else
         history.add(unique_key)
@@ -37,6 +38,7 @@ module UniqueJob
 
     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
 
@@ -59,8 +61,7 @@ module UniqueJob
             worker.send(callback_name, *args)
           end
         rescue ArgumentError => e
-          message = "The number of parameters of the callback method (#{parameters.size}) is not the same as the number of arguments (#{args.size})"
-          raise ArgumentError.new("#{self.class}:#{worker.class} #{message} callback_name=#{callback_name} args=#{args.inspect} parameters=#{parameters.inspect}")
+          raise ArgumentError.new("[UniqueJob] Invalid parameters callback=#{callback_name}")
         end
       end
     end

data/lib/unique_job/version.rb

@@ -1,3 +1,3 @@
 module UniqueJob
-  VERSION = "0.2.0"
+  VERSION = "0.3.2.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unique_job
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.2.pre
 platform: ruby
 authors:
 - ts-3156
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2021-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -52,6 +52,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -87,12 +88,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Set a uniqueness to Sidekiq jobs