infopark-politics 0.4.0 → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjRmYzE1MmU4OGM0YmE4YTZhZTA2N2NjYjc3NjI4MjJiM2VlYTJjMQ==
+    YzI2YjBlZjljZTNiODUyNDhkOWVjNmQ1ZTdhN2Y0M2MzN2I1N2I2Zg==
   data.tar.gz: !binary |-
-    ZTliMGY5NzcyNDk3ZjliZjBmZjY1NGM5MGE3MzkzZmM3NDg5ZDljZQ==
+    OTY5ZDEzMWU0ZTdmNDhkZTUwZGRhMjBkMmRkNGEwYTk2MDgzYTBkMg==
 SHA512:
   metadata.gz: !binary |-
-    MzYzMjdmYzgxZTgyNjgxODhiYzg0NWVmZmI4YmY5N2JkZmMxZTZjN2Q4OGRh
-    MDIxYzg1NTc0MTk5MDA2ZTI3N2VmMjkzODQ4YzMxYzM3MTZiNWViZDRhM2I1
-    Yzc0ZDM3MWU2N2FlNzlhMDFmODMwYjZkMWMzMWIxYzRhNGY4ZjQ=
+    MjQwOTlhYzYwMjVmNWFmNTY1ZWFjYjU2NjQxNGEzZmQ3MWU5N2RlYTRmN2I5
+    MzUzYmE5NjZkOTQ5MjEyODEyMDYzMzk5NmY2ZjhiMWI2YjYwZDA0ODcwNmM4
+    MjhlZmQ0NzYzNDg4NjQyMTZjODMyNzczZjQyN2QwNjIxZWEwMzU=
   data.tar.gz: !binary |-
-    MjkxNGRkMzFkNTlhYTY3Yzk4MDBhMzE4OGRkMzA3YzM2ZTZlZjc2MDczNzIz
-    N2JjMWFjYmRmNzM2ODE1NGUxOWI2MDE5NmQ2MTA0NmRkYmY1ODM5ODY4ODI2
-    Yzc1Yzk3MzZiOTdkN2NlYzIzZGRkYzdmODNiNDU2Yzk0MGY0M2I=
+    NDhmMTBjYTM4YzM0MmZmZTBkZTYzOWI3NTY1MTk4M2UxNTJhYmNkNWEyZWI2
+    N2M1ZTQxOGI3MmM3YTM2YTJiMTU1MTcwNmJlNWVkMDAwNjQ0NzE3MDZkNjFi
+    MDIzMmQ2OTk2OGMyOGRmMjgxNGJkYWYxOThmZjFjOTk2MzA0N2U=

data/infopark-politics.gemspec

@@ -6,7 +6,7 @@ end
 
 Gem::Specification.new do |gem|
   gem.name = "infopark-politics"
-  gem.version = "0.4.0"
+  gem.version = "0.5.0"
   gem.summary = "Algorithms and Tools for Distributed Computing in Ruby."
   gem.description = ""
   gem.authors = ["Mike Perham", "Tilo Prütz"]

data/lib/politics/static_queue_worker.rb

@@ -65,7 +65,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(uri), &block)
+              bucket_process(*leader.bucket_request(uri, bucket_request_context), &block)
             rescue DRb::DRbError => dre
               log.error { "Error talking to leader: #{dre.message}" }
               relax until_next_iteration
@@ -124,10 +124,10 @@ module Politics
       @followers_to_stop.select {|u| DRbObject.new(nil, u).alive? rescue DRb::DRbConnError && false}
     end
 
-    def bucket_request(requestor_uri)
+    def bucket_request(requestor_uri, context)
       if leader?
         log.debug "delivering bucket request"
-        bucket_spec = next_bucket(requestor_uri)
+        bucket_spec = next_bucket(requestor_uri, context)
         if !bucket_spec[0] && @followers_to_stop.include?(requestor_uri)
           bucket_spec = [:stop, 0]
           @followers_to_stop.delete(requestor_uri)
@@ -139,7 +139,7 @@ module Politics
       end
     end
 
-    def next_bucket(requestor_uri)
+    def next_bucket(requestor_uri, context)
       [@buckets.pop, sleep_until_next_bucket_time]
     end
 
@@ -271,6 +271,9 @@ module Politics
       Time.now - a
     end
 
+    def bucket_request_context
+    end
+
     def hostname
     end
 

data/spec/static_queue_worker_spec.rb

@@ -56,6 +56,10 @@ describe UninitializedWorker do
       worker.send(:hostname).should be_nil
     end
 
+    it "should not have a bucket_request_context" do
+      worker.send(:bucket_request_context).should be_nil
+    end
+
     context "when it has a hostname" do
       before do
         worker.stub(:hostname).and_return '127.0.0.1'
@@ -156,11 +160,18 @@ describe Worker do
 
         it "should get the bucket to process from the leader at every iteration" do
           worker.should_receive(:leader).exactly(4).times.and_return @leader
-          @leader.should_receive(:bucket_request).with(worker.uri).exactly(4).times.
+          @leader.should_receive(:bucket_request).with(worker.uri, nil).exactly(4).times.
               and_return([1, 2])
           worker.start
         end
 
+        it "should send the bucket_request_context with the bucket request" do
+          worker.stub(:loop?).and_return false
+          worker.stub(:bucket_request_context).and_return "the context"
+          @leader.should_receive(:bucket_request).with(worker.uri, "the context")
+          worker.start
+        end
+
         it "should exit on :stop bucket" do
           @leader.should_receive(:bucket_request).ordered.once.and_return([:stop, 0])
           worker.should_receive(:exit).with(0).ordered.and_return do
@@ -179,8 +190,8 @@ describe Worker do
       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"
+        worker.should_receive(:next_bucket).with("requestor", "context").and_return "the bucket"
+        worker.bucket_request("requestor", "context").should == "the bucket"
       end
 
       describe "when no buckets are left" do
@@ -191,15 +202,15 @@ describe Worker do
         end
 
         it "should deliver the :stop bucket if requestor is in followers_to_stop list" do
-          worker.bucket_request("1").should == [:stop, 0]
+          worker.bucket_request("1", nil).should == [:stop, 0]
         end
 
         it "should not deliver the :stop bucket if requestor is not in followers_to_stop list" do
-          worker.bucket_request("requestor")[0].should be_nil
+          worker.bucket_request("requestor", nil)[0].should be_nil
         end
 
         it "should remove the requestor from the followers_to_stop list" do
-          worker.bucket_request("2")
+          worker.bucket_request("2", nil)
           worker.followers_to_stop.should =~ %w(1 3)
         end
       end
@@ -211,7 +222,7 @@ describe Worker do
       end
 
       it "should deliver the :not_leader bucket" do
-        worker.bucket_request("requestor")[0].should == :not_leader
+        worker.bucket_request("requestor", nil)[0].should == :not_leader
       end
     end
   end
@@ -386,7 +397,7 @@ describe Worker do
   describe "when creating next bucket" do
     it "should set the sleep time to sleep_until_next_bucket_time" do
       worker.should_receive(:sleep_until_next_bucket_time).and_return 'the sleep time'
-      worker.next_bucket('')[1].should == 'the sleep time'
+      worker.next_bucket('', nil)[1].should == 'the sleep time'
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infopark-politics
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Mike Perham
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec