redis_queue 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5960a426bfd4d8e8ec589f8ce4ddb79a70f77d60
-  data.tar.gz: 5cd35531566dfbe428222623cf1176324818d038
+  metadata.gz: 2611aeb7b25137f26b161137e3169da32c8f3880
+  data.tar.gz: 8815a25e09045bb8ec6583569f6eb777cfe7ab78
 SHA512:
-  metadata.gz: 7035d6b9b9d2a1ffeb22d8b3cc9c84682662236c1e92b167b4e7d86b392eb038fca25f1237381a8ca42d59df778857b2ba80a71e3240d8146feb2e51dab17587
-  data.tar.gz: 71c0d2092e29ea012816384c7cbf4a1805489e9d6648ed08f9aec5f2d6fcb017e5b793c8213684bd0820daa61310fba2d2b4b835bafbe6ecccf0396fb5352b82
+  metadata.gz: 53d783bcb3f12facae37336c9c7fad0a963680bf5d41a41b7de9b76fb1757c392af7ac32c6e220a98d08322be0f5fd19f6a6c24b07f6cbe9940f2d9ceeb2150c
+  data.tar.gz: 42f7bbaec3b42537cb18fa5f665a09a8b7184ac9ee88a90540f1758b13cff5b8a4fa382854a535e9b730cd3f3988fb10e8d3098a3daf7ee2f888d60ecb4c3f5b

data/lib/redis_connection.rb

@@ -1,7 +1,7 @@
 require 'redis'
 
-class RedisConnection
-  def initialize args
+class RedisQueue::RedisConnection
+  def initialize(args)
     @args = args
   end
 
@@ -12,14 +12,14 @@ class RedisConnection
       yield(@redis)
     rescue Redis::CannotConnectError, Redis::TimeoutError => e
       puts e.backtrace
-      puts "Redis crashed, retrying"
-      sleep 5
+      puts 'Redis crashed, retrying'
+      sleep 2
       @redis = new_redis
       retry
     end
   end
 
   def new_redis
-    ::Redis.connect(@args)
+    ::Redis.new(@args)
   end
-end
+end

data/lib/redis_queue.rb

@@ -1,7 +1,5 @@
-require_relative 'redis_connection'
-
 class RedisQueue
-  PUSH_CODE = """
+  PUSH_CODE = ''"
     if ARGV[3] == 'true' then
       local insert = redis.call('linsert', ARGV[1], 'before', '', ARGV[2])
       if insert == -1 or insert == 0 then
@@ -10,70 +8,72 @@ class RedisQueue
       end
     else
       redis.call('rpush', ARGV[1], ARGV[2])
-    end"""
+    end"''.freeze
 
   SCRIPTS   = {
     push: PUSH_CODE,
-    repush: """
+    repush: ''"
       #{PUSH_CODE}
       redis.call('srem', ARGV[1]..'_in_use', ARGV[2])
-    """,
-    fail: """
+    "'',
+    fail: ''"
       redis.call('sadd', ARGV[1]..'_failed', ARGV[2])
       redis.call('srem', ARGV[1]..'_in_use', ARGV[2])
-    """,
-    done: """
+    "'',
+    done: ''"
       redis.call('sadd', ARGV[1]..'_done', ARGV[2])
       redis.call('srem', ARGV[1]..'_in_use', ARGV[2])
-    """,
-    unpop: """
+    "'',
+    unpop: ''"
       redis.call('lpush', ARGV[1], ARGV[2])
       redis.call('srem', ARGV[1]..'_in_use', ARGV[2])
-    """,
-    init_from: """
+    "'',
+    init_from: ''"
       local vals = redis.call('smembers', ARGV[2])
       for i = 1, table.getn(vals) do
         redis.call('lpush', ARGV[1], vals[i])
-      end"""
-  }
+      end"''
+  }.freeze
 
-  def initialize args={}
-    args = {id: :messages, url: 'redis://localhost:6379/0'}.merge(args)
+  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)
     load_scripts
   end
 
-  def pop
+  def pop(block: true)
+    command = block ? :blpop : :lpop
     begin
-      message = @redis_blocking.run { |redis| redis.blpop(@id) }.last
+      message = @redis_blocking.run { |redis| redis.send(command, @id) }
+      message = message.last if command == :blpop
     end while message == ''
-    @redis.run { |redis| redis.sadd "#{@id}_in_use", message }
+    @redis.run { |redis| redis.sadd "#{@id}_in_use", message } if message
     message
   end
 
-  def push message, priority=false
+  def push(message, priority = false)
     script :push, @id, message, priority
   end
 
-  def fail message
+  def fail(message)
     script :fail, @id, message
   end
 
-  def done message
+  def done(message)
     script :done, @id, message
   end
 
-  def unpop message
+  def unpop(message)
     script :unpop, @id, message
   end
 
-  def repush message, priority=false
+  def repush(message, priority = false)
     script :repush, @id, message, priority
   end
 
-  def forget message
+  def forget(message)
     @redis.run { |redis| redis.srem "#{@id}_in_use", message }
   end
 
@@ -87,7 +87,7 @@ class RedisQueue
     @redis.run { |redis| redis.del "#{@id}_done" }
   end
 
-  def init_from set
+  def init_from(set)
     script(:init_from, @id, set)
   end
 
@@ -157,7 +157,9 @@ class RedisQueue
     end
   end
 
-  def script name, *args
+  def script(name, *args)
     @redis.run { |redis| redis.evalsha @scripts[name], argv: args }
   end
 end
+
+require_relative 'redis_connection'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_queue
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Jose Ignacio Fernandez
@@ -14,16 +14,22 @@ dependencies:
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.1
 description: A redis-based queue
 email: joseignacio.fernandez@gmail.com
 executables: []
@@ -52,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Redis Queue