resque-uniq 0.0.5 → 0.0.6

data/Gemfile

@@ -1,5 +1,7 @@
 source :rubygems
 
+gemspec
+
 gem "redis"
 gem "resque"
 gem 'yajl-ruby', :require => 'yajl/json_gem'

data/README.md

@@ -54,6 +54,38 @@ You can tell _resque-uniq_ to auto-expire job locks by setting `@unique_lock_aut
 
 Lock autoexpiration was necessary to protect against stale locks. With the new run lock trick you probably don't need it anymore.
 
+If you want to define a default `unique_lock_autoexpire` in the base class and let other jobs to extend that base class
+you cannot use `@unique_lock_autoexpire` since it's not inherited by subclasses. Define a class method with the same
+name instead
+
+    class BaseJob
+      extend Resque::Plugins::UniqueJob
+
+      def self.queue
+        :default_queue
+      end
+
+      def self.unique_lock_autoexpire
+        600 # TTL = 10 minutes
+      end
+    end
+
+    class SmallJob < BaseJob
+      def self.perform
+        ...
+      end
+    end
+
+    class BiglJob < BaseJob
+      def self.unique_lock_autoexpire
+        3 * 3600  # TTL = 3 hours
+      end
+
+      def self.perform
+        ...
+      end
+    end
+
 ## Credits
 
 There are several similar Resque plugins. We tried them all but for one reason or another they didn't work reliably

data/lib/resque/plugins/unique_job.rb

@@ -46,8 +46,9 @@ module Resque
           Resque.redis.del "#{RUN_LOCK_NAME_PREFIX}#{lock_name}"
         end
         nx = Resque.redis.setnx(lock_name, Time.now.to_i)
-        if defined?(@unique_lock_autoexpire) && @unique_lock_autoexpire > 0
-          Resque.redis.expire(lock_name, @unique_lock_autoexpire)
+        ttl = instance_variable_get(:@unique_lock_autoexpire) || respond_to?(:unique_lock_autoexpire) && unique_lock_autoexpire
+        if ttl && ttl > 0
+          Resque.redis.expire(lock_name, ttl)
         end
         nx
       end
@@ -64,6 +65,10 @@ module Resque
         end
       end
 
+      def after_dequeue_lock(*args)
+        Resque.redis.del(run_lock(*args))
+        Resque.redis.del(lock(*args))
+      end
 
       private
 

data/lib/resque-uniq/version.rb

@@ -1,3 +1,3 @@
 module ResqueUniq
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/unique_job_test.rb

@@ -16,6 +16,15 @@ class UniqueJobTest < Test::Unit::TestCase
     def self.perform(param) ; end
   end
 
+  class AutoexpireLockJobBase
+    extend Resque::Plugins::UniqueJob
+    def self.queue ; :job_test ; end
+    def self.unique_lock_autoexpire ; 1 ; end
+    def self.perform(param) ; end
+  end
+
+  class ExtendedAutoExpireLockJob < AutoexpireLockJobBase ; end
+
   def setup
     Resque.remove_queue(Resque.queue_from_class(Job))
     Resque.redis.keys('*:UniqueJobTest::*').each {|k| Resque.redis.del(k) }
@@ -45,6 +54,30 @@ class UniqueJobTest < Test::Unit::TestCase
     assert_equal 1, Resque.size(queue)
   end
 
+  def test_lock_is_removed_after_dequeue
+    queue = Resque.queue_from_class(Job)
+    Resque.enqueue(Job, "hello")
+    assert_equal 1, Resque.size(queue)
+
+    Resque.dequeue(Job, "hello")
+    assert_equal 0, Resque.size(queue)
+    assert_equal nil, Resque.redis.get(Job.lock("hello"))
+    assert_equal nil, Resque.redis.get(Job.run_lock("hello"))
+
+    Resque.enqueue(Job, "hello")
+    assert_equal 1, Resque.size(queue)
+  end
+
+  # XXX Resque doesn't call any job hooks in Resque#remove_queue. We don't get a chance to clean up the locks
+  # def test_lock_is_removed_after_remove_queue
+  #   queue = Resque.queue_from_class(Job)
+  #   Resque.enqueue(Job, "hello")
+  #   assert_equal 1, Resque.size(queue)
+
+  #   Resque.remove_queue(queue)
+  #   assert_equal nil, Resque.redis.get(Job.lock("hello"))
+  #   assert_equal nil, Resque.redis.get(Job.run_lock("hello"))
+  # end
 
   def test_autoexpire_lock
     Resque.enqueue(AutoexpireLockJob, 123)
@@ -53,4 +86,11 @@ class UniqueJobTest < Test::Unit::TestCase
     assert_equal 2, Resque.size(Resque.queue_from_class(AutoexpireLockJob))
   end
 
+  def test_extended_autoexpire_lock
+    Resque.enqueue(ExtendedAutoExpireLockJob, 123)
+    sleep 2
+    Resque.enqueue(ExtendedAutoExpireLockJob, 123)
+    assert_equal 2, Resque.size(Resque.queue_from_class(ExtendedAutoExpireLockJob))
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-uniq
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-01 00:00:00.000000000 Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -43,13 +43,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 563217245005310137
+      hash: -1891980449315157063
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1891980449315157063
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24