em-eventsource 0.1.8 → 0.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjlhZjYyOTUyZDQwZTE5MjcyYjE0Y2FmOTczMWI3ODk3ZGRhZGNiMA==
+  data.tar.gz: !binary |-
+    NjhlNjk1ZjgwNTE0YjlkZDUwODM0ZjE4ZGNjYmFlMjA5OTM1NzY2OA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    N2E0NWU5YWNmMWNjYTUzNDA1YjFiOWI1ZTllYzdkOWQ3YjAwOWNkNTk3Yzg0
+    Yjg1MzdhMTBiZjIxYTVjZjBkMGJmZDA0NTI0MTc5NWE0ZmRhNDE2Yjc4MjQ4
+    OGY4YmZiZDdjM2E4M2I3NGJiNTJhZjQ3YWQxYzVhMGEzMmVkYmU=
+  data.tar.gz: !binary |-
+    OThjZDhhM2Q3ZGE1ODAzNWU5ZGIwZjUyY2ZhNTNkNDM2ZDg5NzFlNGJjYTc4
+    NzA1Y2QzN2IxMjcxNWMzZTJhNmM4MDdjNDQyYmVmYjg1YTE1YWY4NTQ5OTI0
+    NTI3MmMzMGM5YjEyMjAzMDI3NmJhNDAwNDkzM2E0YTEwODZkZDU=

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec

data/lib/em-eventsource.rb

@@ -28,11 +28,12 @@ module EventMachine
     OPEN       = 1
     # The connection is not open, and the user agent is not trying to reconnect. Either there was a fatal error or the close() method was invoked.
     CLOSED     = 2
+
     # Create a new stream
     #
-    # @param [String] url
-    # @param [Hash] query
-    # @param [Hash] headers
+    # url - the url as string
+    # query - the query string as hash
+    # headers - the headers for the request as hash
     def initialize(url, query={}, headers={})
       @url = url
       @query = query
@@ -51,40 +52,56 @@ module EventMachine
     end
 
     # Add open event handler
+    #
+    # Returns nothing
     def open(&block)
       @opens << block
     end
 
     # Add a specific event handler
     #
-    # @param [String] name of event
+    # name - name of event
+    #
+    # Returns nothing
     def on(name, &block)
       @on[name] ||= []
       @on[name] << block
     end
 
     # Add message event handler
+    #
+    # Returns nothing
     def message(&block)
       @messages << block
     end
 
     # Add error event handler
+    #
+    # Returns nothing
     def error(&block)
       @errors << block
     end
 
     # Add a middleware
+    #
+    # *args - the middleware class
+    #
+    # Returns nothing
     def use(*args, &block)
       @middlewares << (args << block)
     end
 
     # Start subscription
+    #
+    # Returns nothing
     def start
       @ready_state = CONNECTING
       listen
     end
 
     # Cancel subscription
+    #
+    # Returns nothing
     def close
       @ready_state = CLOSED
       @conn.close('requested') if @conn
@@ -94,27 +111,13 @@ module EventMachine
 
     def listen
       @conn, @req = prepare_request
+      @req.headers(&method(:handle_headers))
       @req.errback(&method(:handle_reconnect))
       @req.callback(&method(:handle_reconnect))
-      @req.headers do |headers|
-        if headers.status != 200
-          close
-          @errors.each { |error| error.call("Unexpected response status #{headers.status}") }
-          next
-        end
-        if /^text\/event-stream/.match headers['CONTENT_TYPE']
-          @ready_state = OPEN
-          @opens.each { |open| open.call }
-        else
-          close
-          @errors.each { |error| error.call("The content-type '#{headers['CONTENT_TYPE']}' is not text/event-stream") }
-        end
-      end
       buffer = ""
       @req.stream do |chunk|
         buffer += chunk
-        # TODO: manage \r, \r\n, \n
-        while index = buffer.index("\n\n")
+        while index = buffer.index(/\r\n\r\n|\n\n/)
           stream = buffer.slice!(0..index)
           handle_stream(stream)
         end
@@ -130,10 +133,25 @@ module EventMachine
       end
     end
 
+    def handle_headers(headers)
+      if headers.status != 200
+        close
+        @errors.each { |error| error.call("Unexpected response status #{headers.status}") }
+        return
+      end
+      if /^text\/event-stream/.match headers['CONTENT_TYPE']
+        @ready_state = OPEN
+        @opens.each { |open| open.call }
+      else
+        close
+        @errors.each { |error| error.call("The content-type '#{headers['CONTENT_TYPE']}' is not text/event-stream") }
+      end
+    end
+
     def handle_stream(stream)
       data = ""
       name = nil
-      stream.split("\n").each do |part|
+      stream.split(/\r?\n/).each do |part|
         /^data:(.+)$/.match(part) do |m|
           data += m[1].strip
           data += "\n"
@@ -151,7 +169,7 @@ module EventMachine
         end
       end
       return if data.empty?
-      data.chomp!("\n")
+      data.chomp!
       if name.nil?
         @messages.each { |message| message.call(data) }
       else
@@ -163,9 +181,9 @@ module EventMachine
       conn = EM::HttpRequest.new(@url, :inactivity_timeout => @inactivity_timeout)
       @middlewares.each { |middleware|
         block = middleware.pop
-        conn.use *middleware, &block
+        conn.use(*middleware, &block)
       }
-      headers = @headers.merge({'Cache-Control' => 'no-cache'})
+      headers = @headers.merge({'Cache-Control' => 'no-cache', 'Accept' => 'text/event-stream'})
       headers.merge!({'Last-Event-Id' => @last_event_id }) if not @last_event_id.nil?
       [conn, conn.get({ :query => @query,
                         :head  => headers})]

metadata

@@ -1,71 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: em-eventsource
 version: !ruby/object:Gem::Version
-  version: 0.1.8
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - François de Metz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-13 00:00:00.000000000Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &17007600 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0.beta3
   type: :runtime
   prerelease: false
-  version_requirements: *17007600
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &17007020 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *17007020
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &17006480 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: minitest-spec-context
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17006480
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &17005880 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17005880
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17005080 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17005080
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
@@ -79,27 +107,27 @@ files:
 - lib/em-eventsource.rb
 homepage: http://github.com/AF83/em-eventsource
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: em-eventsource is an eventmachine library to consume Server-Sent Events streaming
   API.
 test_files: []
+has_rdoc: