sidekiq-unique-jobs 2.6.5 → 2.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 668f0e7f7a11db5e1ebf8e1d85943911b18c044e
-  data.tar.gz: 337c9f52503823719953a55a38fcae0f8f17a6d5
+  metadata.gz: 2296d65fb90ede4439f99784f379eb23c75d5a1b
+  data.tar.gz: 688b666f69e6dbd293e5662047dbe10b0429656a
 SHA512:
-  metadata.gz: c0e0c720b227b5eb4b574aaf6064bf27f97e6e79faa253287df3d012bad2248ed098e341379cf9a34f20ba5f744e4f9bdd1dd3dcac79afd995644ce8be185311
-  data.tar.gz: 5a14117bed073f1e222eb44ee86591ce82dcb4660723bca1a138cfc9f45d9e208b47fafc5d454f29ec23d5756933487a83e6471dd6589590b21bb4241d56135f
+  metadata.gz: bea86a75d736637326b092067172db4186dce2689d6811e48227a9e5599c391396df58e17b59f8e34c9de066cae9fafb844195dbe05a4cb23d1f177fbc780458
+  data.tar.gz: 29b4d90da37697c917d644f062a6ac05585f6a8952da775eda22ab9bd939aae6e9f4e26196c7cf7011a0c3d848a594f3935ce25e30c54988e4a07f0ebb5cdb63

data/README.md

@@ -82,6 +82,6 @@ account for this.
 
 ## Contributors
 
-- @sax
-- @eduardosasso
-- @KensoDev
+- https://github.com/sax
+- https://github.com/eduardosasso
+- https://github.com/KensoDev

data/lib/sidekiq-unique-jobs/middleware/client/unique_jobs.rb

@@ -6,8 +6,10 @@ module SidekiqUniqueJobs
       class UniqueJobs
         def call(worker_class, item, queue)
 
-          enabled = worker_class.get_sidekiq_options['unique'] || item['unique']
-          unique_job_expiration = worker_class.get_sidekiq_options['unique_job_expiration']
+          klass = worker_class_constantize(worker_class)
+
+          enabled = klass.get_sidekiq_options['unique'] || item['unique']
+          unique_job_expiration = klass.get_sidekiq_options['unique_job_expiration']
 
           if enabled
 
@@ -19,14 +21,20 @@ module SidekiqUniqueJobs
 
               conn.watch(payload_hash)
 
-              if conn.get(payload_hash)
+              if conn.get(payload_hash).to_i == 1 || 
+                (conn.get(payload_hash).to_i == 2 && item['at'])
+                # if the job is already queued, or is already scheduled and 
+                # we're trying to schedule again, abort 
                 conn.unwatch
               else
+                # if the job was previously scheduled and is now being queued,
+                # or we've never seen it before
                 expires_at = unique_job_expiration || SidekiqUniqueJobs::Config.default_expiration
                 expires_at = ((Time.at(item['at']) - Time.now.utc) + expires_at).to_i if item['at']
 
                 unique = conn.multi do
-                  conn.setex(payload_hash, expires_at, 1)
+                  # set value of 2 for scheduled jobs, 1 for queued jobs.
+                  conn.setex(payload_hash, expires_at, item['at'] ? 2 : 1)
                 end
               end
             end
@@ -36,6 +44,33 @@ module SidekiqUniqueJobs
           end
         end
 
+        protected
+
+        # Attempt to constantize a string worker_class argument, always 
+        # failing back to the original argument.
+        # Duplicates Rails' String.constantize logic for non-Rails cases.
+        def worker_class_constantize(worker_class)
+          if worker_class.is_a?(String)
+            if worker_class.respond_to?(:constantize)
+              worker_class.constantize
+            else
+              # duplicated logic from Rails 3.2.13 ActiveSupport::Inflector
+              # https://github.com/rails/rails/blob/9e0b3fc7cfba43af55377488f991348e2de24515/activesupport/lib/active_support/inflector/methods.rb#L213
+              names = worker_class.split('::')
+              names.shift if names.empty? || names.first.empty?
+              constant = Object
+              names.each do |name|
+                constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+              end
+              constant
+            end
+          else
+            worker_class
+          end
+        rescue
+          worker_class
+        end
+
       end
     end
   end

data/lib/sidekiq-unique-jobs/version.rb

@@ -1,3 +1,3 @@
 module SidekiqUniqueJobs
-  VERSION = "2.6.5"
+  VERSION = "2.6.6"
 end

data/test/lib/sidekiq/test_client.rb

@@ -1,4 +1,5 @@
 require 'helper'
+require 'celluloid'
 require 'sidekiq/worker'
 require "sidekiq-unique-jobs"
 require 'sidekiq/scheduled'
@@ -35,6 +36,22 @@ class TestClient < MiniTest::Unit::TestCase
       assert_equal 1, Sidekiq.redis {|c| c.llen("queue:customqueue") }
     end
 
+    it 'does not schedule duplicates when calling perform_in' do
+      QueueWorker.sidekiq_options :unique => true
+      10.times { QueueWorker.perform_in(60, [1, 2]) }
+      assert_equal 1, Sidekiq.redis { |c| c.zcount("schedule", -1, Time.now.to_f + 2 * 60) }
+    end
+
+    it 'enqueues previously scheduled job' do
+      QueueWorker.sidekiq_options :unique => true
+      QueueWorker.perform_in(60 * 60, 1, 2)
+
+      # time passes and the job is pulled off the schedule:
+      Sidekiq::Client.push('class' => TestClient::QueueWorker, 'queue' => 'customqueue', 'args' => [1, 2])
+
+      assert_equal 1, Sidekiq.redis {|c| c.llen("queue:customqueue") }
+    end
+
     it 'sets an expiration when provided by sidekiq options' do
       one_hour_expiration = 60 * 60
       QueueWorker.sidekiq_options :unique => true, :unique_job_expiration => one_hour_expiration

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 2.6.5
+  version: 2.6.6
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: The unique jobs that were removed from sidekiq