infopark-politics 0.2.7 → 0.2.8

data/lib/politics/static_queue_worker.rb

@@ -60,7 +60,7 @@ module Politics
 
     def self.included(model) #:nodoc:
       model.class_eval do
-        attr_accessor :group_name, :iteration_length
+        attr_accessor :group_name, :iteration_length, :uri
       end
     end
 
@@ -117,7 +117,7 @@ module Politics
             # Get a bucket from the leader and process it
             begin
               log.debug "getting bucket request from leader (#{leader_uri}) and processing it"
-              bucket_process(*leader.bucket_request, &block)
+              bucket_process(*leader.bucket_request(uri), &block)
             rescue DRb::DRbError => dre
               log.error { "Error talking to leader: #{dre.message}" }
               relax until_next_iteration
@@ -130,16 +130,20 @@ module Politics
       end while loop?
     end
 
-    def bucket_request
+    def bucket_request(requestor_uri)
       if leader?
         log.debug "delivering bucket request"
-        [@buckets.pop, until_next_iteration]
+        next_bucket requestor_uri
       else
         log.debug "received request for bucket but am not leader - delivering :not_leader"
         [:not_leader, 0]
       end
     end
 
+    def next_bucket(requestor_uri)
+      [@buckets.pop, until_next_iteration]
+    end
+
     def until_next_iteration
       left = iteration_length - (Time.now - @nominated_at)
       left > 0 ? left : 0

data/spec/static_queue_worker_spec.rb

@@ -13,7 +13,7 @@ class Worker
 
   def start
     process_bucket do |bucket|
-      sleep 1
+      sleep 0.1
     end
   end
 end
@@ -31,9 +31,14 @@ describe Worker do
     @worker.until_next_iteration.should == 0
   end
 
+  it "should give access to the uri" do
+    @worker.uri.should =~ %r(^druby://)
+  end
+
   describe Worker, "when processing bucket" do
     before do
       @worker.stub!(:until_next_iteration).and_return 666
+      @worker.stub!(:nominate)
       @worker.should_receive(:loop?).and_return true, true, true, false
     end
 
@@ -50,5 +55,42 @@ describe Worker do
 
       @worker.start
     end
+
+    describe "as follower" do
+      before do
+        @worker.stub!(:leader?).and_return false
+        @worker.stub!(:leader_uri).and_return "the leader"
+      end
+
+      it "should get the bucket to process from the leader at every iteration" do
+        @worker.stub!(:uri).and_return("my uri")
+        @worker.should_receive(:leader).exactly(4).times.and_return(leader = mock('leader'))
+        leader.should_receive(:bucket_request).with("my uri").exactly(4).times.and_return([1, 2])
+        @worker.start
+      end
+    end
+  end
+
+  describe Worker, "when handling a bucket request" do
+    describe "as leader" do
+      before do
+        @worker.stub!(:leader?).and_return true
+      end
+
+      it "should deliver the bucket" do
+        @worker.should_receive(:next_bucket).with("requestor").and_return "the bucket"
+        @worker.bucket_request("requestor").should == "the bucket"
+      end
+    end
+
+    describe "as follower" do
+      before do
+        @worker.stub!(:leader?).and_return false
+      end
+
+      it "should deliver the :not_leader bucket" do
+        @worker.bucket_request("requestor")[0].should == :not_leader
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: infopark-politics
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors: 
 - Mike Perham