sidekiq-unique-jobs 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9383c56f2a6657bf08a95665b1e7569e5972a6d4
-  data.tar.gz: f7c28d6590747bbfb1636b4db004efe0d09f2a9c
+  metadata.gz: 8554798396c72d3690d539a5c8fb28fbf25a9333
+  data.tar.gz: ae6a41b82e11b7b8d4526a4a9c4a5cd374d7c36c
 SHA512:
-  metadata.gz: 52589e4651aaf61fdde58b3bc6f0deda32f1970a7854f6977b5b4b846ba62952aedc42854fac1e954d1af78b5ba4e63389637c05fad5a3e19c13c7d26e2a0155
-  data.tar.gz: 099123ebfba9fb16bd3723ae505e78b2133a4f3d8630b471b2bce30af7593cb8c1ffb3a7c2e06b91d0ad14d5e810938b28e225a06ea21789f31a19e217561039
+  metadata.gz: 804380e5c2f608a6b162cfd48c43e36d28e8a50ba860b4eff1aaf6cd51dbb5007652407a7f18abad62ab9d667a1652c140fc9999f6866757bb493cd2b05f254f
+  data.tar.gz: c6bdd3053362b0893d478d4a85956796d792e7cdcf0be4b62a131a07e3abf6ebfea871138270166a8f4d8366fd72e026324192fb031f026132129c0e3041c85a

data/lib/sidekiq_unique_jobs/sidekiq_unique_ext.rb

@@ -0,0 +1,68 @@
+require 'sidekiq/api'
+
+module Sidekiq
+  class Job
+    module UniqueExtension
+      def self.included(base)
+        base.class_eval do
+          alias_method :delete_orig, :delete
+          alias_method :delete, :delete_ext
+        end
+      end
+
+      def delete_ext
+        unlock(payload_hash(item))
+        delete_orig
+      end
+
+      protected
+
+      def payload_hash(item)
+        SidekiqUniqueJobs::PayloadHelper.get_payload(item['class'], item['queue'], item['args'])
+      end
+
+      def unlock(payload_hash)
+        Sidekiq.redis { |conn| conn.del(payload_hash) }
+      end
+    end
+    include UniqueExtension
+  end
+
+  class Queue
+    module UniqueExtension
+      def self.included(base)
+        base.class_eval do
+          alias_method :clear_orig, :clear
+          alias_method :clear, :clear_ext
+        end
+      end
+
+      def clear_ext
+        each(&:delete)
+        clear_orig
+      end
+    end
+
+    include UniqueExtension
+  end
+
+  class JobSet
+    module UniqueExtension
+      def self.included(base)
+        base.class_eval do
+          if base.method_defined?(:clear)
+            alias_method :clear_orig, :clear
+            alias_method :clear, :clear_ext
+          end
+        end
+      end
+
+      def clear_ext
+        each(&:delete_ext)
+        clear_orig
+      end
+    end
+
+    include UniqueExtension
+  end
+end

data/lib/sidekiq_unique_jobs/version.rb

@@ -1,3 +1,3 @@
 module SidekiqUniqueJobs
-  VERSION = '3.0.7'
+  VERSION = '3.0.8'
 end

data/spec/lib/sidekiq_testing_enabled_spec.rb

@@ -4,7 +4,6 @@ require 'sidekiq-unique-jobs'
 require 'sidekiq/scheduled'
 require 'sidekiq_unique_jobs/middleware/server/unique_jobs'
 require 'active_support/testing/time_helpers'
-require 'active_support/core_ext'
 require 'rspec-sidekiq'
 
 describe 'When Sidekiq::Testing is enabled' do
@@ -114,7 +113,7 @@ describe 'When Sidekiq::Testing is enabled' do
         InlineExpirationWorker.perform_async(2)
         expect(TestClass).to have_received(:run).with(1).once
         expect(TestClass).to have_received(:run).with(2).once
-        travel_to(11.minutes.from_now) do
+        travel_to(Time.now + (11 * 60)) do
           InlineExpirationWorker.perform_async(1)
         end
 

data/spec/lib/sidekiq_unique_ext_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper'
+require 'sidekiq/api'
+require 'sidekiq/worker'
+require 'sidekiq_unique_jobs/middleware/server/unique_jobs'
+require 'sidekiq_unique_jobs/middleware/client/unique_jobs'
+require 'sidekiq_unique_jobs/sidekiq_unique_ext'
+
+class JustAWorker
+  include Sidekiq::Worker
+
+  sidekiq_options unique: true, queue: 'testqueue'
+
+  def perform
+  end
+end
+
+describe Sidekiq::Job::UniqueExtension do
+
+  before do
+    Sidekiq.redis = REDIS
+    Sidekiq.redis(&:flushdb)
+  end
+
+  it 'deletes uniqueness lock on delete' do
+    params = { foo: 'bar' }
+    payload_hash = SidekiqUniqueJobs::PayloadHelper.get_payload('JustAWorker', 'testqueue', [params])
+    jid = JustAWorker.perform_async(foo: 'bar')
+    queue = Sidekiq::Queue.new('testqueue')
+    job = queue.find_job(jid)
+    job.delete
+    Sidekiq.redis do |c|
+      expect(c.exists(payload_hash)).to be_falsy
+    end
+  end
+end
+
+describe Sidekiq::Queue::UniqueExtension do
+
+  before do
+    Sidekiq.redis = REDIS
+    Sidekiq.redis(&:flushdb)
+  end
+
+  it 'deletes uniqueness locks on clear' do
+    params = { foo: 'bar' }
+    payload_hash = SidekiqUniqueJobs::PayloadHelper.get_payload('JustAWorker', 'testqueue', [params])
+    JustAWorker.perform_async(foo: 'bar')
+    queue = Sidekiq::Queue.new('testqueue')
+    queue.clear
+    Sidekiq.redis do |c|
+      expect(c.exists(payload_hash)).to be_falsy
+    end
+  end
+end
+
+describe Sidekiq::JobSet::UniqueExtension, sidekiq_ver: 3 do
+
+  before do
+    Sidekiq.redis = REDIS
+    Sidekiq.redis(&:flushdb)
+  end
+
+  it 'deletes uniqueness locks on clear' do
+    params = { foo: 'bar' }
+    payload_hash = SidekiqUniqueJobs::PayloadHelper.get_payload('JustAWorker', 'testqueue', [params])
+    JustAWorker.perform_in(60 * 60 * 3, foo: 'bar')
+    set = Sidekiq::JobSet.new('schedule')
+    set.clear
+    Sidekiq.redis do |c|
+      expect(c.exists(payload_hash)).to be_falsy
+    end
+  end
+end

data/spec/support/sidekiq_meta.rb

@@ -4,6 +4,11 @@ RSpec.configure do |config|
       sidekiq = :fake if sidekiq == true
       Sidekiq::Testing.send("#{sidekiq}!")
     end
+
+    sidekiq_ver = example.metadata[:sidekiq_ver]
+    if sidekiq_ver && Sidekiq::VERSION[0].to_s != sidekiq_ver.to_s
+      skip("Not relevant for version #{sidekiq_ver}")
+    end
   end
 
   config.after(:each) do |example|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -156,6 +156,7 @@ files:
 - lib/sidekiq_unique_jobs/middleware/client/unique_jobs.rb
 - lib/sidekiq_unique_jobs/middleware/server/unique_jobs.rb
 - lib/sidekiq_unique_jobs/payload_helper.rb
+- lib/sidekiq_unique_jobs/sidekiq_unique_ext.rb
 - lib/sidekiq_unique_jobs/testing.rb
 - lib/sidekiq_unique_jobs/version.rb
 - sidekiq-unique-jobs.gemspec
@@ -163,6 +164,7 @@ files:
 - spec/lib/client_spec.rb
 - spec/lib/middleware/server/unique_jobs_spec.rb
 - spec/lib/sidekiq_testing_enabled_spec.rb
+- spec/lib/sidekiq_unique_ext_spec.rb
 - spec/lib/unlock_order_spec.rb
 - spec/spec_helper.rb
 - spec/support/my_worker.rb