expose #name on queue and have a #redis_name

Author: hone

lib/resque/queue.rb

@@ -9,20 +9,23 @@ module Resque
   class Queue
     include Mutex_m
 
+    attr_reader :name, :redis_name
+
     ###
     # Create a new Queue object with +name+ on +redis+ connection, and using
     # the +coder+ for encoding and decoding objects that are stored in redis.
     def initialize name, redis, coder = Marshal
       super()
-      @name  = "queue:#{name}"
-      @redis = redis
-      @coder = coder
+      @name       = name
+      @redis_name = "queue:#{@name}"
+      @redis      = redis
+      @coder      = coder
     end
 
     # Add +object+ to the queue
     def push object
       synchronize do
-        @redis.rpush @name, encode(object)
+        @redis.rpush @redis_name, encode(object)
       end
     end
 
@@ -34,11 +37,11 @@ def push object
     def slice start, length
       if length == 1
         synchronize do
-          decode @redis.lindex @name, start
+          decode @redis.lindex @redis_name, start
         end
       else
         synchronize do
-          Array(@redis.lrange(@name, start, start + length - 1)).map do |item|
+          Array(@redis.lrange(@redis_name, start, start + length - 1)).map do |item|
             decode item
           end
         end
@@ -53,21 +56,21 @@ def slice start, length
     def pop non_block = false
       if non_block
         synchronize do
-          value = @redis.lpop(@name)
+          value = @redis.lpop(@redis_name)
           raise ThreadError unless value
           decode value
         end
       else
         synchronize do
-          value = @redis.blpop(@name, 1) until value
+          value = @redis.blpop(@redis_name, 1) until value
           decode value.last
         end
       end
     end
 
     # Get the length of the queue
     def length
-      @redis.llen @name
+      @redis.llen @redis_name
     end
     alias :size :length
 
@@ -79,7 +82,7 @@ def empty?
     # Deletes this Queue from redis. This method is *not* available on the
     # stdlib Queue.
     def destroy
-      @redis.del @name
+      @redis.del @redis_name
     end
 
     private

test/redis_queue_test.rb

@@ -16,6 +16,10 @@ def == other
     end
   end
 
+  it "generates a redis_name" do
+    assert_equal "queue:foo", q.redis_name
+  end
+
   it "acts sanely" do
     queue = q
     x = Thing.new