redis-queue 0.0.4 → 0.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzdlY2YzMGE2MmI5Mzc2ZDI5NjYwMjQ1NzQyMDRlMTY0NWJkZjM0ZA==
-  data.tar.gz: !binary |-
-    MzI5YjZiYmNjYTBhZjVkNjBkYzRjMTNmZDlkMzRhNzhmNDUzNWIyMg==
+SHA256:
+  metadata.gz: 375d3e2d535e91e0a7e7297da4edfcb19e095354b96e55333c7f24fa7729fef6
+  data.tar.gz: 2a443a494c57981b7b655a828bae03e4b68e2b162b720ab90e28874d76ddd2b4
 SHA512:
-  metadata.gz: !binary |-
-    MDQ2NTJkOTQ3MzQwMWZmNmI4ZDBjZjA5NTNjOWQ2NTgyNTAxZGEwZjA5OWNi
-    MjU1ZWViMTU2MTI2MTU0MDk0N2VlMTIwOTU1OWQxYTdlZTFiMzA0YzM3NGUx
-    MDczODJmYjI0ZTRhNWYxNjU0YzIyZmM1ZTY3OTdmM2ZkZmM2YWQ=
-  data.tar.gz: !binary |-
-    MGE0Nzk1Y2EyY2VjMTMzNDQxMzNjNDA4YzYyNWEzNWE4MmQ1NmZkNWUwMTE0
-    NGRjMjM4MmQzZGVlMTZlODY5MzY5OTViOWM0YzUyMjIyM2E4YTMzMGE2ODMx
-    MzMyYWQ5NzMyMDM3ZjliZDY1ZDVjNmEyOTlmMDcyNmY5N2U1ZTk=
+  metadata.gz: 92e754d76d4a38d22e5725ae97a97aa15b30a023d8274ac7f61b89261e1e0ef4eb4e6a07bbcb8ff86367ab9971c23f1c38a3bf7dada16b2c22a89f191a9ee4e1
+  data.tar.gz: 4b257132e995cc3b5f8e45d86752047d0c9dfae06a20b36d7388739292e71e8e413caad8282e3493f62144b55369a06756982848c05e9c99b7c5a391491509cf

data/Gemfile

@@ -1,4 +1,6 @@
-source "http://rubygems.org"
+# frozen_string_literal: true
+
+source 'http://rubygems.org'
 
 # Specify your gem's dependencies in redis-queue.gemspec
 gemspec

data/README.md

@@ -31,15 +31,15 @@ queue << "a" # << is an alias of push
 
 # By default, calling pop method is a blocking operation
 # Your code will wait here for a new  
-while message=@queue.pop
+while message=queue.pop
   #Remove message from the backup queue if the message has been processed without errors
   queue.commit if YourTask.new(message).perform.succeed?
 end
 
 #Process messages using block
 
-@queue.process do |message|
-  #@queue.commit is called if last statement of the block returns true
+queue.process do |message|
+  #queue.commit is called if last statement of the block returns true
   YourTask.new(message).perform.succeed?
 end
 

data/Rakefile

@@ -1,9 +1,11 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = 'spec/*_spec.rb'
 end
 
-task :default => :spec
-task :test    => :spec
+task default: :spec
+task test: :spec

data/example/blocking.rb

@@ -1,25 +1,25 @@
-require "redis-queue"
-require "thread"
+# frozen_string_literal: true
 
+require 'redis-queue'
 redis = Redis.new
-#Create a queue that will listen for a new element for 10 seconds
-queue = Redis::Queue.new('__test', 'bp__test', :redis => redis, :timeout => 10)
-queue.clear true 
+# Create a queue that will listen for a new element for 10 seconds
+queue = Redis::Queue.new('__test', 'bp__test', redis: redis, timeout: 10)
+queue.clear true
 
 100.times { queue << rand(100) }
 
 # Simulate a delayed insert
 t = Thread.new do
   sleep 3
-   # We should use a second connection here since the first one is busy 
-   # on a blocking call
-  _redis = Redis.new
-  _queue = Redis::Queue.new('__test', 'bp__test', :redis => _redis)
-  100.times { _queue << "e_#{rand(100)}" }
+  # We should use a second connection here since the first one is busy
+  # on a blocking call
+  other_redis = Redis.new
+  other_queue = Redis::Queue.new('__test', 'bp__test', redis: other_redis)
+  100.times { other_queue << "e_#{rand(100)}" }
 end
 
-#When all elements are dequeud, process method will wait for 10 secods before exit
+# When all elements are dequeud, process method will wait for 10 secods before exit
 queue.process do |message|
-  puts "'#{message}'" 
+  puts "'#{message}'"
 end
-t.join
+t.join

data/example/non-blocking.rb

@@ -1,10 +1,12 @@
-require "redis-queue"
+# frozen_string_literal: true
+
+require 'redis-queue'
 
 redis = Redis.new
 
-queue = Redis::Queue.new('__test', 'bp__test', :redis => redis)
+queue = Redis::Queue.new('__test', 'bp__test', redis: redis)
 queue.clear true
 
 100.times { queue << rand(100) }
 
-queue.process(true) {|m| puts m}
+queue.process(true) { |m| puts m }

data/lib/redis-queue.rb

@@ -1,3 +1,4 @@
-require "redis"
-require "redis/connection/hiredis"
-require "redis/queue"
+# frozen_string_literal: true
+
+require 'redis'
+require 'redis/queue'

data/lib/redis/queue.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 class Redis
   class Queue
-
-    VERSION = "0.0.4"
+    VERSION = '0.1.0'
 
     def self.version
       "redis-queue version #{VERSION}"
@@ -10,7 +11,7 @@ class Redis
     def initialize(queue_name, process_queue_name, options = {})
       raise ArgumentError, 'First argument must be a non empty string'  if !queue_name.is_a?(String) || queue_name.empty?
       raise ArgumentError, 'Second argument must be a non empty string' if !process_queue_name.is_a?(String) || process_queue_name.empty?
-      raise ArgumentError, 'Queue and Process queue have the same name'  if process_queue_name == queue_name 
+      raise ArgumentError, 'Queue and Process queue have the same name' if process_queue_name == queue_name
 
       @redis = options[:redis] || Redis.current
       @queue_name = queue_name
@@ -29,19 +30,19 @@ class Redis
     end
 
     def empty?
-      !(length > 0)
+      length <= 0
     end
 
     def push(obj)
       @redis.lpush(@queue_name, obj)
     end
 
-    def pop(non_block=false)
-      if non_block
-        @last_message = @redis.rpoplpush(@queue_name,@process_queue_name)
-      else
-        @last_message = @redis.brpoplpush(@queue_name,@process_queue_name, @timeout)
-      end
+    def pop(non_block = false)
+      @last_message = if non_block
+                        @redis.rpoplpush(@queue_name, @process_queue_name)
+                      else
+                        @redis.brpoplpush(@queue_name, @process_queue_name, @timeout)
+                      end
       @last_message
     end
 
@@ -49,7 +50,7 @@ class Redis
       @redis.lrem(@process_queue_name, 0, @last_message)
     end
 
-    def process(non_block=false, timeout = nil)
+    def process(non_block = false, timeout = nil)
       @timeout = timeout unless timeout.nil?
       loop do
         message = pop(non_block)
@@ -57,20 +58,19 @@ class Redis
         commit if ret
         break if message.nil? || (non_block && empty?)
       end
-
     end
 
     def refill
-      while message=@redis.lpop(@process_queue_name)
+      while (message = @redis.lpop(@process_queue_name))
         @redis.rpush(@queue_name, message)
       end
       true
     end
 
-    alias :size  :length
-    alias :dec   :pop
-    alias :shift :pop
-    alias :enc   :push
-    alias :<<    :push
+    alias size  length
+    alias dec   pop
+    alias shift pop
+    alias enc   push
+    alias <<    push
   end
-end
+end

data/redis-queue.gemspec

@@ -1,31 +1,31 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "redis-queue"
+# frozen_string_literal: true
+
+require File.expand_path('lib/redis/queue', __dir__)
 
 Gem::Specification.new do |s|
-  s.name        = "redis-queue"
+  s.name        = 'redis-queue'
   s.version     = Redis::Queue::VERSION
-  s.authors     = ["Francesco Laurita"]
-  s.email       = ["francesco.laurita@gmail.com"]
-  s.homepage    = "https://github.com/taganaka/redis-queue"
-  s.summary     = %q{A distributed queue based on Redis}
-  s.description = %q{
+  s.authors     = ['Francesco Laurita']
+  s.email       = ['francesco.laurita@gmail.com']
+  s.homepage    = 'https://github.com/taganaka/redis-queue'
+  s.summary     = 'A distributed queue based on Redis'
+  s.description = '
     Adds Redis::Queue class which can be used as Distributed-Queue based on Redis.
     Redis is often used as a messaging server to implement processing of background jobs or other kinds of messaging tasks.
     It implements Reliable-queue pattern decribed here: http://redis.io/commands/rpoplpush
-  }
+  '
 
-  s.licenses    = ["MIT"]
+  s.licenses = ['MIT']
 
-  s.rubyforge_project = "redis-queue"
+  s.rubyforge_project = 'redis-queue'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'redis', '~> 3.0', '>= 3.0.4'
-  s.add_runtime_dependency 'hiredis', '~> 0.5', '>= 0.5.2'
+  s.add_runtime_dependency 'redis', '>= 3.3.5', '< 5'
 
   s.add_development_dependency 'rspec', '~> 2.13', '>= 2.13.0'
 end

data/spec/redis_queue_spec.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
-require "timeout"
+require 'timeout'
 
 describe Redis::Queue do
   before(:all) do
     @redis = Redis.new
     @queue = Redis::Queue.new('__test', 'bp__test')
-    @queue.clear true 
+    @queue.clear true
   end
 
   after(:all) do
@@ -22,16 +24,16 @@ describe Redis::Queue do
   end
 
   it 'should add an element to the queue' do
-    @queue << "a"
+    @queue << 'a'
     @queue.size.should be == 1
   end
 
   it 'should return an element from the queue' do
     message = @queue.pop(true)
-    message.should be == "a"
+    message.should be == 'a'
   end
 
-  it 'should remove the element from bp_queue if commit is called' do 
+  it 'should remove the element from bp_queue if commit is called' do
     @redis.llen('bp__test').should be == 1
     @queue.commit
     @redis.llen('bp__test').should be == 0
@@ -39,17 +41,17 @@ describe Redis::Queue do
 
   it 'should implements fifo pattern' do
     @queue.clear
-    payload = %w(a b c d e)
-    payload.each {|e| @queue << e}
+    payload = %w[a b c d e]
+    payload.each { |e| @queue << e }
     test = []
-    while e=@queue.pop(true)
+    while (e = @queue.pop(true))
       test << e
     end
     payload.should be == test
   end
 
   it 'should remove all of the elements from the main queue' do
-    %w(a b c d e).each {|e| @queue << e}
+    %w[a b c d e].each { |e| @queue << e }
     @queue.size.should be > 0
     @queue.pop(true)
     @queue.clear
@@ -62,25 +64,25 @@ describe Redis::Queue do
   end
 
   it 'should prcess a message' do
-    @queue << "a"
-    @queue.process(true){|m|m.should be == "a"; true}
+    @queue << 'a'
+    @queue.process(true) { |m| m.should be == 'a'; true }
   end
 
   it 'should prcess a message leaving it into the bp_queue' do
-    @queue << "a"
-    @queue << "a"
-    @queue.process(true){|m|m.should be == "a"; false}
-    @redis.lrange('bp__test',0, -1).should be == ['a', 'a']
+    @queue << 'a'
+    @queue << 'a'
+    @queue.process(true) { |m| m.should be == 'a'; false }
+    @redis.lrange('bp__test', 0, -1).should be == %w[a a]
   end
 
   it 'should refill a main queue' do
     @queue.clear(true)
-    @queue << "a"
-    @queue << "a"
-    @queue.process(true){|m|m.should be == "a"; false}
-    @redis.lrange('bp__test',0, -1).should be == ['a', 'a']
+    @queue << 'a'
+    @queue << 'a'
+    @queue.process(true) { |m| m.should be == 'a'; false }
+    @redis.lrange('bp__test', 0, -1).should be == %w[a a]
     @queue.refill
-    @redis.lrange('__test',0, -1).should be == ['a', 'a']
+    @redis.lrange('__test', 0, -1).should be == %w[a a]
     @redis.llen('bp__test').should be == 0
   end
 
@@ -89,32 +91,30 @@ describe Redis::Queue do
     2.times { @queue << rand(100) }
     is_ok = true
     begin
-      Timeout::timeout(3) {
-        @queue.process(false, 2) {|m| true}
-      }
-    rescue Timeout::Error => e
+      Timeout.timeout(3) do
+        @queue.process(false, 2) { |_m| true }
+      end
+    rescue Timeout::Error => _e
       is_ok = false
     end
-    
-    is_ok.should be_true
 
+    is_ok.should be_truthy
   end
 
   it 'should honor the timeout param in the initializer' do
     redis = Redis.new
-    queue = Redis::Queue.new('__test_tm', 'bp__test_tm', :redis => redis, :timeout => 2)
+    queue = Redis::Queue.new('__test_tm', 'bp__test_tm', redis: redis, timeout: 2)
     queue.clear true
 
     is_ok = true
     begin
-      Timeout::timeout(4) {
+      Timeout.timeout(4) do
         queue.pop
-      }
-    rescue Timeout::Error => e
+      end
+    rescue Timeout::Error => _e
       is_ok = false
     end
     queue.clear
-    is_ok.should be_true
+    is_ok.should be_truthy
   end
-
-end
+end

data/spec/spec_helper.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'bundler'
 require 'rspec'
 
-
 RSpec.configure do |config|
-  config.color_enabled = true
+  config.color = true
 end
 
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-require 'redis-queue'
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'redis-queue'

metadata

@@ -1,76 +1,56 @@
 --- !ruby/object:Gem::Specification
 name: redis-queue
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Francesco Laurita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2018-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ! '>='
+        version: 3.3.5
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ! '>='
+        version: 3.3.5
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.4
-- !ruby/object:Gem::Dependency
-  name: hiredis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.5.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.13.0
-description: ! "\n    Adds Redis::Queue class which can be used as Distributed-Queue
+description: "\n    Adds Redis::Queue class which can be used as Distributed-Queue
   based on Redis.\n    Redis is often used as a messaging server to implement processing
   of background jobs or other kinds of messaging tasks.\n    It implements Reliable-queue
   pattern decribed here: http://redis.io/commands/rpoplpush\n  "
@@ -80,7 +60,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -102,21 +82,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: redis-queue
-rubygems_version: 2.2.2
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: A distributed queue based on Redis
 test_files:
 - spec/redis_queue_spec.rb
 - spec/spec_helper.rb
-has_rdoc: