redis_queue 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 070b9946924ad3d989f088bbf2d4e246bcdeb46c
-  data.tar.gz: e271e4dc1e7ee9423b60d7f76309833d6cf3144d
+  metadata.gz: 83d7bc9d87624d6c6e049a3fe88daa963895d85f
+  data.tar.gz: 696a10c9b9f5c0d822b85e0521ead406a56c49e8
 SHA512:
-  metadata.gz: 5265930448447d46b649203c00020e7ed21136c18e36ac6351f58fadc8b350ba03e8b5a1eeee92f53bb19f21cc669ecd30a704895a90b610df796a7396efdb08
-  data.tar.gz: d4821d42bcbc251170f4071f48ccbc6324576ce5fb16d592d27f792e7ac53ce3a03a28d6cee63fb5b629c9b4eda66b2317093ff8d4930635d0969a524b019c02
+  metadata.gz: 66beafeceb0ee5f8436cf9c9e2a6f978bdbde4387ad2e381db6773b1fb1dccbedd1ccbaaefa9607385025d40ce00b5ddd5f3a132677aec7ae2f687a9a055e9c1
+  data.tar.gz: c31e7772d52044493d111fbfdea9d1a234c52b12b1930d4487f3b953fa72e1aac59161e98aa7ee33d54ba1d70e3131aebd5baa321d1b461bc80c276c2df04c2f

data/lib/redis_queue.rb

@@ -1,17 +1,22 @@
 require_relative 'redis_connection'
 
 class RedisQueue
-  SCRIPTS       = {
-    push: """
-      if ARGV[3] == 'true' then
-        local insert = redis.call('linsert', ARGV[1], 'before', '', ARGV[2])
-        if insert == -1 or insert == 0 then
-          redis.call('lpush', ARGV[1], '')
-          redis.call('lpush', ARGV[1], ARGV[2])
-        end
-      else
-        redis.call('rpush', ARGV[1], ARGV[2])
+  PUSH_CODE = """
+    if ARGV[3] == 'true' then
+      local insert = redis.call('linsert', ARGV[1], 'before', '', ARGV[2])
+      if insert == -1 or insert == 0 then
+        redis.call('lpush', ARGV[1], '')
+        redis.call('lpush', ARGV[1], ARGV[2])
       end
+    else
+      redis.call('rpush', ARGV[1], ARGV[2])
+    end"""
+
+  SCRIPTS   = {
+    push: PUSH_CODE,
+    repush: """
+      #{PUSH_CODE}
+      redis.call('srem', ARGV[1]..'_in_use', ARGV[2])
     """,
     fail: """
       redis.call('sadd', ARGV[1]..'_failed', ARGV[2])
@@ -32,7 +37,8 @@ class RedisQueue
       end"""
   }
 
-  def initialize args={id: :messages, url: 'redis://localhost:6379/0'}
+  def initialize args={}
+    args = {id: :messages, url: 'redis://localhost:6379/0'}.merge(args)
     @id             = args.delete(:id)
     @redis          = RedisConnection.new(args)
     @redis_blocking = RedisConnection.new(args)
@@ -41,30 +47,34 @@ class RedisQueue
 
   def pop
     begin
-      task = @redis_blocking.run { |redis| redis.blpop(@id) }.last
-    end while task == ''
-    @redis.run { |redis| redis.sadd "#{@id}_in_use", task }
-    task
+      message = @redis_blocking.run { |redis| redis.blpop(@id) }.last
+    end while message == ''
+    @redis.run { |redis| redis.sadd "#{@id}_in_use", message }
+    message
+  end
+
+  def push message, priority=false
+    script :push, @id, message, priority
   end
 
-  def push task, priority=false
-    script :push, @id, task, priority
+  def fail message
+    script :fail, @id, message
   end
 
-  def fail task
-    script :fail, @id, task
+  def done message
+    script :done, @id, message
   end
 
-  def done task
-    script :done, @id, task
+  def unpop message
+    script :unpop, @id, message
   end
 
-  def unpop task
-    script :unpop, @id, task
+  def repush message, priority=false
+    script :repush, @id, message, priority
   end
 
-  def forget task
-    @redis.run { |redis| redis.srem "#{@id}_in_use", task }
+  def forget message
+    @redis.run { |redis| redis.srem "#{@id}_in_use", message }
   end
 
   def reset

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_queue
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - Jose Ignacio Fernandez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis