normalize keys for @queues in Resque

Author: hone

lib/resque.rb

@@ -140,15 +140,15 @@ def to_s
   #
   # Returns nothing
   def push(queue, item)
-    @queues[queue] << item
+    @queues[queue.to_s] << item
   end
 
   # Pops a job off a queue. Queue name should be a string.
   #
   # Returns a Ruby object.
   def pop(queue)
     begin
-      @queues[queue].pop(true)
+      @queues[queue.to_s].pop(true)
     rescue ThreadError
       nil
     end
@@ -157,7 +157,7 @@ def pop(queue)
   # Returns an integer representing the size of a queue.
   # Queue name should be a string.
   def size(queue)
-    @queues[queue].size
+    @queues[queue.to_s].size
   end
 
   # Returns an array of items currently queued. Queue name should be
@@ -169,7 +169,7 @@ def size(queue)
   # To get the 3rd page of a 30 item, paginatied list one would use:
   #   Resque.peek('my_list', 59, 30)
   def peek(queue, start = 0, count = 1)
-    @queues[queue].slice start, count
+    @queues[queue.to_s].slice start, count
   end
 
   # Does the dirty work of fetching a range of items from a Redis list
@@ -192,7 +192,7 @@ def queues
   # Given a queue name, completely deletes the queue.
   def remove_queue(queue)
     redis.srem(:queues, queue.to_s)
-    @queues[queue].destroy
+    @queues[queue.to_s].destroy
   end
 
 

test/resque_test.rb

@@ -277,4 +277,21 @@
       Resque.inline = false
     end
   end
+
+  it "normalizes @queues' keys" do
+    [:foo, "foo"].each do |queue|
+      Resque.push(queue, GoodJob)
+      Resque.size(queue)
+      Resque.peek(queue)
+      Resque.pop(queue)
+    end
+
+    assert_equal 2, Resque.instance_variable_get("@queues").size
+    assert_equal 2, Resque.queues.size
+
+    Resque.remove_queue(:foo)
+
+    assert_equal 1, Resque.instance_variable_get("@queues").size
+    assert_equal 1, Resque.queues.size
+  end
 end