em-eventsource 0.1.7 → 0.1.8

data/lib/em-eventsource.rb

@@ -87,21 +87,15 @@ module EventMachine
     # Cancel subscription
     def close
       @ready_state = CLOSED
-      @req.close if @req
+      @conn.close('requested') if @conn
     end
 
     protected
 
     def listen
-      @req = prepare_request
-      @req.errback do
-        next if @ready_state == CLOSED
-        @ready_state = CONNECTING
-        @errors.each { |error| error.call("Connection lost. Reconnecting.") }
-        EM.add_timer(@retry) do
-          listen
-        end
-      end
+      @conn, @req = prepare_request
+      @req.errback(&method(:handle_reconnect))
+      @req.callback(&method(:handle_reconnect))
       @req.headers do |headers|
         if headers.status != 200
           close
@@ -127,6 +121,15 @@ module EventMachine
       end
     end
 
+    def handle_reconnect(*args)
+      return if @ready_state == CLOSED
+      @ready_state = CONNECTING
+      @errors.each { |error| error.call("Connection lost. Reconnecting.") }
+      EM.add_timer(@retry) do
+        listen
+      end
+    end
+
     def handle_stream(stream)
       data = ""
       name = nil
@@ -164,8 +167,8 @@ module EventMachine
       }
       headers = @headers.merge({'Cache-Control' => 'no-cache'})
       headers.merge!({'Last-Event-Id' => @last_event_id }) if not @last_event_id.nil?
-      conn.get({ :query => @query,
-                 :head  => headers})
+      [conn, conn.get({ :query => @query,
+                        :head  => headers})]
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-eventsource
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-20 00:00:00.000000000Z
+date: 2012-05-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &19744640 !ruby/object:Gem::Requirement
+  requirement: &17007600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0.beta3
   type: :runtime
   prerelease: false
-  version_requirements: *19744640
+  version_requirements: *17007600
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &19744160 !ruby/object:Gem::Requirement
+  requirement: &17007020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *19744160
+  version_requirements: *17007020
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &19743700 !ruby/object:Gem::Requirement
+  requirement: &17006480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *19743700
+  version_requirements: *17006480
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &19743320 !ruby/object:Gem::Requirement
+  requirement: &17005880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19743320
+  version_requirements: *17005880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19742860 !ruby/object:Gem::Requirement
+  requirement: &17005080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19742860
+  version_requirements: *17005080
 description: ! "     em-eventsource is an eventmachine library to consume Server-Sent
   Events streaming API.\n     You can find the specification here: http://dev.w3.org/html5/eventsource/\n"
 email: francois@2metz.fr