zk-eventmachine 0.1.7 → 0.1.8

data/lib/z_k/z_k_event_machine/client.rb

@@ -12,6 +12,7 @@ module ZK
       def initialize(host, opts={})
         @host = host
         @close_deferred = Deferred::Default.new
+        @connection_lost_deferred = Deferred::Default.new
         @event_handler = EventHandlerEM.new(self)
       end
 
@@ -29,6 +30,18 @@ module ZK
         @cnx.on_attached(&blk)
       end
 
+      # If we get a ZK::Exceptions::ConnectionLoss exeption back from any call,
+      # we will call back any handlers registered here with the exception
+      # instance as the argument
+      #
+      # once this deferred has been fired, it will be replaced with a new
+      # deferred, so callbacks must be re-registered
+      # 
+      def on_connection_lost(&blk)
+        @connection_lost_deferred.callback(&blk) if blk
+        @connection_lost_deferred
+      end
+
       def reopen(*a)
         raise NotImplementedError, "reoopen is not implemented for the eventmachine version of the client"
       end
@@ -61,18 +74,21 @@ module ZK
       #
       def get(path, opts={}, &block)
         Callback.new_get_cb(block) do |cb|
+          cb.errback(&method(:connection_lost_hook))
           super(path, opts.merge(:callback => cb))
         end
       end
 
       def create(path, data='', opts={}, &block)
         Callback.new_create_cb(block) do |cb|
+          cb.errback(&method(:connection_lost_hook))
           super(path, data, opts.merge(:callback => cb))
         end
       end
 
       def set(path, data, opts={}, &block)
         Callback.new_set_cb(block) do |cb|
+          cb.errback(&method(:connection_lost_hook))
           super(path, data, opts.merge(:callback => cb))
         end
       end
@@ -83,6 +99,7 @@ module ZK
         meth = :"new_#{cb_style}_cb"
 
         Callback.__send__(meth, block) do |cb|
+          cb.errback(&method(:connection_lost_hook))
           super(path, opts.merge(:callback => cb))
         end
       end
@@ -93,27 +110,39 @@ module ZK
 
       def delete(path, opts={}, &block)
         Callback.new_delete_cb(block) do |cb|
+          cb.errback(&method(:connection_lost_hook))
           super(path, opts.merge(:callback => cb))
         end
       end
 
       def children(path, opts={}, &block)
         Callback.new_children_cb(block) do |cb|
+          cb.errback(&method(:connection_lost_hook))
           super(path, opts.merge(:callback => cb))
         end
       end
 
       def get_acl(path, opts={}, &block)
         Callback.new_get_acl_cb(block) do |cb|
+          cb.errback(&method(:connection_lost_hook))
           super(path, opts.merge(:callback => cb))
         end
       end
 
       def set_acl(path, acls, opts={}, &block)
         Callback.new_set_acl_cb(block) do |cb|
+          cb.errback(&method(:connection_lost_hook))
           super(path, acls, opts.merge(:callback => cb))
         end
       end
+
+    protected
+      def connection_lost_hook(exc)
+        if exc and exc.kind_of?(ZK::Exceptions::ConnectionLoss)
+          dfr, @connection_lost_deferred = @connection_lost_deferred, Deferred::Default.new
+          dfr.succeed(exc)
+        end
+      end
     end
   end
 end

data/lib/z_k/z_k_event_machine/version.rb

@@ -1,5 +1,5 @@
 module ZK
   module ZKEventMachine
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

data/spec/z_k/z_k_event_machine/client_spec.rb

@@ -45,6 +45,44 @@ module ZK::ZKEventMachine
       end
     end
 
+    describe 'on_connection_loss' do
+      before do
+        @path = [@base_path, 'foo'].join('/')
+        @data = 'this is data'
+        @zk.create(@path, @data)
+      end
+
+      it %[should be called back if the connection is lost] do
+        em do
+          @zkem.on_connection_lost do |exc|
+            logger.debug { "WIN!" }
+            exc.should be_kind_of(ZK::Exceptions::ConnectionLoss)
+            @zkem.close! { done }
+          end
+
+          @zkem.connect do
+            flexmock(@zkem.cnx) do |m|
+              m.should_receive(:get).with(Hash).and_return do |hash|
+                logger.debug { "client received :get wtih #{hash.inspect}" }
+                @user_cb = hash[:callback]
+
+                EM.next_tick do
+                  logger.debug { "calling back user cb with connection loss" }
+                  @user_cb.call(:rc => ZK::Exceptions::CONNECTIONLOSS)
+                end
+
+                { :rc => Zookeeper::ZOK }
+              end
+            end
+
+            @zkem.get(@path) do |exc,data|
+              exc.should be_kind_of(ZK::Exceptions::ConnectionLoss)
+            end
+          end
+        end
+      end
+    end
+
     describe 'get' do
       describe 'success' do
         before do

data/zk-eventmachine.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   # zk depends on slyphon-zookeeper, but we need at least this version
   s.add_dependency('slyphon-zookeeper', '~> 0.2.4')
-  s.add_dependency('eventmachine', '>= 0.12.10')
+  s.add_dependency('eventmachine', '~> 1.0.0.beta.3')
 
   s.add_development_dependency('rspec', '~> 2.5.0')
   s.add_development_dependency('yard', '~> 0.7.0')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zk-eventmachine
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-05 00:00:00 +00:00
-default_executable: 
+date: 2011-10-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zk
@@ -56,14 +55,16 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 62196357
         segments: 
+        - 1
         - 0
-        - 12
-        - 10
-        version: 0.12.10
+        - 0
+        - beta
+        - 3
+        version: 1.0.0.beta.3
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -183,7 +184,6 @@ files:
 - spec/z_k/z_k_event_machine/event_handler_e_m_spec.rb
 - spec/z_k/z_k_event_machine/unixisms_spec.rb
 - zk-eventmachine.gemspec
-has_rdoc: true
 homepage: https://github.com/slyphon/zk-eventmachine
 licenses: []
 
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: ZK client for EventMachine-based (async) applications