sidekiq-unique-jobs 4.0.11 → 4.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1875ae5442c2ad0263c62be412c7401c209a22a6
-  data.tar.gz: 14c2ca8f620ee209916ee8ae9eaecd0f5b910a67
+  metadata.gz: 6ad145a74f603f0fb35ab336670b69de2f4d15f5
+  data.tar.gz: a3f37457af73e6256eb1dbcfa5f6a5ac36c4d0b7
 SHA512:
-  metadata.gz: a704641b059647ce845eab5a27dc717ee0fcdc81a1ca8a6a6778d3eccfc6d74e9e5f0f06588573dd7b95fd9f8042f2bf6d5e7edbcc831099b898db6381c6ea80
-  data.tar.gz: 94e7334e76396fa1e40329571ef4b39b9b9a36d59a09fc69b1d7bf4fd8d9b9bce87f5110abf3bb46d46c79ce452bd78ff7410b761ad8fe2b7a144b7db448618a
+  metadata.gz: ae02108f28fef4e4270b0b37c836191214b18c9e47b34ba5f7a6c0e748f7bf1c9cff5a9f4e9c9fde5deac0163b4e541eb127fe8f05cc2b68ef932e8ae79c3d57
+  data.tar.gz: 1e107f3d113d99d6e9e0c11e8f98718c782bfd7141a6b613eb2b295e1fb64caa205d97aeaf606b245bb9c0bf6cf42791330f22404ef9de9cbffb5bd560acc647

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## v4.0.12
+
+- Allow jobs to be pushed to processing
+- Close #150
+- Close #151
+- Close #146
+- Close #136
+- Close #133
+
 ## v4.0.11
 
 - Always load forwardable - https://github.com/mhenrixon/sidekiq-unique-jobs/issues/152#issuecomment-164199978

data/lib/sidekiq_unique_jobs/testing/sidekiq_overrides.rb

@@ -35,7 +35,7 @@ module Sidekiq
         # if Sidekiq::VERSION >= '4'
         #   Queues.jobs[queue].clear
         # else
-          jobs.clear
+        jobs.clear
         # end
       end
 
@@ -66,4 +66,3 @@ module Sidekiq
     include Overrides
   end
 end
-

data/lib/sidekiq_unique_jobs/unlockable.rb

@@ -18,7 +18,7 @@ module SidekiqUniqueJobs
       end
     end
 
-    def unlock_by_arguments(worker_class, unique_arguments = {})
+    def unlock_by_arguments(_worker_class, _unique_arguments = {})
       Scripts.call(:release_lock, redis_pool, keys: [unique_key], argv: [jid]) do |result|
         after_unlock(result, __method__)
       end

data/lib/sidekiq_unique_jobs/util.rb

@@ -29,7 +29,7 @@ module SidekiqUniqueJobs
       connection { |conn| conn.scan_each(match: prefix(pattern), count: count).to_a }
     end
 
-    def keys_by_keys(pattern, count)
+    def keys_by_keys(pattern, _count)
       connection { |conn| conn.keys(prefix(pattern)).to_a }
     end
 

data/lib/sidekiq_unique_jobs/version.rb

@@ -1,3 +1,3 @@
 module SidekiqUniqueJobs
-  VERSION = '4.0.11'
+  VERSION = '4.0.12'
 end

data/redis/aquire_lock.lua

@@ -1,7 +1,16 @@
-local unique_key     = KEYS[1]
-local stats_key      = KEYS[2]
-local job_id         = ARGV[1]
-local expires        = ARGV[2]
+local unique_key = KEYS[1]
+local job_id     = ARGV[1]
+local expires    = ARGV[2]
+local scheduled  = ARGV[3]
+local stored_jid = redis.pcall('get', unique_key)
+
+if stored_jid then
+  if stored_jid == job_id then
+    return 1
+  else
+    return 0
+  end
+end
 
 if redis.pcall('set', unique_key, job_id, 'nx', 'ex', expires) then
   return 1

data/spec/jobs/my_unique_job.rb

@@ -2,6 +2,6 @@ class MyUniqueJob
   include Sidekiq::Worker
   sidekiq_options queue: :customqueue, retry: true, unique: :until_executed,
                   unique_expiration: 7_200, retry_count: 10
-  def perform(_)
+  def perform(_one, _two)
   end
 end

data/spec/jobs/notify_worker.rb

@@ -0,0 +1,10 @@
+class NotifyWorker
+  include Sidekiq::Worker
+
+  sidekiq_options queue: :notify_worker,
+                  unique: :until_executed
+
+  def perform(id, _blob)
+    puts "NotifyWorker -- #{id}"
+  end
+end

data/spec/lib/sidekiq_unique_jobs/client/middleware_spec.rb

@@ -15,6 +15,30 @@ RSpec.describe SidekiqUniqueJobs::Client::Middleware do
     end
 
     describe 'when a job is already scheduled' do
+
+      it 'processes jobs properly', sidekiq_ver: '>= 4.0.0' do
+        Sidekiq::Testing.disable! do
+          jid = NotifyWorker.perform_in(1, 183, 'xxxx')
+          expect(jid).not_to eq(nil)
+          Sidekiq.redis do |c|
+            expect(c.zcard('schedule')).to eq(1)
+            expect(c.keys).to match_array(%w(schedule uniquejobs:6e47d668ad22db2a3ba0afd331514ce2))
+          end
+          sleep 1
+          Sidekiq::Scheduled::Enq.new.enqueue_jobs
+
+          Sidekiq.redis do |c|
+            wait(10).for { c.llen('queue:notify_worker') }.to eq(1)
+          end
+
+          Sidekiq::Simulator.process_queue(:notify_worker) do
+            Sidekiq.redis do |c|
+              wait(10).for { c.llen('queue:notify_worker') }.to eq(0)
+            end
+          end
+        end
+      end
+
       it 'rejects nested subsequent jobs with the same arguments', sidekiq_ver: '>= 3.5.3' do
         Sidekiq::Testing.disable! do
           expect(SimpleWorker.perform_async 1).not_to eq(nil)
@@ -87,8 +111,7 @@ RSpec.describe SidekiqUniqueJobs::Client::Middleware do
     end
 
     it 'does not push duplicate messages when configured for unique only' do
-      item = { 'class' => MyUniqueJob, 'queue' => 'customqueue', 'args' => [1, 2] }
-      10.times { Sidekiq::Client.push(item) }
+      10.times { MyUniqueJob.perform_async(1, 2) }
       Sidekiq.redis do |c|
         expect(c.llen('queue:customqueue')).to eq(1)
       end

data/spec/lib/sidekiq_unique_jobs/scripts_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe SidekiqUniqueJobs::Scripts do
     end
 
     def lock_for(seconds = 1, jid = JID, key = UNIQUE_KEY)
-      subject.call(:aquire_lock, nil,         keys: [key], argv: [jid, seconds])
+      subject.call(:aquire_lock, nil, keys: [key], argv: [jid, seconds])
     end
 
     def unlock(key = UNIQUE_KEY, jid = JID)
@@ -45,8 +45,8 @@ RSpec.describe SidekiqUniqueJobs::Scripts do
         end
 
         context 'when job is locked' do
-          before  { expect(lock_for).to eq(1) }
-          specify { expect(lock_for).to eq(0) }
+          before  { expect(lock_for(10)).to eq(1) }
+          specify { expect(lock_for(5, 'anotherjid')).to eq(0) }
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 4.0.11
+  version: 4.0.12
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-12 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -242,6 +242,7 @@ files:
 - spec/jobs/main_job.rb
 - spec/jobs/my_job.rb
 - spec/jobs/my_unique_job.rb
+- spec/jobs/notify_worker.rb
 - spec/jobs/plain_class.rb
 - spec/jobs/simple_worker.rb
 - spec/jobs/spawn_simple_worker.rb