ld-celluloid-eventsource 0.8.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e040451be340d3c8f933e665fb70c123736ac3fe
-  data.tar.gz: 993d94fae833cb4ab05f6ca34475f427fa5fc462
+  metadata.gz: ae62916a2869d9f669a30e437e98f70c840e006e
+  data.tar.gz: 108da12046da7322ba51e2dd7fdaa6d28bdfeb43
 SHA512:
-  metadata.gz: 97dd6a189803c922756b28dad8b8d8709a00be51650c03dfa92f2ff1aa58be2a0cf526eb47572cea800fd78eb73cfffc8999673def9e4fae3d0300ecedf82c38
-  data.tar.gz: 7962621a8ce379de6578b898ad6d0b9c622003c877d9f9398b1015be90d82c07b72fb15f976742c4e5ab909aa3fa1e57338b26347fc28be524eb169e11211943
+  metadata.gz: 3b06a93d8c97309a27f95026a085648f36a2cb97d33dda6e93c87cd355d7c7637b05e2d08a47ec15280fbaeca6ce88a4be699dca74e05ecbe863a416d64112e3
+  data.tar.gz: e958aea737b951f0b9ece703cf94050390143614f9ad16a838f06d379c21fe7a3f42e5c608c06b35544372b52091715a6dd6cfcc5db9c00da5c4bcd41f893ea8

data/README.md

@@ -1,6 +1,8 @@
 # Celluloid::Eventsource
 
-[![Gem Version](https://badge.fury.io/rb/celluloid-eventsource.png)](http://badge.fury.io/rb/ld-celluloid-eventsource)
+[![Gem Version](https://badge.fury.io/rb/celluloid-eventsource.png)](http://badge.fury.io/rb/celluloid-eventsource)
+[![Code Climate](https://codeclimate.com/github/Tonkpils/celluloid-eventsource.png)](https://codeclimate.com/github/Tonkpils/celluloid-eventsource)
+[![Build Status](https://travis-ci.org/Tonkpils/celluloid-eventsource.svg?branch=master)](https://travis-ci.org/Tonkpils/celluloid-eventsource)
 
 An EventSource client based off Celluloid::IO.
 
@@ -10,7 +12,7 @@ Specification based on [EventSource](http://www.w3.org/TR/2012/CR-eventsource-20
 
 Add this line to your application's Gemfile:
 
-    gem 'ld-celluloid-eventsource'
+    gem 'celluloid-eventsource'
 
 And then execute:
 

data/ld-celluloid-eventsource.gemspec

@@ -6,7 +6,7 @@ require 'celluloid/eventsource/version'
 Gem::Specification.new do |spec|
   spec.name          = "ld-celluloid-eventsource"
   spec.version       = Celluloid::EventSource::VERSION
-  spec.authors       = ["LaunchDarky"]
+  spec.authors       = ["LaunchDarkly"]
   spec.email         = ["dev@launchdarkly.com"]
   spec.description   = %q{Celluloid::IO based library to consume Server-Sent Events. This library was forked from https://github.com/Tonkpils/celluloid-eventsource}
   spec.summary       = %q{ld-celluloid-eventsource is a gem to consume SSE streaming API.}
@@ -19,12 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'celluloid-io', '~> 0.17.3'
-  spec.add_dependency 'celluloid', '~> 0.18.0.pre' # because https://github.com/celluloid/celluloid/issues/696
-  spec.add_dependency 'nio4r', '~> 1.1'
+  spec.add_dependency 'celluloid', '~> 0.18.0.pre'
   spec.add_dependency 'http_parser.rb', '~> 0.6.0'
-  spec.add_dependency 'concurrent-ruby', '~> 1.0'
-  spec.add_dependency 'retries', '~> 0.0.5'
 
+  spec.add_development_dependency 'atomic', '~> 1.1'
   spec.add_development_dependency "rspec", '~> 3.0'
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", '~> 10.1'

data/lib/celluloid/eventsource.rb

@@ -1,10 +1,7 @@
 require 'celluloid/current'
-require 'celluloid/eventsource/version'
+require "celluloid/eventsource/version"
 require 'celluloid/io'
 require 'celluloid/eventsource/response_parser'
-require 'concurrent'
-require 'logger'
-require 'retries'
 require 'uri'
 
 module Celluloid
@@ -12,17 +9,13 @@ module Celluloid
     include Celluloid::IO
     Celluloid.boot
 
-    attr_reader :url, :with_credentials, :heartbeat_timeout, :logger
+    attr_reader :url, :with_credentials
     attr_reader :ready_state
 
     CONNECTING = 0
     OPEN = 1
     CLOSED = 2
 
-    # 2^31 since our retries library doesn't allow for unlimited retries.
-    # At an average of 1 second per retry, we'll still be retrying in 68 years.
-    MAX_RETRIES = 2147483648
-
     execute_block_on_receiver :initialize
 
     def initialize(uri, options = {})
@@ -30,9 +23,6 @@ module Celluloid
       options  = options.dup
       @ready_state = CONNECTING
       @with_credentials = options.delete(:with_credentials) { false }
-      @heartbeat_timeout = options.delete(:heartbeat_timeout) { 300 }
-      @logger = options.delete(:logger) { default_logger }
-      @logger.info("[EventSource] Starting client connecting to url: #{self.url} with heartbeat timeout: #{@heartbeat_timeout} seconds")
       @headers = default_request_headers.merge(options.fetch(:headers, {}))
 
       @event_type_buffer = ""
@@ -42,7 +32,7 @@ module Celluloid
       @last_event_id = String.new
 
       @reconnect_timeout = 1
-      @on = { open: ->{}, message: ->(_) {}, error: ->(_) {}}
+      @on = { open: ->{}, message: ->(_) {}, error: ->(_) {} }
       @parser = ResponseParser.new
 
       @chunked = false
@@ -69,25 +59,14 @@ module Celluloid
         begin
           establish_connection
           chunked? ? process_chunked_stream : process_stream
-        rescue Exception => e
-          logger.debug("[EventSource] Reconnecting after exception: #{e}")
+        rescue
+          # Just reconnect
         end
-        sleep @reconnect_timeout
+        sleep @reconnect_timeout        
       end
     end
 
-    def listen_for_heartbeats
-      @logger.debug("[EventSource] Starting listening for heartbeats. Reconnecting after #{@heartbeat_timeout} seconds if no comments are received")
-      @heartbeat_task.cancel if @heartbeat_task
-      @heartbeat_task = Concurrent::ScheduledTask.new(@heartbeat_timeout){
-        @logger.warn("[EventSource] Didn't get heartbeat after #{@heartbeat_timeout} seconds. Reconnecting.")
-        @socket.close if @socket
-      }.execute
-    end
-
     def close
-      @logger.info("[EventSource] Closing client")
-      @heartbeat_task.cancel if @heartbeat_task
       @socket.close if @socket
       @ready_state = CLOSED
     end
@@ -117,38 +96,31 @@ module Celluloid
     end
 
     def establish_connection
-      handler = Proc.new do |exception, attempt_number, total_delay|
-        logger.warn("[EventSource] Could not connect with exception: #{exception.class} #{exception.message}; retry attempt #{attempt_number}; #{total_delay} seconds have passed.")
-      end
+      @socket = Celluloid::IO::TCPSocket.new(@url.host, @url.port)
 
-      with_retries(:max_tries => MAX_RETRIES,
-                   :base_sleep_seconds => 1.0,
-                   :max_sleep_seconds => 30.0,
-                   :handler => handler,
-                   :rescue => Exception) do
-        if !closed?
-          @logger.info("[EventSource] Connecting to url: #{@url}")
-          @socket = Celluloid::IO::TCPSocket.new(@url.host, @url.port)
-
-          if ssl?
-            @socket = Celluloid::IO::SSLSocket.new(@socket)
-            @socket.connect
-          end
-
-          @socket.write(request_string)
+      if ssl?
+        @socket = Celluloid::IO::SSLSocket.new(@socket)
+        @socket.connect
+      end
 
-          until @parser.headers?
-            @parser << @socket.readline
-          end
+      @socket.write(request_string)
 
-          if @parser.status_code != 200
-            @socket.close if @socket
-            raise "[EventSource] Could not connect to stream. Got status code: #{@parser.status_code}"
-          end
+      until @parser.headers?
+        @parser << @socket.readline
+      end
 
-          handle_headers(@parser.headers)
+      if @parser.status_code != 200
+        until @socket.eof?
+          @parser << @socket.readline
         end
+        # If the server returns a non-200, we don't want to close-- we just want to
+        # report an error
+        # close
+        @on[:error].call({status_code: @parser.status_code, body: @parser.chunk})
+        return
       end
+
+      handle_headers(@parser.headers)
     end
 
     def default_request_headers
@@ -205,16 +177,14 @@ module Celluloid
 
     def parse_line(line)
       case line
-        when /^: ?(.*)$/
-          @logger.debug("[EventSource] Got comment: #{$1}")
-          listen_for_heartbeats
-        when /^(\w+): ?(.*)$/
-          process_field($1, $2)
-        else
-          if chunked? && !@data_buffer.empty?
-            @data_buffer.rstrip!
-            process_field("data", line.rstrip)
-          end
+      when /^:.*$/
+      when /^(\w+): ?(.*)$/
+        process_field($1, $2)
+      else
+        if chunked? && !@data_buffer.empty?
+          @data_buffer.rstrip!
+          process_field("data", line.rstrip)
+        end
       end
     end
 
@@ -227,7 +197,6 @@ module Celluloid
       event = MessageEvent.new(:message, @data_buffer, @last_event_id)
       event.type = @event_type_buffer.to_sym unless @event_type_buffer.empty?
 
-      @logger.debug("[EventSource] Dispatching event: #{event}")
       dispatch_event(event)
     ensure
       clear_buffers!
@@ -253,11 +222,9 @@ module Celluloid
         @chunked = !headers["Transfer-Encoding"].nil? && headers["Transfer-Encoding"].include?("chunked")
         @ready_state = OPEN
         @on[:open].call
-        @logger.info("[EventSource] Connected ok!")
-        listen_for_heartbeats
       else
-        @socket.close if @socket
-        raise "Got invalid Content-Type header: #{headers['Content-Type']}. Expected text/event-stream"
+        close
+        @on[:error].call({status_code: @parser.status_code, body: "Invalid Content-Type #{headers['Content-Type']}. Expected text/event-stream"})
       end
     end
 
@@ -267,16 +234,6 @@ module Celluloid
       ["GET #{url.request_uri} HTTP/1.1", headers].flatten.join("\r\n").concat("\r\n\r\n")
     end
 
-    def default_logger
-      if defined?(Rails) && Rails.respond_to?(:logger)
-        Rails.logger
-      else
-        log = ::Logger.new($stdout)
-        log.level = ::Logger::INFO
-        log
-      end
-    end
-
   end
 
 end

data/lib/celluloid/eventsource/version.rb

@@ -1,5 +1,5 @@
 module Celluloid
   class EventSource
-    VERSION = "0.8.4"
+    VERSION = "0.9.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ld-celluloid-eventsource
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
 platform: ruby
 authors:
-- LaunchDarky
+- LaunchDarkly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.18.0.pre
-- !ruby/object:Gem::Dependency
-  name: nio4r
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -67,33 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: retries
+  name: atomic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
-  type: :runtime
+        version: '1.1'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +133,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
-- Contributing.md
 - Gemfile
 - LICENSE
 - README.md
@@ -196,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: ld-celluloid-eventsource is a gem to consume SSE streaming API.

data/Contributing.md

@@ -1,7 +0,0 @@
-# Celluloid::Eventsource
-
-To release:
-1. Bump version in version.rb
-1. Commit changes and tag with version: ie 0.8.4
-1. `VERSION=0.8.4 && git tag $VERSION && git push origin $VERSION && gem build ld-celluloid-eventsource.gemspec && gem push ld-celluloid-eventsource-$VERSION.gem`
-1. Release on Github