unique_job 0.1.0 → 0.3.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af33cb02d39f50c4d16316374ee2079b863505321370817e1df1a293d5b6674f
-  data.tar.gz: '02906948d9857c66215b6984ff2966e766bde452eb375f08c71f01739b3dbf25'
+  metadata.gz: 10d542ca656951df33aad35ccc2bc6a7084e817440b5350589f29d318200be78
+  data.tar.gz: 1c029a320d84f7dc509a0315c1420e07fac331119ea643b58b391516c0f14804
 SHA512:
-  metadata.gz: 6e53fde574f9343471ccdbbf72a9a3562e4a8c95950968ea55f1cbb5f774989b8ab5f781dd129f299817d4e45dbfaa9fe4ae42b3aa9b5b86dd4475c4d6d6ab50
-  data.tar.gz: cd1f0aff1da071006a5c9c003882650bfb2d534b0c1bc455469fddfdc3de60b889e404ddb072426f155ea944315bcd88c9e0ecb24009b0e011fdd4c878b30347
+  metadata.gz: 99507fb879e9708a1488081d7cc5b6115c77f2b38915a3a23e162b2b862ea090d5ffd368ac5fb777629523218529acf5635bc9fa47156b9c5de6e1d4e746393f
+  data.tar.gz: 34d3309e4c134e5e8b03bf931473b84722d9393fc42d581acde96bdf7e268b410a38073ba25b2b8d797e8394df6ca344bee3ed2eb5ed93905cea84a1f9721b4a

data/.ruby-version

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    unique_job (0.1.0)
+    unique_job (0.3.1.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/job_history.rb

@@ -1,7 +1,9 @@
+require 'unique_job/logging'
+
 module UniqueJob
   class JobHistory
     def initialize(worker_class, queueing_class, ttl)
-      @key = "#{self.class}:#{queueing_class}:#{worker_class}"
+      @key = "#{self.class}:#{queueing_class.name.split('::')[-1]}:#{worker_class}"
       @ttl = ttl
     end
 
@@ -20,7 +22,7 @@ module UniqueJob
     end
 
     def exists?(val)
-      redis.exists(key(val))
+      redis.exists?(key(val))
     end
 
     def add(val)
@@ -44,18 +46,20 @@ module UniqueJob
     end
 
     module RescueAllRedisErrors
+      include Logging
+
       %i(
         ttl
         exists?
         add
       ).each do |method_name|
         define_method(method_name) do |*args, &blk|
-          start = Time.zone.now
+          start = Time.now
           super(*args, &blk)
         rescue => e
-          elapsed = Time.zone.now - start
-          Rails.logger.warn "Rescue all errors in #{self.class}##{method_name} #{e.inspect} elapsed=#{sprintf("%.3f sec", elapsed)}"
-          Rails.logger.debug { e.backtrace.join("\n") }
+          elapsed = Time.now - start
+          logger.warn "Rescue all errors in #{self.class}##{method_name} #{e.inspect} elapsed=#{sprintf("%.3f sec", elapsed)}"
+          logger.debug { e.backtrace.join("\n") }
           nil
         end
       end

data/lib/unique_job/logging.rb

@@ -0,0 +1,17 @@
+require 'logger'
+
+module UniqueJob
+  module Logging
+    def logger
+      if File.basename($0) == 'rake'
+        Logger.new(STDOUT, level: Logger::WARN)
+      elsif defined?(Sidekiq)
+        Sidekiq.logger
+      elsif defined?(Rails)
+        Rails.logger
+      else
+        Logger.new(STDOUT, level: Logger::WARN)
+      end
+    end
+  end
+end

data/lib/unique_job/util.rb

@@ -1,28 +1,34 @@
+require 'unique_job/logging'
+require 'unique_job/job_history'
+
 module UniqueJob
   module Util
+    include Logging
+
     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 { "#{class_name}##{__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 { "#{class_name}##{__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)
@@ -32,7 +38,7 @@ module UniqueJob
 
     def job_history(worker)
       ttl = worker.respond_to?(:unique_in) ? worker.unique_in : 3600
-      JobHistory.new(worker.class, class_name, ttl)
+      JobHistory.new(worker.class, self.class, ttl)
     end
 
     def truncate(text, length: 100)
@@ -54,26 +60,9 @@ 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
-
-    def class_name
-      self.class.name.demodulize
-    end
-
-    def logger
-      if File.basename($0) == 'rake'
-        Logger.new(STDOUT, level: Logger::WARN)
-      elsif defined?(Sidekiq)
-        Sidekiq.logger
-      elsif defined?(Rails)
-        Rails.logger
-      else
-        Logger.new(STDOUT, level: Logger::WARN)
-      end
-    end
   end
 end

data/lib/unique_job/version.rb

@@ -1,3 +1,3 @@
 module UniqueJob
-  VERSION = "0.1.0"
+  VERSION = "0.3.1.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unique_job
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.1.pre
 platform: ruby
 authors:
 - ts-3156
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-14 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
@@ -64,6 +65,7 @@ files:
 - lib/unique_job.rb
 - lib/unique_job/client_middleware.rb
 - lib/unique_job/job_history.rb
+- lib/unique_job/logging.rb
 - lib/unique_job/server_middleware.rb
 - lib/unique_job/util.rb
 - lib/unique_job/version.rb
@@ -86,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