em-jack 0.1.2 → 0.1.3

data/lib/em-jack.rb

@@ -11,6 +11,6 @@ end
 
 module EMJack
   module VERSION
-    STRING = '0.1.2'
+    STRING = '0.1.3'
   end
 end

data/lib/em-jack/connection.rb

@@ -233,6 +233,7 @@ module EMJack
     end
 
     def connected
+      @reconnect_proc = nil
       @retries = 0
       succeed
     end
@@ -240,7 +241,8 @@ module EMJack
     def disconnected
       d = @deferrables.dup
 
-      prev_used, prev_watched = reset_tube_state
+      ## if reconnecting, need to fail ourself to remove any callbacks
+      fail
 
       set_deferred_status(nil)
       d.each { |df| df.fail(:disconnected) }
@@ -253,8 +255,11 @@ module EMJack
         end
       end
 
+      prev_used, prev_watched = reset_tube_state
+      @reconnect_proc = Proc.new { reconnect(prev_used, prev_watched) } unless @reconnect_proc
+
       @retries += 1
-      EM.add_timer(5) { reconnect(prev_used, prev_watched) }
+      EM.add_timer(5) { @reconnect_proc.call }
     end
    
     def reconnect(prev_used, prev_watched)
@@ -302,7 +307,6 @@ module EMJack
         break if idx.nil?
 
         first = @data[0..(idx + 1)]
-
         df = @deferrables.shift
         handled, skip = false, false
         EMJack::Connection.handlers.each do |h|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: em-jack
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - dan sinclair