resque-uniqueue 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/resque/uniqueue.rb

@@ -16,26 +16,32 @@ module Resque
       redis.del("queue:#{queue}:uniqueue")
     end
 
-    def push_unique(queue, item)
+    def push_unique(queue, item, time = Time.now.utc.to_i)
       confirm_unique_queue_validity(queue)
       watch_queue(queue)
       queue = "queue:#{queue}"
-      redis.evalsha push_unique_eval_sha, [queue], [encode(item)]
+      redis.evalsha push_unique_eval_sha, [queue], [encode(item), time]
     end
 
     def pop_unique(queue)
       confirm_unique_queue_validity(queue)
       queue = "queue:#{queue}"
-      decode redis.evalsha pop_unique_eval_sha, [queue]
+      results = redis.evalsha pop_unique_eval_sha, [queue]
+      return nil unless results[0]
+      job = decode results[0]
+      job['start_at'] = results[1].to_i
+      return job
     end
 
     def push_unique_eval_sha
       @push_unique_eval_sha ||= load_script <<-LUA
-        local list_name = KEYS[1]
-        local set_name = list_name..':uniqueue'
-        local in_set = redis.call('sadd', set_name , ARGV[1])
+        local queue_name = KEYS[1]
+        local uniqueue_name = queue_name..':uniqueue'
+        local start_at_name = queue_name..':start_at'
+        local in_set = redis.call('sadd', uniqueue_name , ARGV[1])
         if in_set == 1 then
-          return redis.call('rpush', list_name, ARGV[1])
+          redis.call('rpush', start_at_name, ARGV[2])
+          return redis.call('rpush', queue_name, ARGV[1])
         end
         return false
       LUA
@@ -43,21 +49,31 @@ module Resque
 
     def pop_unique_eval_sha
       @pop_unique_eval_sha  ||= load_script <<-LUA
-        local list_name = KEYS[1]
-        local set_name = list_name..':uniqueue'
-        local job = redis.call('lpop', list_name)
-        redis.call('srem', set_name, job)
-        return job
+        local queue_name = KEYS[1]
+        local uniqueue_name = queue_name..':uniqueue'
+        local start_at_name = queue_name..':start_at'
+        local results = {}
+        results[1] = redis.call('lpop', queue_name)
+        results[2] = redis.call('lpop', start_at_name)
+        redis.call('srem', uniqueue_name, results[1])
+        return results
       LUA
     end
 
     def queue_and_set_length_equal_eval_sha
       @queue_and_set_length_equal_eval_sha ||= load_script <<-LUA
-        local list_name = KEYS[1]
-        local set_name = list_name..':uniqueue'
-        local list_size = redis.call('llen', list_name)
-        local set_size = redis.call('scard', set_name)
-        return list_size == set_size
+        local queue_name = KEYS[1]
+        local uniqueue_name = queue_name..':uniqueue'
+        local start_at_name = queue_name..':start_at'
+        local queue_size = redis.call('llen', queue_name)
+        local uniqueue_size = redis.call('scard', uniqueue_name)
+        local start_at_size = redis.call('llen', start_at_name)
+        if queue_size == uniqueue_size then
+          if queue_size == start_at_size then
+            return true
+          end
+        end
+        return false
       LUA
     end
 

data/resque-uniqueue.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "resque-uniqueue"
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Scruggs"]

data/test/test_resque-uniqueue.rb

@@ -195,17 +195,28 @@ class TestResqueUniqueue < Test::Unit::TestCase
         Resque.redis.flushall
       end
 
-      should "return true if set length and list length are the same" do
+      should "return true if queue, uniqueue & start_at length are the same" do
         Resque.redis.sadd   "priority_10:uniqueue", "test"
         Resque.redis.rpush  "priority_10", "test"
+        Resque.redis.rpush  "priority_10:start_at", "test"
         Resque.confirm_unique_queue_validity("priority_10")
       end
 
-      should 'raise exception if length of set and list differ' do
+      should 'raise exception if length of queue is off' do
         Resque.redis.rpush  "priority_10", "test"
         assert_raises(RuntimeError){ Resque.confirm_unique_queue_validity("priority_10") }
       end
 
+      should 'raise exception if length of uniqueue is off' do
+        Resque.redis.sadd  "priority_10:uniqueue", "test"
+        assert_raises(RuntimeError){ Resque.confirm_unique_queue_validity("priority_10") }
+      end
+
+      should 'raise exception if length of start_at is off' do
+        Resque.redis.rpush  "priority_10:start_at", "test"
+        assert_raises(RuntimeError){ Resque.confirm_unique_queue_validity("priority_10") }
+      end
+
     end
 
     context "queue names" do
@@ -257,9 +268,11 @@ class TestResqueUniqueue < Test::Unit::TestCase
           Resque.push('priority_10', {'name' => 'bob'})
           assert_equal Resque.redis.llen('queue:priority_10'), 1
           assert_equal Resque.redis.scard('queue:priority_10:uniqueue'), 1
+          assert_equal Resque.redis.llen('queue:priority_10:start_at'), 1
           Resque.push('priority_10', {'name' => 'bob'})
           assert_equal Resque.redis.llen('queue:priority_10'), 1
           assert_equal Resque.redis.scard('queue:priority_10:uniqueue'), 1
+          assert_equal Resque.redis.llen('queue:priority_10:start_at'), 1
         end
 
         should "return queue length if unique job" do
@@ -272,6 +285,18 @@ class TestResqueUniqueue < Test::Unit::TestCase
           assert_nil Resque.push('priority_10', {'name' => 'bob'})
         end
 
+        should 'create start_at list if does not exist' do
+          refute Resque.redis.exists 'queue:priority_10:start_at'
+          Resque.push('priority_10', {'name' => 'bob'})
+          assert Resque.redis.exists 'queue:priority_10:start_at'
+        end
+
+        should 'add current time to start_at list' do
+          Resque.push_unique('priority_10', {'name' => 'bob'}, 1370213794)
+          assert_equal Resque.redis.llen('queue:priority_10:start_at'), 1
+          assert_equal Resque.redis.rpop('queue:priority_10:start_at').to_i, 1370213794
+        end
+
       end
 
       context "pop_unique" do
@@ -281,7 +306,8 @@ class TestResqueUniqueue < Test::Unit::TestCase
           job = Resque.pop('priority_20')
           Resque.push('priority_10', {'name' => 'bob'})
           uniqueue_job = Resque.pop('priority_10')
-          assert_equal job, uniqueue_job
+          assert_equal job['name'], 'bob'
+          assert_equal job['name'], uniqueue_job['name']
         end
 
         should "return same item whether unique queue or not when queue is empty" do
@@ -299,6 +325,19 @@ class TestResqueUniqueue < Test::Unit::TestCase
           assert_equal Resque.redis.scard('queue:priority_10:uniqueue'), 0
         end
 
+        should 'remove current time from start_at list' do 
+          Resque.push_unique('priority_10', {'name' => 'bob'}, 1370213794)
+          assert_equal Resque.redis.llen('queue:priority_10:start_at'), 1
+          Resque.pop('priority_10')
+          assert_equal Resque.redis.llen('queue:priority_10:start_at'), 0
+        end
+
+        should 'return start_at as part of job hash' do 
+          Resque.push_unique('priority_10', {'name' => 'bob'}, 1370213794)
+          job = Resque.pop('priority_10')
+          assert_equal job['start_at'], 1370213794
+        end
+
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-uniqueue
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -158,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2315830065208087025
+      hash: -2707351707401238460
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: