refilling_queue 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    refilling_queue (0.0.1)
+    refilling_queue (0.0.2)
 
 GEM
   remote: http://rubygems.org/

data/Readme.md

@@ -14,8 +14,8 @@ Usage
 
     begin
       queue.pop
-    rescue
-      RefillingQueue::EmptyRefill # queue was empty, refilled but is still empty
+    rescue RefillingQueue::Locked
+      # queue was empty, refilling failed because other process is already trying it
     end
 
     queue.pop -> return id
@@ -23,6 +23,8 @@ Usage
     queue.pop -> run block -> store new ids -> return id
     ... # 30 seconds elapsed (global expires_at stored in reque_client) ?
     queue.pop -> run block -> store new ids -> return id
+    ...
+    queue.pop -> run block -> empty result -> return nil
 
 Author
 ======

data/lib/refilling_queue.rb

@@ -1,7 +1,7 @@
 require 'refilling_queue/version'
 
 class RefillingQueue
-  class EmptyRefill < RuntimeError
+  class Locked < RuntimeError
   end
 
   DEFAULT_OPTIONS = {
@@ -16,20 +16,23 @@ class RefillingQueue
   end
 
   def pop
-    item = @client.lpop @name
+    item = _pop
     return item unless item.nil?
-
     refill
+    _pop
+  end
 
-    item = @client.lpop @name
-    return item unless item.nil?
+  private
 
-    raise RefillingQueue::EmptyRefill
+  def _pop
+    @client.lpop @name
   end
 
   def refill
     lock do
       results = @block.call
+      return if results.empty?
+
       @client.pipelined do
         @client.del @name
         results.each{ |r| @client.rpush @name, r } # TODO https://github.com/redis/redis-rb/issues/253
@@ -42,11 +45,9 @@ class RefillingQueue
     @client.llen(@name) == 0
   end
 
-  private
-
   def lock
     lock = "#{@name}_lock"
-    return unless @client.setnx lock, "1"
+    raise RefillingQueue::Locked unless @client.setnx lock, "1"
     @client.expire lock, @options[:lock_timeout]
     begin
       yield

data/lib/refilling_queue/version.rb

@@ -1,3 +1,3 @@
 class RefillingQueue
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/refilling_queue_spec.rb

@@ -32,12 +32,9 @@ describe RefillingQueue do
       queue.pop.should == 3
     end
 
-    it "only tries to refill once / raises on empty refill" do
+    it "only tries to refill once" do
       calls = []
-      queue = RefillingQueue.new(client, "x"){ calls << 1; [] }
-      expect{
-        queue.pop
-      }.to raise_error(RefillingQueue::EmptyRefill)
+      RefillingQueue.new(client, "x"){ calls << 1; [] }.pop.should == nil
       calls.should == [1]
     end
 
@@ -67,14 +64,27 @@ describe RefillingQueue do
   context "with multiple actors" do
     it "only refills once" do
       called = []
+
+      # lock-blocker
       Thread.new do
         RefillingQueue.new(client, "x"){ sleep 0.2; called << 1; [] }.pop
       end
+      sleep 0.1
+
+      # blocked
+      locked = false
       Thread.new do
-        RefillingQueue.new(client, "x"){ sleep 0.2; called << 1; [] }.pop
+        queue = RefillingQueue.new(client, "x"){ sleep 0.2; called << 1; [] }
+        begin
+          queue.pop
+        rescue RefillingQueue::Locked
+          locked = true
+        end
       end
       sleep 0.3
+
       called.should == [1]
+      locked.should == true
     end
 
     it "can refill after refill is complete" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refilling_queue
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -42,7 +42,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2693512841144003384
+      hash: 2863148755919563971
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -51,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2693512841144003384
+      hash: 2863148755919563971
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24