fairway 0.0.3 → 0.0.4

data/Gemfile.lock

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

data/lib/fairway/queue_reader.rb

@@ -5,6 +5,10 @@ module Fairway
       @queue_names = [queue_names].flatten!
     end
 
+    def length
+      @connection.redis.mget(@queue_names.map{|q| "#{q}:length" }).sum.to_i
+    end
+
     def pull
       @connection.scripts.fairway_pull(@queue_names)
     end

data/lib/fairway/sidekiq/queue_fetch.rb

@@ -16,7 +16,12 @@ module Fairway
 
         if work
           decoded_work = JSON.parse(work)
-          work = @message_to_job.call(fairway_queue, decoded_work).to_json if @message_to_job
+
+          if @message_to_job
+            decoded_work = @message_to_job.call(fairway_queue, decoded_work)
+            work         = decoded_work.to_json
+          end
+
           unit_of_work = UnitOfWork.new(decoded_work["queue"], work)
         end
 

data/lib/fairway/version.rb

@@ -1,3 +1,3 @@
 module Fairway
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/redis/fairway_deliver.lua

@@ -15,6 +15,7 @@ for i = 1, #registered_queues, 2 do
     local facet_queue   = namespace .. queue_name .. ':facet_queue';
 
     redis.call('lpush', namespace .. queue_name .. ':' .. facet, message)
+    redis.call('incr', namespace .. queue_name .. ':length');
 
     if redis.call('sadd', active_facets, facet) == 1 then
       redis.call('lpush', facet_queue, facet);

data/redis/fairway_pull.lua

@@ -10,6 +10,10 @@ for index, queue_name in ipairs(ARGV) do
     local message_queue = namespace .. queue_name .. ':' .. facet;
     local message = redis.call('rpop', message_queue);
 
+    if message then
+      redis.call('decr', namespace .. queue_name .. ':length');
+    end
+
     if redis.call('llen', message_queue) == 0 then
       redis.call('srem', active_facets, facet);
     else

data/spec/lib/fairway/connection_spec.rb

@@ -2,24 +2,18 @@ require "spec_helper"
 
 module Fairway
   describe Connection do
-    let(:config) do
-      Config.new do |c|
-        c.facet { |message| message[:facet] }
-      end
-    end
-
-    let(:connection) { Connection.new(config) }
-    let(:redis)      { config.redis }
+    let(:connection) { Connection.new(Fairway.config) }
+    let(:redis)      { Fairway.config.redis }
     let(:message)    { { facet: 1, topic: "event:helloworld" } }
 
     describe "#initialize" do
       it "registers queues from the config" do
-        config = Config.new
-        config.register_queue("myqueue", ".*")
-        config.redis.hgetall("registered_queues").should == {}
-        Connection.new(config)
+        Fairway.config.register_queue("myqueue", ".*")
+        Fairway.config.redis.hgetall("registered_queues").should == {}
+
+        Connection.new(Fairway.config)
 
-        config.redis.hgetall("registered_queues").should == {
+        Fairway.config.redis.hgetall("registered_queues").should == {
           "myqueue" => ".*"
         }
       end
@@ -40,7 +34,7 @@ module Fairway
 
           on.pmessage do |pattern, channel, received_message|
             received_message.should == message.to_json
-            channel.should == "default"
+            channel.should == "test:fairway:default"
             redis.punsubscribe(pattern)
           end
         end
@@ -48,7 +42,7 @@ module Fairway
 
       context "registered queue exists for message type" do
         before do
-          config.register_queue("myqueue")
+          Fairway.config.register_queue("myqueue")
         end
 
         it "adds message to the environment facet for the queue" do

data/spec/lib/fairway/queue_reader_spec.rb

@@ -2,13 +2,8 @@ require "spec_helper"
 
 module Fairway
   describe QueueReader do
-    let(:config) do
-      Config.new do |c|
-        c.facet { |message| message[:facet] }
-      end
-    end
     let(:connection) do
-      c = Connection.new(config)
+      c = Connection.new(Fairway.config)
       ChanneledConnection.new(c) do |message|
         message[:topic]
       end
@@ -21,9 +16,33 @@ module Fairway
       end
     end
 
+    describe "#length" do
+      let(:reader) { QueueReader.new(connection, "myqueue") }
+
+      before do
+        Fairway.config.register_queue("myqueue", "event:helloworld")
+      end
+
+      it "returns the number of queued messages across facets" do
+        reader.length.should == 0
+
+        connection.deliver(message.merge(facet: 1, message: 1))
+        connection.deliver(message.merge(facet: 1, message: 2))
+        connection.deliver(message.merge(facet: 2, message: 3))
+
+        reader.length.should == 3
+
+        reader.pull
+        reader.pull
+        reader.pull
+
+        reader.length.should == 0
+      end
+    end
+
     describe "#pull" do
       before do
-        config.register_queue("myqueue", "event:helloworld")
+        Fairway.config.register_queue("myqueue", "event:helloworld")
       end
 
       it "pulls a message off the queue using FIFO strategy" do
@@ -49,10 +68,10 @@ module Fairway
       it "removes facet from active list if it becomes empty" do
         connection.deliver(message)
 
-        config.redis.smembers("myqueue:active_facets").should == ["1"]
+        Fairway.config.redis.smembers("myqueue:active_facets").should == ["1"]
         reader = QueueReader.new(connection, "myqueue")
         reader.pull
-        config.redis.smembers("myqueue:active_facets").should be_empty
+        Fairway.config.redis.smembers("myqueue:active_facets").should be_empty
       end
 
       it "returns nil if there are no messages to retrieve" do
@@ -65,8 +84,8 @@ module Fairway
 
       context "pulling from multiple queues" do
         before do
-          config.register_queue("myqueue1", "event:1")
-          config.register_queue("myqueue2", "event:2")
+          Fairway.config.register_queue("myqueue1", "event:1")
+          Fairway.config.register_queue("myqueue2", "event:2")
         end
 
         it "pulls messages off first queue with a message" do

data/spec/lib/fairway/sidekiq/queue_fetch_spec.rb

@@ -18,17 +18,17 @@ module Fairway
 
       it "allows transforming of the message into a job" do
         fetch = QueueFetch.new(reader) do |fairway_queue, message|
-          message.tap do |message|
-            message["queue"] = "my_#{message["queue"]}"
-            message["class"] = "GolfEventJob"
-          end
+          {
+            "queue" => "my_#{message["queue"]}",
+            "class" => "GolfEventJob"
+          }
         end
 
         reader.stub(pull: ["fairway", work])
 
         unit_of_work = fetch.retrieve_work
         unit_of_work.queue_name.should == "my_golf_events"
-        unit_of_work.message.should == JSON.parse(work).merge("queue" => "my_golf_events", "class" => "GolfEventJob").to_json
+        unit_of_work.message.should == { "queue" => "my_golf_events", "class" => "GolfEventJob" }.to_json
       end
     end
   end

data/spec/spec_helper.rb

@@ -23,7 +23,8 @@ Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each {|f| require f}
 RSpec.configure do |config|
   config.before(:each) do
     Fairway.configure do |config|
-      config.namespace = "test:backbone"
+      config.namespace = "test:fairway"
+      config.facet { |message| message[:facet] }
     end
 
     Fairway::Config.new.redis.flushdb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fairway
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport