coordinator 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba122b99d0854436ad66722efd17fb50dc1a4d27
-  data.tar.gz: a65bc1f944b110a655a4895ade5f7ec283d2c6f7
+  metadata.gz: 951f9d028d3168801aa1c5290154533a3d8052f1
+  data.tar.gz: 830fa381045f0024b419320258992b1896a0b8d6
 SHA512:
-  metadata.gz: c229709dd74c66705eec7350e0e6fe712e43e037e0e42179bd605dc1cd660b4427beda31aa493f21ffb2346d98c51a1e46697d12eda8988e5dc4314272368983
-  data.tar.gz: 20da3611c6041f5622f69e29fe22917f4ae461afd866ffd71d89357a8de4b65a0ac7547e9fbe839a8290747e19119d5e105a5ed62977d8a79501c3aea62dc842
+  metadata.gz: 4c522e99cdf40060bf51807190858eb825d3cc8ca3388940460511c9cf7a17f5fbc6d0e8a21e548eadcf09ea9d8bd1271ba5b9f41f480d930275053c361727c8
+  data.tar.gz: f814051065ef4f6d32149f5529538ec06345ca5157c21e1ff27db8d197111614f9cc94c6bae332847346600d558af3a9e48b9bd05e1ebba148c956947510b250

data/lib/coordinator/base.rb

@@ -5,15 +5,15 @@ module Coordinator
     end
 
     def add_task(skill, task)
-      queue_for_skill(skill).add_task(task)
+      queue_for_skill(skill).push(task)
     end
 
     def add_priority_task(skill, task)
-      queue_for_skill(skill).add_priority_task(task)
+      queue_for_skill(skill).left_push(task)
     end
 
     def remove_task(skill, task)
-      queue_for_skill(skill).remove_task(task)
+      queue_for_skill(skill).remove(task)
     end
 
     def next_task(skills)
@@ -25,17 +25,15 @@ module Coordinator
     end
 
     def set_capacity(skill, capacity)
-      queue_for_skill(skill).set_capacity(capacity)
+      queue_for_skill(skill).capacity = capacity
+    end
+
+    def full?(skill)
+      queue_for_skill(skill).full?
     end
 
     def info(skill)
-      queue = queue_for_skill(skill)
-      {
-        "name" => queue.name,
-        "capacity" => queue.capacity,
-        "count" => queue.length,
-        "items" => queue.items
-      }
+      queue_for_skill(skill).details
     end
 
     def length_all
@@ -49,7 +47,7 @@ module Coordinator
     private
 
     def queue_for_skill(skill)
-      queue = @queues.find {|q| q.name == skill}
+      queue = @queues.find {|q| q.skill == skill}
       raise Coordinator::Error, "No matching queue for #{skill}" unless queue
       queue
     end

data/lib/coordinator/queue.rb

@@ -1,28 +1,19 @@
 module Coordinator
-  class Queue
+  class Queue < RedisQueue
+    attr_reader :skill
+
     def initialize(skill, capacity=nil, &block)
       @skill = skill
-      @store = Coordinator::RedisQueue.new(@skill)
-      @store.capacity = capacity if capacity
+      self.capacity = capacity if capacity
       @custom_block = block if block_given?
-    end
 
-    def add_task(task)
-      @store.push(task)
-    end
-
-    def add_priority_task(task)
-      @store.left_push(task)
-    end
-
-    def remove_task(task)
-      @store.remove(task)
+      super(skill)
     end
 
     def next_task(skills)
-      task = @store.peek
+      task = peek
       return nil unless task && eligible?(task, skills)
-      return task if @store.remove(task)
+      return task if remove(task)
       next_task(skills)
     end
 
@@ -34,30 +25,14 @@ module Coordinator
       end
     end
 
-    def set_capacity(capacity)
-      @store.capacity = capacity
-    end
-
-    def name
-      @skill
-    end
-
-    # store delegation methods
-
-    def items
-      @store.items
-    end
-
-    def capacity
-      @store.capacity
-    end
-
-    def length
-      @store.length
-    end
-
-    def peek
-      @store.peek
+    def details
+      {
+        "name" => @skill,
+        "full" => full?,
+        "capacity" => capacity,
+        "count" => length,
+        "items" => items
+      }
     end
   end
 end

data/lib/coordinator/redis_queue.rb

@@ -52,12 +52,12 @@ module Coordinator
       @redis.lrange(@queue_name, 0, length).map { |i| deserialize(i) }
     end
 
-    private
-
     def full?
       capacity && capacity <= length
     end
 
+    private
+
     def serialize(item)
       item.is_a?(String) ? item : item.to_json
     end

data/lib/coordinator/version.rb

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

data/test/unit/base_test.rb

@@ -38,6 +38,34 @@ describe 'Coordinator::Base' do
     end
   end
 
+  describe 'capacity' do
+    before do
+      @coordinator.set_capacity("high", 1)
+      @coordinator.add_task("high", 1)
+    end
+
+    it 'recognizes full state' do
+      assert @coordinator.full?("high")
+    end
+
+    it 'recognizes full state' do
+      @coordinator.set_capacity("high", 2)
+      refute @coordinator.full?("high")
+    end
+  end
+
+  describe 'info' do
+    it 'returns queue specific details' do
+      @coordinator.add_task("high", "new task")
+      info = @coordinator.info("high")
+      assert_equal "high", info["name"]
+      assert_equal nil, info["full"]
+      assert_equal nil, info["capacity"]
+      assert_equal 1, info["count"]
+      assert_equal ["new task"], info["items"]
+    end
+  end
+
   describe 'length_all' do
     it 'returns the total amount of tasks across all queues' do
       @coordinator.add_task("medium", 1)

data/test/unit/queue_test.rb

@@ -6,37 +6,14 @@ describe "Coordinator::Queue" do
     Redis.current.flushall
   end
 
-  describe "next_task" do
-    it "gets task for skills" do
-      @queue.add_task(5)
-      assert_equal 5, @queue.next_task(["high"])
+  describe 'next_task' do
+    it 'returns task when eligible' do
+      @queue.push(1)
+      assert 1, @queue.next_task(["high"])
     end
 
-    it "returns nil when no eligable work" do
-      @queue.add_task(5)
-      assert_equal nil, @queue.next_task(["medium"])
-    end
-
-    it "returns nil when no work" do
-      assert_equal nil, @queue.next_task(["medium"])
-    end
-  end
-
-  describe "add_task" do
-    it "returns true when skill present" do
-      @queue.add_task(5)
-      @queue.add_task(4)
-
-      assert_equal 5, @queue.next_task(["high"])
-    end
-  end
-
-  describe "add_priority_task" do
-    it "returns true when skill present" do
-      @queue.add_task(5)
-      @queue.add_priority_task(4)
-
-      assert_equal 4, @queue.next_task(["high"])
+    it 'returns nil when not eligible' do
+      assert_equal nil, @queue.next_task(["high"])
     end
   end
 
@@ -51,7 +28,7 @@ describe "Coordinator::Queue" do
 
     it "can override default behaviour" do
       queue = Coordinator::Queue.new("normal") do |task, skills|
-        return true if skills.include?(name) && skills.include?("online")
+        return true if skills.include?(skill) && skills.include?("online")
         return true if skills.include?("low")
         return true if task == 4
         task == 3 && skills.include?("special")
@@ -63,14 +40,4 @@ describe "Coordinator::Queue" do
       assert queue.eligible?(3, ["special"]), "override through both"
     end
   end
-
-  describe "peek" do
-    it "deserialize the top task but leaves it in the queue" do
-      task = {"id" => 123}
-      @queue.add_task(task)
-
-      assert_equal task, @queue.peek
-      assert_equal task, @queue.peek # ensure task is still enqueued
-    end
-  end
 end

data/test/unit/redis_queue_test.rb

@@ -88,6 +88,16 @@ describe 'Coordinator::RedisQueue' do
     end
   end
 
+  describe '.full?' do
+    it 'false when under capacity' do
+      refute @queue.full?
+    end
+    it 'true when at capacity' do
+      @queue.capacity = 0
+      assert @queue.full?
+    end
+  end
+
   it 'allows for objects' do
     [1000, "taco", {"a" => 1}, [1,2,3]].each do |o|
       @queue.push(o)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coordinator
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Tyler Mercier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -136,4 +136,3 @@ test_files:
 - test/unit/parallelism_test.rb
 - test/unit/queue_test.rb
 - test/unit/redis_queue_test.rb
-has_rdoc: