resque-uniqueue 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/resque/uniqueue.rb

@@ -11,14 +11,21 @@ module Resque
       unique_queue?(queue) ? pop_unique(queue)        : super
     end
 
+    def remove_queue(queue)
+      super(queue)
+      redis.del("queue:#{queue}:uniqueue")
+    end
+
     def push_unique(queue, item)
       confirm_unique_queue_validity(queue)
       watch_queue(queue)
+      queue = "queue:#{queue}"
       redis.evalsha push_unique_eval_sha, [queue], [encode(item)]
     end
 
     def pop_unique(queue)
       confirm_unique_queue_validity(queue)
+      queue = "queue:#{queue}"
       decode redis.evalsha pop_unique_eval_sha, [queue]
     end
 
@@ -28,10 +35,9 @@ module Resque
         local set_name = list_name..':uniqueue'
         local in_set = redis.call('sadd', set_name , ARGV[1])
         if in_set == 1 then
-          redis.call('rpush', list_name, ARGV[1])
-          return in_set
+          return redis.call('rpush', list_name, ARGV[1])
         end
-        return in_set
+        return false
       LUA
     end
 

data/resque-uniqueue.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "resque-uniqueue"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Scruggs"]
-  s.date = "2013-05-27"
+  s.date = "2013-06-02"
   s.description = "Unique Resque queues using redis 1.6.0 scripting, sets and not much else"
   s.email = "aaron@scrug.gs"
   s.extra_rdoc_files = [

data/test/test_resque-uniqueue.rb

@@ -143,6 +143,32 @@ class TestResqueUniqueue < Test::Unit::TestCase
 
     end
 
+    context 'remove_queue' do
+
+      setup do
+        Resque.redis.flushall
+        Resque.unique_queues!
+        Resque.unique_queues= ['priority_10']
+      end
+
+      should 'work for normal queues' do
+        Resque.push('priority_20', {'name' => 'bob'})
+        assert Resque.redis.exists('queue:priority_20')
+        Resque.remove_queue('priority_20')
+        refute Resque.redis.exists 'queue:priority_20'
+      end
+
+      should 'work for unique queues' do
+        Resque.push('priority_10', {'name' => 'bob'})
+        assert Resque.redis.exists('queue:priority_10')
+        assert Resque.redis.exists('queue:priority_10:uniqueue')
+        Resque.remove_queue('priority_10')
+        refute Resque.redis.exists 'queue:priority_10'
+        refute Resque.redis.exists 'queue:priority_10:uniqueue'
+      end
+
+    end
+
     context "unique queues" do
 
       setup do
@@ -214,26 +240,36 @@ class TestResqueUniqueue < Test::Unit::TestCase
       context 'push_unique' do
 
         should 'create set & list if they do not exist' do
-          refute Resque.redis.exists 'priority_10'
-          refute Resque.redis.exists 'priority_10:uniqueue'
+          refute Resque.redis.exists 'queue:priority_10'
+          refute Resque.redis.exists 'queue:priority_10:uniqueue'
           Resque.push('priority_10', {'name' => 'bob'})
-          assert Resque.redis.exists 'priority_10'
-          assert Resque.redis.exists 'priority_10:uniqueue'
+          assert Resque.redis.exists 'queue:priority_10'
+          assert Resque.redis.exists 'queue:priority_10:uniqueue'
         end
 
         should "add items to set and list if message unique" do
           Resque.push('priority_10', {'name' => 'bob'})
-          assert_equal Resque.redis.llen('priority_10'), 1
-          assert_equal Resque.redis.scard('priority_10:uniqueue'), 1
+          assert_equal Resque.redis.llen('queue:priority_10'), 1
+          assert_equal Resque.redis.scard('queue:priority_10:uniqueue'), 1
         end
 
         should "not add item to queue if already on there" do
           Resque.push('priority_10', {'name' => 'bob'})
-          assert_equal Resque.redis.llen('priority_10'), 1
-          assert_equal Resque.redis.scard('priority_10:uniqueue'), 1
+          assert_equal Resque.redis.llen('queue:priority_10'), 1
+          assert_equal Resque.redis.scard('queue:priority_10:uniqueue'), 1
           Resque.push('priority_10', {'name' => 'bob'})
-          assert_equal Resque.redis.llen('priority_10'), 1
-          assert_equal Resque.redis.scard('priority_10:uniqueue'), 1
+          assert_equal Resque.redis.llen('queue:priority_10'), 1
+          assert_equal Resque.redis.scard('queue:priority_10:uniqueue'), 1
+        end
+
+        should "return queue length if unique job" do
+          assert_equal Resque.push('priority_10', {'name' => 'bob'}), 1
+          assert_equal Resque.push('priority_10', {'name' => 'robert'}), 2
+        end
+
+        should "return nil if duplicate job" do
+          assert_equal Resque.push('priority_10', {'name' => 'bob'}), 1
+          assert_nil Resque.push('priority_10', {'name' => 'bob'})
         end
 
       end
@@ -256,20 +292,17 @@ class TestResqueUniqueue < Test::Unit::TestCase
 
         should 'remove job from list and set' do
           Resque.push('priority_10', {'name' => 'bob'})
-          assert_equal Resque.redis.llen('priority_10'), 1
-          assert_equal Resque.redis.scard('priority_10:uniqueue'), 1
+          assert_equal Resque.redis.llen('queue:priority_10'), 1
+          assert_equal Resque.redis.scard('queue:priority_10:uniqueue'), 1
           Resque.pop('priority_10')
-          assert_equal Resque.redis.llen('priority_10'), 0
-          assert_equal Resque.redis.scard('priority_10:uniqueue'), 0
+          assert_equal Resque.redis.llen('queue:priority_10'), 0
+          assert_equal Resque.redis.scard('queue:priority_10:uniqueue'), 0
         end
 
       end
 
     end
 
-
-
-
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-uniqueue
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -158,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1288207955428299107
+      hash: 2315830065208087025
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: