push queue clean up logic to Queue class

Author: hone

lib/resque.rb

@@ -191,8 +191,8 @@ def queues
 
   # Given a queue name, completely deletes the queue.
   def remove_queue(queue)
-    redis.srem(:queues, queue.to_s)
     @queues[queue.to_s].destroy
+    @queues.delete(queue.to_s)
   end
 
 

lib/resque/queue.rb

@@ -85,6 +85,7 @@ def empty?
     # stdlib Queue.
     def destroy
       @redis.del @redis_name
+      @redis.srem(:queues, @name)
     end
 
     private

test/redis_queue_test.rb

@@ -89,6 +89,15 @@ def == other
     assert_equal ["foo"], Resque.queues
   end
 
+  it "cleans up after itself when destroyed" do
+    queue = q
+    queue << Thing.new
+    q.destroy
+
+    assert_equal [], Resque.queues
+    assert !Resque.redis.exists(queue.redis_name)
+  end
+
   def q
     Resque::Queue.new 'foo', Resque.redis
   end