fairway 0.1.2 → 0.1.3

data/Gemfile.lock

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

data/lib/fairway/connection.rb

@@ -39,6 +39,10 @@ module Fairway
       end
     end
 
+    def unregister_queue(name)
+      scripts.unregister_queue(name)
+    end
+
     def scripts
       @config.scripts
     end

data/lib/fairway/queue.rb

@@ -18,7 +18,7 @@ module Fairway
     end
 
     def length
-      redis.mget(unique_queues.map{|q| "#{q}:length" }).sum.to_i
+      redis.mget(unique_queues.map{|q| "#{q}:length" }).map(&:to_i).sum
     end
 
     def peek
@@ -44,6 +44,10 @@ module Fairway
       queue
     end
 
+    def destroy
+      scripts.fairway_destroy(unique_queues)
+    end
+
     def redis
       @connection.redis
     end

data/lib/fairway/scripts.rb

@@ -16,6 +16,10 @@ module Fairway
       @redis.hset(registered_queues_key, name, channel)
     end
 
+    def unregister_queue(name)
+      @redis.hdel(registered_queues_key, name)
+    end
+
     def registered_queues
       @redis.hgetall(registered_queues_key)
     end

data/lib/fairway/version.rb

@@ -1,3 +1,3 @@
 module Fairway
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/redis/fairway_destroy.lua

@@ -0,0 +1,29 @@
+local namespace = KEYS[1];
+
+local k = function (queue, subkey)
+  return namespace .. queue .. ':' .. subkey;
+end
+
+-- Multiple queues can be passed through
+-- fairway_destroy. We'll loop through all 
+-- provided queues, and delete related keys
+-- for each queue.
+for i, queue in ipairs(ARGV) do
+  local priorities    = k(queue, 'priorities');
+  local active_facets = k(queue, 'active_facets');
+  local round_robin   = k(queue, 'facet_queue');
+  local facet_pool    = k(queue, 'facet_pool');
+  local length        = k(queue, 'length');
+
+  local facets = redis.call('smembers', active_facets);
+
+  for i = 1, #facets, 1 do
+    redis.call('del', k(queue, facets[i]));
+  end
+
+  redis.call('del', priorities);
+  redis.call('del', active_facets);
+  redis.call('del', round_robin);
+  redis.call('del', facet_pool);
+  redis.call('del', length);
+end

data/spec/lib/fairway/connection_spec.rb

@@ -78,6 +78,19 @@ module Fairway
           redis.llen("myqueue:facet_queue").should == 0
         end
       end
+
+      context "unregistering a queue" do
+        before do
+          Fairway.config.register_queue("myqueue")
+        end
+
+        it "stops adding messages to the queue" do
+          connection.deliver(message)
+          connection.unregister_queue("myqueue")
+          connection.deliver(message)
+          redis.llen("myqueue:1").should == 1
+        end
+      end
     end
   end
 end

data/spec/lib/fairway/queue_spec.rb

@@ -306,6 +306,70 @@ module Fairway
       end
     end
 
+    describe "#destroy" do
+      let(:facet) { Facet.new(queue, 1) }
+
+      it "removes all queued messages" do
+        connection.deliver(message)
+        queue.length.should == 1
+        facet.length.should == 1
+        queue.destroy
+        queue.length.should == 0
+        facet.length.should == 0
+      end
+
+      it "removes all facets" do
+        connection.deliver(message)
+        queue.active_facets.length.should == 1
+        queue.destroy
+        queue.active_facets.length.should == 0
+      end
+
+      it "removes any redis keys related to the queue" do
+        connection.deliver(message)
+
+        connection.redis.keys("myqueue:*").length.should > 0
+
+        queue.destroy
+
+        connection.redis.keys("myqueue:*").length.should == 0
+      end
+
+      context "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")
+
+          connection.deliver(message.merge(topic: "event:1"))
+          connection.deliver(message.merge(topic: "event:2"))
+        end
+
+        it "destroys both queues" do
+          queue.length.should == 2
+          queue.destroy
+          queue.length.should == 0
+        end
+
+        it "removes all facets" do
+          queue.active_facets.length.should == 1
+          queue.destroy
+          queue.active_facets.length.should == 0
+        end
+
+        it "removes any redis keys related both queues" do
+          connection.redis.keys("myqueue1:*").length.should > 0
+          connection.redis.keys("myqueue2:*").length.should > 0
+
+          queue.destroy
+
+          connection.redis.keys("myqueue1:*").length.should == 0
+          connection.redis.keys("myqueue2:*").length.should == 0
+        end
+      end
+    end
+
     describe "equality" do
       it "should equal queues with same connection and queue names" do
         Queue.new(connection, "a", "b", "c").should == Queue.new(connection, "a", "b", "c")

data/spec/lib/fairway/scripts_spec.rb

@@ -19,7 +19,17 @@ module Fairway
       end
     end
 
-    describe "#registered_queue" do
+    describe "#unregister_queue" do
+      let(:scripts) { Scripts.new(Redis.new, "foo") }
+
+      it "removes the queue and channel from the hash of registered queues" do
+        scripts.register_queue("name", "channel")
+        scripts.unregister_queue("name")
+        Redis.new.hgetall("foo:registered_queues").should == {}
+      end
+    end
+
+    describe "#registered_queues" do
       let(:scripts) { Scripts.new(Redis.new, "foo") }
 
       it "returns hash of all registered queues and their channels" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fairway
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -103,6 +103,7 @@ files:
 - lib/fairway/sidekiq/fetch.rb
 - lib/fairway/version.rb
 - redis/fairway_deliver.lua
+- redis/fairway_destroy.lua
 - redis/fairway_peek.lua
 - redis/fairway_priority.lua
 - redis/fairway_pull.lua