fairway 0.0.9 → 0.0.10

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fairway (0.0.8)
+    fairway (0.0.9)
       activesupport
       hiredis
       redis

data/lib/fairway/queue.rb

@@ -7,12 +7,28 @@ module Fairway
       @queue_names = parse_queue_names(queue_names)
     end
 
+    def active_facets
+      each_queue do |queue|
+        redis.smembers("#{queue}:active_facets")
+      end.flatten.uniq
+    end
+
     def length
-      @connection.redis.mget(@queue_names.uniq.map{|q| "#{q}:length" }).sum.to_i
+      redis.mget(unique_queues.map{|q| "#{q}:length" }).sum.to_i
+    end
+
+    def facet_length(facet)
+      each_queue do |queue|
+        redis.llen("#{queue}:#{facet}")
+      end.sum
+    end
+
+    def peek
+      scripts.fairway_peek(@queue_names.shuffle.uniq)
     end
 
     def pull
-      @connection.scripts.fairway_pull(@queue_names.shuffle.uniq)
+      scripts.fairway_pull(@queue_names.shuffle.uniq)
     end
 
     def ==(other)
@@ -24,6 +40,24 @@ module Fairway
 
     private
 
+    def unique_queues
+      @queue_names.uniq
+    end
+
+    def each_queue(&block)
+      unique_queues.map do |queue|
+        yield(queue)
+      end
+    end
+
+    def scripts
+      @connection.scripts
+    end
+
+    def redis
+      @connection.redis
+    end
+
     def parse_queue_names(names)
       [].tap do |queues|
         names.each do |name|

data/lib/fairway/version.rb

@@ -1,3 +1,3 @@
 module Fairway
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/redis/fairway_peek.lua

@@ -0,0 +1,15 @@
+local namespace = KEYS[1];
+
+for index, queue_name in ipairs(ARGV) do
+  local active_facets = namespace .. queue_name .. ':active_facets';
+  local facet_queue   = namespace .. queue_name .. ':facet_queue';
+
+  local facet = redis.call('lrange', facet_queue, -1, -1)[1];
+
+  if facet then
+    local message_queue = namespace .. queue_name .. ':' .. facet;
+    local message = redis.call('lrange', message_queue, -1, -1)[1];
+
+    return {queue_name, message};
+  end
+end

data/spec/lib/fairway/queue_spec.rb

@@ -8,7 +8,12 @@ module Fairway
         message[:topic]
       end
     end
-    let(:message)     { { facet: 1, topic: "event:helloworld" } }
+    let(:queue)   { Queue.new(connection, "myqueue") }
+    let(:message) { { facet: 1, topic: "event:helloworld" } }
+
+    before do
+      Fairway.config.register_queue("myqueue", "event:helloworld")
+    end
 
     describe "#initialize" do
       it "requires a Connection and queue names" do
@@ -17,12 +22,6 @@ module Fairway
     end
 
     describe "#length" do
-      let(:queue) { Queue.new(connection, "myqueue") }
-
-      before do
-        Fairway.config.register_queue("myqueue", "event:helloworld")
-      end
-
       it "returns the number of queued messages across facets" do
         queue.length.should == 0
 
@@ -40,16 +39,82 @@ module Fairway
       end
     end
 
-    describe "#pull" do
-      before do
-        Fairway.config.register_queue("myqueue", "event:helloworld")
+    describe "#active_facets" do
+      it "returns list of all facets who currently have messages" do
+        connection.deliver(message.merge(facet: 1, message: 1))
+        connection.deliver(message.merge(facet: 2, message: 2))
+        connection.deliver(message.merge(facet: 3, message: 3))
+
+        queue.pull
+
+        queue.active_facets.should == ["2", "3"]
+      end
+
+      context "multiple queues" do
+        let(:queue) { Queue.new(connection, "myqueue1", "myqueue2") }
+
+        before do
+          Fairway.config.register_queue("myqueue1", "event:1")
+          Fairway.config.register_queue("myqueue2", "event:2")
+        end
+
+        it "returns list of all facets from multiple queues" do
+          connection.deliver(message.merge(topic: "event:1", facet: 1, message: 1))
+          connection.deliver(message.merge(topic: "event:1", facet: 2, message: 2))
+          connection.deliver(message.merge(topic: "event:1", facet: 3, message: 2))
+          connection.deliver(message.merge(topic: "event:2", facet: 3, message: 3))
+
+          queue.active_facets.should == ["1", "2", "3"]
+        end
+      end
+    end
+
+    describe "#facet_length" do
+      it "returns number of messages queues for a given facet" do
+        connection.deliver(message.merge(facet: 1, message: 1))
+        connection.deliver(message.merge(facet: 1, message: 2))
+        connection.deliver(message.merge(facet: 2, message: 3))
+
+        queue.facet_length(1).should == 2
+        queue.facet_length(2).should == 1
+        queue.facet_length(3).should == 0
+      end
+
+      context "multiple queues" do
+        let(:queue) { Queue.new(connection, "myqueue1", "myqueue2") }
+
+        before do
+          Fairway.config.register_queue("myqueue1", "event:1")
+          Fairway.config.register_queue("myqueue2", "event:2")
+        end
+
+        it "sums number of messages for facet across all queues" do
+          connection.deliver(message.merge(topic: "event:1", facet: 1, message: 1))
+          connection.deliver(message.merge(topic: "event:1", facet: 2, message: 2))
+          connection.deliver(message.merge(topic: "event:1", facet: 3, message: 2))
+          connection.deliver(message.merge(topic: "event:2", facet: 3, message: 3))
+
+          queue.facet_length(1).should == 1
+          queue.facet_length(2).should == 1
+          queue.facet_length(3).should == 2
+        end
+      end
+    end
+
+    describe "#peek" do
+      it "returns, but doesn't remove the next message to be pulled" do
+        connection.deliver(message1 = message.merge(message: 1))
+        queue.peek.should == ["myqueue", message1.to_json]
+        queue.pull.should == ["myqueue", message1.to_json]
+        queue.pull.should be_nil
       end
+    end
 
+    describe "#pull" do
       it "pulls a message off the queue using FIFO strategy" do
         connection.deliver(message1 = message.merge(message: 1))
         connection.deliver(message2 = message.merge(message: 2))
 
-        queue = Queue.new(connection, "myqueue")
         queue.pull.should == ["myqueue", message1.to_json]
         queue.pull.should == ["myqueue", message2.to_json]
       end
@@ -59,7 +124,6 @@ module Fairway
         connection.deliver(message2 = message.merge(facet: 1, message: 2))
         connection.deliver(message3 = message.merge(facet: 2, message: 3))
 
-        queue = Queue.new(connection, "myqueue")
         queue.pull.should == ["myqueue", message1.to_json]
         queue.pull.should == ["myqueue", message3.to_json]
         queue.pull.should == ["myqueue", message2.to_json]
@@ -68,21 +132,21 @@ module Fairway
       it "removes facet from active list if it becomes empty" do
         connection.deliver(message)
 
-        Fairway.config.redis.smembers("myqueue:active_facets").should == ["1"]
-        queue = Queue.new(connection, "myqueue")
+        queue.active_facets.should == ["1"]
         queue.pull
-        Fairway.config.redis.smembers("myqueue:active_facets").should be_empty
+        queue.active_facets.should be_empty
       end
 
       it "returns nil if there are no messages to retrieve" do
         connection.deliver(message)
 
-        queue = Queue.new(connection, "myqueue")
         queue.pull.should == ["myqueue", message.to_json]
         queue.pull.should be_nil
       end
 
       context "pulling from multiple queues" do
+        let(:queue) { Queue.new(connection, "myqueue2", "myqueue1") }
+
         before do
           Fairway.config.register_queue("myqueue1", "event:1")
           Fairway.config.register_queue("myqueue2", "event:2")
@@ -92,16 +156,12 @@ module Fairway
           connection.deliver(message1 = message.merge(topic: "event:1"))
           connection.deliver(message2 = message.merge(topic: "event:2"))
 
-          queue = Queue.new(connection, "myqueue2", "myqueue1")
-
           messages = [["myqueue1", message1.to_json], ["myqueue2", message2.to_json]]
           messages.should include(queue.pull)
           messages.should include(queue.pull)
         end
 
         it "randomized order of queues attempted to reduce starvation" do
-          queue = Queue.new(connection, "myqueue2", "myqueue1")
-
           order = {}
 
           queue.connection.scripts.stub(:fairway_pull) do |queues|
@@ -137,7 +197,6 @@ module Fairway
         end
 
         it "returns nil if no queues have messages" do
-          queue = Queue.new(connection, "myqueue2", "myqueue1")
           queue.pull.should be_nil
         end
 
@@ -148,7 +207,6 @@ module Fairway
           connection.deliver(message4 = message.merge(facet: 1, topic: "event:2"))
 
           queue1_messages = []
-          queue = Queue.new(connection, "myqueue2", "myqueue1")
 
           4.times do
             message = queue.pull

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fairway
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -102,6 +102,7 @@ files:
 - lib/fairway/sidekiq/fetch.rb
 - lib/fairway/version.rb
 - redis/fairway_deliver.lua
+- redis/fairway_peek.lua
 - redis/fairway_pull.lua
 - spec/lib/fairway/channeled_connection_spec.rb
 - spec/lib/fairway/config_spec.rb