fairway 0.0.6 → 0.0.7

data/Gemfile.lock

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

data/lib/fairway/queue.rb

@@ -4,15 +4,15 @@ module Fairway
 
     def initialize(connection, *queue_names)
       @connection  = connection
-      @queue_names = [queue_names].flatten!
+      @queue_names = parse_queue_names(queue_names)
     end
 
     def length
-      @connection.redis.mget(@queue_names.map{|q| "#{q}:length" }).sum.to_i
+      @connection.redis.mget(@queue_names.uniq.map{|q| "#{q}:length" }).sum.to_i
     end
 
     def pull
-      @connection.scripts.fairway_pull(@queue_names)
+      @connection.scripts.fairway_pull(@queue_names.shuffle.uniq)
     end
 
     def ==(other)
@@ -21,5 +21,21 @@ module Fairway
       connection == other.connection &&
       queue_names == other.queue_names
     end
+
+    private
+
+    def parse_queue_names(names)
+      [].tap do |queues|
+        names.each do |name|
+          if name.is_a?(Hash)
+            name.each do |key, value|
+              value.times { queues << key }
+            end
+          else
+            queues << name
+          end
+        end
+      end
+    end
   end
 end

data/lib/fairway/version.rb

@@ -1,3 +1,3 @@
 module Fairway
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/lib/fairway/queue_spec.rb

@@ -93,8 +93,47 @@ module Fairway
           connection.deliver(message2 = message.merge(topic: "event:2"))
 
           queue = Queue.new(connection, "myqueue2", "myqueue1")
-          queue.pull.should == ["myqueue2", message2.to_json]
-          queue.pull.should == ["myqueue1", message1.to_json]
+
+          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|
+            order[queues.join(":")] ||= 0
+            order[queues.join(":")] += 1
+          end
+
+          100.times { queue.pull }
+
+          order.keys.length.should == 2
+          order["myqueue2:myqueue1"].should > 0
+          order["myqueue1:myqueue2"].should > 0
+        end
+
+        it "allows weighting of queues for ordering" do
+          queue = Queue.new(connection, "myqueue2" => 10, "myqueue1" => 1)
+
+          queue.queue_names.should == [Array.new(10, "myqueue2"), "myqueue1"].flatten
+
+          order = {}
+
+          queue.connection.scripts.stub(:fairway_pull) do |queues|
+            order[queues.join(":")] ||= 0
+            order[queues.join(":")] += 1
+          end
+
+          100.times { queue.pull }
+
+          order.keys.length.should == 2
+          order["myqueue2:myqueue1"].should > 0
+          order["myqueue1:myqueue2"].should > 0
+          order["myqueue2:myqueue1"].should > order["myqueue1:myqueue2"]
         end
 
         it "returns nil if no queues have messages" do
@@ -108,11 +147,17 @@ module Fairway
           connection.deliver(message3 = message.merge(facet: 2, topic: "event:1"))
           connection.deliver(message4 = message.merge(facet: 1, topic: "event:2"))
 
+          queue1_messages = []
           queue = Queue.new(connection, "myqueue2", "myqueue1")
-          queue.pull.should == ["myqueue2", message4.to_json]
-          queue.pull.should == ["myqueue1", message1.to_json]
-          queue.pull.should == ["myqueue1", message3.to_json]
-          queue.pull.should == ["myqueue1", message2.to_json]
+
+          4.times do
+            message = queue.pull
+            queue1_messages << message if message.first == "myqueue1"
+          end
+
+          queue1_messages[0].should == ["myqueue1", message1.to_json]
+          queue1_messages[1].should == ["myqueue1", message3.to_json]
+          queue1_messages[2].should == ["myqueue1", message2.to_json]
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fairway
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-16 00:00:00.000000000 Z
+date: 2013-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport