resque-uniq 0.0.10 → 0.0.11

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjVjMDYxYzIxZTJkNGI4OTE1MDc1ZjgxMjAzZWQwYzMwNDZkZmJhNQ==
-  data.tar.gz: !binary |-
-    YWJmMzM3MzE3MjRjNGIxOTg5OWRiODFlMTA1ZDlkZTRiNTM4ZDkxYg==
+SHA1:
+  metadata.gz: 40e69c1e3f78c813e847aabd6abd83d13baf8137
+  data.tar.gz: 8dc908ad095b39123a898f778e6e8aeeb0581b35
 SHA512:
-  metadata.gz: !binary |-
-    YWMzOGI4ODE5ZmFjMzFlNzc3NGJkNTU0YjQ4OGI3NzUxYWVlZGRkMGY1OGJj
-    YjRlNTZkMjYzZjQzNjUwODQzOTVjNmM3ODI0MDI3MmUwMTg4Yjg1NzM4NmY0
-    Njk4YjkxMmE1ZGM1NGI2M2UyMzJiZTdlNmJiNWRmNDc0YzQ2YmI=
-  data.tar.gz: !binary |-
-    MDljNjY1NzkyYjQwMWQ0OTQ4YzliNDNjNjU1ZTA2NTdjNTVhYzgwNDZjYzc2
-    NWY2ZThjNzhjZTFkMDA2N2YxMWU3ODE4NjM4ZDRkZDg5OWZlNTVlZDQ5NmZm
-    NzhkMjZhNDU1YmU3NzkyZjE4ZjExZDIzMGI0OGFiM2FlMDYzMDY=
+  metadata.gz: f6c86360697f52039cf02bfe318a22426243365866a368c266a68b96bd8eae7bbea4efb77eeeae0486fcfd06ad038eb38a5251ec68e035409426ec52851d7004
+  data.tar.gz: 3965ee5e0a1dbb2dd55b3f1ea6b4a0ea86f33fea2b395041f487ba939671a8bd350e6b398f1fa5337675db3bf82a0f733b3953685c6171309388511359d457c2

data/lib/resque-uniq/version.rb

@@ -1,3 +1,3 @@
 module ResqueUniq
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/resque/plugins/unique_job.rb

@@ -20,6 +20,29 @@ module Resque
         rlock.sub(/^#{RUN_LOCK_NAME_PREFIX}/, '')
       end
 
+      def payload_class(camel_cased_word)
+        camel_cased_word = camel_cased_word.to_s
+
+        if camel_cased_word.include?('-')
+          camel_cased_word = classify(camel_cased_word)
+        end
+
+        names = camel_cased_word.split('::')
+        names.shift if names.empty? || names.first.empty?
+
+        constant = Object
+        names.each do |name|
+          args = Module.method(:const_get).arity != 1 ? [false] : []
+
+          if constant.const_defined?(name, *args)
+            constant = constant.const_get(name)
+          else
+            constant = constant.const_missing(name)
+          end
+        end
+        constant
+      end
+
       def stale_lock?(lock)
         return false unless get_lock(lock)
 
@@ -29,7 +52,7 @@ module Resque
         Resque.working.map {|w| w.job }.map do |item|
           begin
             payload = item['payload']
-            klass = Resque::Job.constantize(payload['class'])
+            klass = payload_class(payload['class'])
             args = payload['args']
             return false if rlock == klass.run_lock(*args)
           rescue NameError
@@ -104,6 +127,8 @@ module Resque
           s = []
           obj.each { |a| s << obj_to_string(a) }
           s.to_s
+        when Time
+          obj.to_i
         else
           obj.to_s
         end

data/test/unique_job_test.rb

@@ -25,6 +25,15 @@ class UniqueJobTest < Test::Unit::TestCase
 
   class ExtendedAutoExpireLockJob < AutoexpireLockJobBase ; end
 
+  class RepeaterJob
+    extend Resque::Plugins::UniqueJob
+    @queue = :job_test
+
+    def self.perform(param)
+      Resque.enqueue(RepeaterJob, "hello")
+    end
+  end
+
   def setup
     Resque.redis.flushdb
   end
@@ -97,4 +106,34 @@ class UniqueJobTest < Test::Unit::TestCase
     Resque.enqueue(AutoexpireLockJob, 123)
     assert_equal 1, Resque.size(Resque.queue_from_class(AutoexpireLockJob))
   end
+
+  def test_payload_class
+    klass = Job.payload_class("UniqueJobTest::AutoexpireLockJob")
+    assert_equal klass, AutoexpireLockJob
+  end
+
+  def test_not_stale_lock
+    Resque.redis.set(Job.lock("hello"), Time.now.to_i)
+    assert_equal false, Job.stale_lock?(Job.lock("hello"))
+  end
+
+  def test_stale_lock
+    Resque.redis.set(Job.lock("hello"), Time.now.to_i)
+    Resque.redis.set(Job.run_lock("hello"), Time.now.to_i)
+    assert_equal true, Job.stale_lock?(Job.lock("hello"))
+  end
+
+ def test_cant_enqueue_another_job_if_worker_still_working
+    queue = Resque.queue_from_class(RepeaterJob)
+    Resque.enqueue(RepeaterJob, "hello")
+    assert_equal 1, Resque.size(queue)
+
+    worker = Resque::Worker.new(queue)
+    job = worker.reserve
+    worker.register_worker
+    worker.working_on job
+    worker.perform(job)
+
+    assert_equal 0, Resque.size(queue), "Expected queue to be empty"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-uniq
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Trung Duc Tran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -17,8 +17,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -37,17 +37,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A Resque plugin to ensure only one job instance is queued or running at a