infopark-politics 0.2.13 → 0.2.14

data/lib/politics/static_queue_worker.rb

@@ -80,6 +80,9 @@ module Politics
       register_with_bonjour
       log.progname = uri
       log.info { "Registered in group #{group_name} at port #{@port}" }
+      at_exit do
+        cleanup
+      end
     end
 
     # Fetch a bucket out of the queue and pass it to the given block to be processed.
@@ -224,9 +227,7 @@ module Politics
     end
 
     def cleanup
-      at_exit do
-        @memcache_client.delete(token) if leader?
-      end
+      @memcache_client.delete(token) if leader?
     end
 
     def pause_until_expiry(elapsed)

data/spec/static_queue_worker_spec.rb

@@ -6,11 +6,10 @@ Politics::log.level = Logger::FATAL
 
 @@memcache_client = nil
 
-class Worker
+class UninitializedWorker
   include Politics::StaticQueueWorker
   def initialize
     log.level = Logger::FATAL
-    register_worker 'worker', 10, :iteration_length => 10
   end
 
   def start
@@ -28,13 +27,38 @@ class Worker
   end
 end
 
+class Worker < UninitializedWorker
+  def at_exit
+  end
+
+  def initialize
+    super
+    register_worker 'worker', 10, :iteration_length => 10
+  end
+end
+
+describe UninitializedWorker do
+  before do
+    @@memcache_client = mock('memcache', :set => nil, :get => nil)
+    @worker = UninitializedWorker.new
+  end
+
+  it "should register the removal of the leadership as exit handler" do
+    @worker.should_receive(:at_exit).ordered.and_return {|h| h}
+    handler = @worker.register_worker('worker', 10, :iteration_length => 10)
+
+    @worker.should_receive(:cleanup).ordered
+    handler.call
+  end
+end
+
 describe Worker do
   before do
     @@memcache_client = mock('memcache', :set => nil, :get => nil)
     @worker = Worker.new
   end
 
-  it "it should provide 'until_next_iteration' even if nominate was not completed" do
+  it "should provide 'until_next_iteration' even if nominate was not completed" do
     @worker.until_next_iteration
   end
 
@@ -291,4 +315,32 @@ describe Worker do
       end
     end
   end
+
+  describe "when cleaning up" do
+    before do
+      @worker.stub!(:token).and_return('dcc-group')
+    end
+
+    describe "as leader" do
+      before do
+        @worker.stub!(:leader?).and_return true
+      end
+
+      it "should remove the leadership token" do
+        @@memcache_client.should_receive(:delete).with('dcc-group')
+        @worker.send(:cleanup)
+      end
+    end
+
+    describe "as follower" do
+      before do
+        @worker.stub!(:leader?).and_return false
+      end
+
+      it "should not remove the leadership token" do
+        @@memcache_client.should_not_receive(:delete)
+        @worker.send(:cleanup)
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: infopark-politics
 version: !ruby/object:Gem::Version 
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors: 
 - Mike Perham
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-13 00:00:00 -07:00
+date: 2010-01-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,6 +67,8 @@ files:
 - README.rdoc
 has_rdoc: true
 homepage: http://github.com/infopark/politics
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -87,9 +89,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Algorithms and Tools for Distributed Computing in Ruby.
 test_files: 
 - spec/static_queue_worker_spec.rb