sidekiq-unique-jobs 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f966944556a4eade8e0cd88092db81ce2aaf79f
-  data.tar.gz: 73ceb2cff924bedb9eb7aa20d50b594cabd582c1
+  metadata.gz: 00887f13a1ac00f86bf1eb51c3ba8aaa231907c7
+  data.tar.gz: dfb021d98a405c372f668ac21ed0693e3989fe16
 SHA512:
-  metadata.gz: 0646749915775d78d40a01667f37642a0dcb6f9748cad2700b7e7957f39735631643b76024ef505363a433c1da305c157218a9bea80c6292344cbcebc9078a8a
-  data.tar.gz: 23ce922714c75e7c33caf45983bca4a103b75514cf78e90137c937dfbb894456391009ed3dd1911283a3728f85f86d58b2e4f282e82f675b6c32678a5b3a9522
+  metadata.gz: 4a4a08153027e4a057e8ed629b0a80451188bd29a232f9075dce6a00e5b876f60e332e27fc2623e43fdcffecfd3f305ef3faa524de3b7a0d35061694f050e3bb
+  data.tar.gz: 9103f93d5c224044d2c28e3fb9f58c900cd88b43efb5983c7c83fc8deb9ed4d9129d1213b0da1b2575f8d50242dd6432273c4c7ffe6c7d3f6387ac99af1753b3

data/README.md

@@ -1,4 +1,4 @@
-# SidekiqUniqueJobs [![Build Status](https://travis-ci.org/form26/sidekiq-unique-jobs.png?branch=master)](https://travis-ci.org/form26/sidekiq-unique-jobs) [![Code Climate](https://codeclimate.com/github/form26/sidekiq-unique-jobs.png)](https://codeclimate.com/github/form26/sidekiq-unique-jobs)
+# SidekiqUniqueJobs [![Build Status](https://travis-ci.org/mhenrixon/sidekiq-unique-jobs.png?branch=master)](https://travis-ci.org/mhenrixon/sidekiq-unique-jobs) [![Code Climate](https://codeclimate.com/github/mhenrixon/sidekiq-unique-jobs.png)](https://codeclimate.com/github/mhenrixon/sidekiq-unique-jobs)
 
 The missing unique jobs for sidekiq
 
@@ -25,8 +25,8 @@ sidekiq_options unique: true
 ```
 
 For jobs scheduled in the future it is possible to set for how long the job
-should be unique. The job will be unique for the number of seconds configured
-or until the job has been completed.
+should be unique. The job will be unique for the number of seconds configured (default 30 minutes)
+or until the job has been completed. Thus, the job will be unique for the shorter of the two.  Note that Sidekiq versions before 3.0 will remove job keys after an hour, which means jobs can remain unique for at most an hour.
 
 *If you want the unique job to stick around even after it has been successfully
 processed then just set the unique_unlock_order to anything except `:before_yield` or `:after_yield` (`unique_unlock_order = :never`)

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

@@ -1,13 +1,18 @@
 module SidekiqUniqueJobs
   class PayloadHelper
     def self.get_payload(klass, queue, *args)
-      args = yield_unique_args(klass, *args) if SidekiqUniqueJobs::Config.unique_args_enabled?
-      md5_arguments = {:class => klass, :queue => queue, :args => args}
+      unique_on_all_queues = false
+      if SidekiqUniqueJobs::Config.unique_args_enabled?
+        worker_class = klass.constantize
+        args = yield_unique_args(worker_class, *args)
+        unique_on_all_queues = worker_class.get_sidekiq_options['unique_on_all_queues']
+      end
+      md5_arguments = {:class => klass, :args => args}
+      md5_arguments[:queue] = queue unless unique_on_all_queues
       "#{SidekiqUniqueJobs::Config.unique_prefix}:#{Digest::MD5.hexdigest(Sidekiq.dump_json(md5_arguments))}"
     end
 
-    def self.yield_unique_args(klass, args)
-      worker_class = klass.constantize
+    def self.yield_unique_args(worker_class, args)
       unique_args = worker_class.get_sidekiq_options['unique_args']
       filtered_args = if unique_args
                         case unique_args

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

@@ -1,3 +1,3 @@
 module SidekiqUniqueJobs
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/spec/lib/client_spec.rb

@@ -32,6 +32,16 @@ describe "Client" do
       expect(result).to eq 1
     end
 
+    it 'does push duplicate messages to different queues' do
+      QueueWorker.sidekiq_options :unique => true
+      Sidekiq::Client.push('class' => QueueWorker, 'queue' => 'customqueue',  'args' => [1, 2])
+      Sidekiq::Client.push('class' => QueueWorker, 'queue' => 'customqueue2',  'args' => [1, 2])
+      q1_length = Sidekiq.redis {|c| c.llen("queue:customqueue") }
+      q2_length = Sidekiq.redis {|c| c.llen("queue:customqueue2") }
+      expect(q1_length).to eq 1
+      expect(q2_length).to eq 1
+    end
+
     it 'does not queue duplicates when when calling delay' do
       10.times { PlainClass.delay(unique: true, queue: 'customqueue').run(1) }
       result = Sidekiq.redis {|c| c.llen("queue:customqueue") }
@@ -115,6 +125,20 @@ describe "Client" do
         result = Sidekiq.redis {|c| c.llen("queue:customqueue") }
         expect(result).to eq 1
       end
+
+      describe 'when unique_on_all_queues is set' do
+        before { QueueWorker.sidekiq_options :unique => true, :unique_on_all_queues => true }
+        before { QueueWorker.sidekiq_options :unique => true }
+        it 'does not push duplicate messages on different queues' do
+          Sidekiq::Client.push('class' => QueueWorker, 'queue' => 'customqueue',  'args' => [1, 2])
+          Sidekiq::Client.push('class' => QueueWorker, 'queue' => 'customqueue2',  'args' => [1, 2])
+          q1_length = Sidekiq.redis {|c| c.llen("queue:customqueue") }
+          q2_length = Sidekiq.redis {|c| c.llen("queue:customqueue2") }
+          expect(q1_length).to eq 1
+          expect(q2_length).to eq 0
+        end
+      end
+
     end
 
     # TODO: If anyone know of a better way to check that the expiration for scheduled

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq