sidekiq-middleware 0.1.1 → 0.1.2

data/CHANGES.md

@@ -1,3 +1,8 @@
+0.1.2
+-----------
+
+- Fixed unique jobs server middleware to clear lock only when unique is enabled
+
 0.1.1
 -----------
 

data/lib/sidekiq-middleware/server/unique_jobs.rb

@@ -28,7 +28,8 @@ module Sidekiq
         end
 
         def clear(worker_instance, item, queue)
-          Sidekiq.redis { |conn| conn.del unique_lock_key(worker_instance, item, queue) }
+          enabled = worker_instance.class.get_sidekiq_options['unique']
+          Sidekiq.redis { |conn| conn.del unique_lock_key(worker_instance, item, queue) } if enabled
         end
       end
     end

data/lib/sidekiq-middleware/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Middleware
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/test/test_unique_jobs.rb

@@ -62,10 +62,9 @@ class TestUniqueJobs < MiniTest::Unit::TestCase
 
     class UniqueScheduledWorker
       include Sidekiq::Worker
-      sidekiq_options queue: :unique_scheduled_queue, unique: :all, manual: true
+      sidekiq_options queue: :unique_scheduled_queue, unique: :all
 
       def perform(x)
-        UniqueScheduledWorker.perform_in(60, x)
       end
     end
 
@@ -74,6 +73,24 @@ class TestUniqueJobs < MiniTest::Unit::TestCase
       assert_equal 1, Sidekiq.redis { |c| c.zcard('schedule') }
     end
 
+    it 'allows the job to be re-scheduled after processing' do
+      # Schedule
+      5.times { |t| UniqueScheduledWorker.perform_in((t+1)*60, 'args') }
+      assert_equal 1, Sidekiq.redis { |c| c.zcard('schedule') }
+      
+      # Process
+      msg = Sidekiq.dump_json('class' => UniqueScheduledWorker.to_s, 'queue' => 'unique_scheduled_queue', 'args' => ['args'])
+      actor = MiniTest::Mock.new
+      actor.expect(:processor_done, nil, [@processor])
+      @boss.expect(:async, actor, [])
+      work = UnitOfWork.new('default', msg)
+      @processor.process(work)
+      
+      # Re-schedule
+      5.times { |t| UniqueScheduledWorker.perform_in((t+1)*60, 'args') }
+      assert_equal 2, Sidekiq.redis { |c| c.zcard('schedule') }
+    end
+
     class CustomUniqueWorker
       include Sidekiq::Worker
       sidekiq_options queue: :custom_unique_queue, unique: :all, manual: true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-middleware
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -98,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -293936533653775509
+      hash: -2342858666365224012
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -293936533653775509
+      hash: -2342858666365224012
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24