em-jack 0.1.1 → 0.1.2

data/lib/em-jack.rb

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

data/lib/em-jack/connection.rb

@@ -25,13 +25,11 @@ module EMJack
       @port = opts[:port] || 11300
       @tube = opts[:tube]
 
-      @used_tube = 'default'
-      @watched_tubes = ['default']
+      reset_tube_state
 
       @data = ""
       @retries = 0
       @in_reserve = false
-      @deferrables = []
 
       @conn = EM::connect(host, port, EMJack::BeanstalkConnection) do |conn|
         conn.client = self
@@ -43,6 +41,17 @@ module EMJack
       end
     end
 
+    def reset_tube_state
+      prev_used = @used_tube 
+      prev_watched = @watched_tubes.dup if @watched_tubes
+
+      @used_tube = 'default'
+      @watched_tubes = ['default']
+      @deferrables = []
+
+      return [prev_used, prev_watched]
+    end
+
     def fiber!
       eigen = (class << self
        self
@@ -230,15 +239,39 @@ module EMJack
 
     def disconnected
       d = @deferrables.dup
-      @deferrables = []
+
+      prev_used, prev_watched = reset_tube_state
 
       set_deferred_status(nil)
       d.each { |df| df.fail(:disconnected) }
 
-      raise EMJack::Disconnected if @retries >= RETRY_COUNT
+      if @retries >= RETRY_COUNT
+        if @disconnected_callback
+          @disconnected_callback.call
+        else
+          raise EMJack::Disconnected
+        end
+      end
 
       @retries += 1
-      EM.add_timer(5) { @conn.reconnect(@host, @port) }
+      EM.add_timer(5) { reconnect(prev_used, prev_watched) }
+    end
+   
+    def reconnect(prev_used, prev_watched)
+      @conn.reconnect(@host, @port)
+
+      use(prev_used) if prev_used
+      [ prev_watched ].flatten.compact.each do |tube|
+        watch(tube)
+      end
+    end
+
+    def reconnect!
+      @retries = 0
+
+      prev_used, prev_watched = reset_tube_state
+
+      EM.next_tick { reconnect(prev_used, prev_watched) }
     end
 
     def add_deferrable(&blk)
@@ -256,6 +289,10 @@ module EMJack
     def on_error(&blk)
       @error_callback = blk
     end
+    
+    def on_disconnect(&blk)
+      @disconnected_callback = blk
+    end
 
     def received(data)
       @data << data

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: em-jack
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - dan sinclair
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-13 00:00:00 -04:00
+date: 2010-12-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -72,23 +75,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: An evented Beanstalk client.