ld-celluloid-eventsource 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae62916a2869d9f669a30e437e98f70c840e006e
-  data.tar.gz: 108da12046da7322ba51e2dd7fdaa6d28bdfeb43
+  metadata.gz: 8bd8fda8554cfa1dba5eb39bbf50070aa0d7106b
+  data.tar.gz: a16e16201da0c651b4528b4f213230e0200b743e
 SHA512:
-  metadata.gz: 3b06a93d8c97309a27f95026a085648f36a2cb97d33dda6e93c87cd355d7c7637b05e2d08a47ec15280fbaeca6ce88a4be699dca74e05ecbe863a416d64112e3
-  data.tar.gz: e958aea737b951f0b9ece703cf94050390143614f9ad16a838f06d379c21fe7a3f42e5c608c06b35544372b52091715a6dd6cfcc5db9c00da5c4bcd41f893ea8
+  metadata.gz: d1d605c0cebbb138c600e8893760c7819237238c58cd20650c419cc9a79f98d3edea814698e25a627ad1767b2fe14e840696ae2de668dcaf10853a4709017dce
+  data.tar.gz: 8771be4c7e0dafce34b50018d4d9719460940c15eb86ea059c6bc140d96dbc2e0e1db079308868e09e48dd8869d80a50b5904f8bd16d5dc003a460354a93f993

data/.circle.yml

@@ -0,0 +1,7 @@
+ruby:
+  version: 2.3.1
+
+dependencies:
+  pre:
+    - gem update bundler
+    - bundle install

data/Contributing.md

@@ -0,0 +1,7 @@
+# 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

data/README.md

@@ -1,8 +1,6 @@
 # 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)
+[![Gem Version](https://badge.fury.io/rb/celluloid-eventsource.png)](http://badge.fury.io/rb/ld-celluloid-eventsource) [![CircleCI](https://circleci.com/gh/launchdarkly/celluloid-eventsource/tree/master.svg?style=svg)](https://circleci.com/gh/launchdarkly/celluloid-eventsource/tree/master)
 
 An EventSource client based off Celluloid::IO.
 
@@ -12,7 +10,7 @@ Specification based on [EventSource](http://www.w3.org/TR/2012/CR-eventsource-20
 
 Add this line to your application's Gemfile:
 
-    gem 'celluloid-eventsource'
+    gem 'ld-celluloid-eventsource'
 
 And then execute:
 

data/ld-celluloid-eventsource.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'celluloid-io', '~> 0.17.3'
   spec.add_dependency 'celluloid', '~> 0.18.0.pre'
+  spec.add_dependency 'nio4r', '~> 1.1'
   spec.add_dependency 'http_parser.rb', '~> 0.6.0'
 
   spec.add_development_dependency 'atomic', '~> 1.1'

data/lib/celluloid/eventsource/version.rb

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

data/lib/celluloid/eventsource.rb

@@ -1,8 +1,9 @@
 require 'celluloid/current'
-require "celluloid/eventsource/version"
+require 'celluloid/eventsource/version'
 require 'celluloid/io'
 require 'celluloid/eventsource/response_parser'
 require 'uri'
+require 'base64'
 
 module Celluloid
   class EventSource
@@ -24,6 +25,13 @@ module Celluloid
       @ready_state = CONNECTING
       @with_credentials = options.delete(:with_credentials) { false }
       @headers = default_request_headers.merge(options.fetch(:headers, {}))
+      proxy = ENV['HTTP_PROXY'] || ENV['http_proxy'] || options[:proxy]
+      if proxy
+        proxyUri = URI(proxy)
+        if proxyUri.scheme == 'http' || proxyUri.scheme == 'https'
+          @proxy = proxyUri
+        end
+      end
 
       @event_type_buffer = ""
       @last_event_id_buffer = ""
@@ -96,7 +104,22 @@ module Celluloid
     end
 
     def establish_connection
-      @socket = Celluloid::IO::TCPSocket.new(@url.host, @url.port)
+      if @proxy
+        sock = ::TCPSocket.new(@proxy.host, @proxy.port)
+        @socket = Celluloid::IO::TCPSocket.new(sock)
+
+        @socket.write(connect_string)
+        @socket.flush
+        while (line = @socket.readline.chomp) != '' do @parser << line end
+
+        unless @parser.status_code == 200
+          @on[:error].call({status_code: @parser.status_code, body: @parser.chunk})
+          return
+        end
+      else
+        sock = ::TCPSocket.new(@url.host, @url.port)
+        @socket = Celluloid::IO::TCPSocket.new(sock)
+      end
 
       if ssl?
         @socket = Celluloid::IO::SSLSocket.new(@socket)
@@ -104,6 +127,7 @@ module Celluloid
       end
 
       @socket.write(request_string)
+      @socket.flush()
 
       until @parser.headers?
         @parser << @socket.readline
@@ -234,6 +258,16 @@ module Celluloid
       ["GET #{url.request_uri} HTTP/1.1", headers].flatten.join("\r\n").concat("\r\n\r\n")
     end
 
+    def connect_string
+      req = "CONNECT #{url.host}:#{url.port} HTTP/1.1\r\n"
+      req << "Host: #{url.host}:#{url.port}\r\n"
+      if @proxy.user || @proxy.password
+        encoded_credentials = Base64.strict_encode64([@proxy.user || '', @proxy.password || ''].join(":"))
+        req << "Proxy-Authorization: Basic #{encoded_credentials}\r\n"
+      end
+      req << "\r\n"
+    end
+
   end
 
 end

data/spec/celluloid/eventsource_spec.rb

@@ -39,6 +39,28 @@ RSpec.describe Celluloid::EventSource do
       headers = es.instance_variable_get('@headers')
       expect(headers['Authorization']).to eq(auth_header["Authorization"])
     end
+
+    it 'parses an http proxy' do
+      proxy = "http://myhost:8080"
+      allow_any_instance_of(Celluloid::EventSource).to receive_message_chain(:async, :listen)
+      es = Celluloid::EventSource.new("http://#{url}", :proxy => proxy)
+
+      instanceProxy = es.instance_variable_get('@proxy')
+      expect(instanceProxy.host).to eq('myhost')
+      expect(instanceProxy.port).to eq(8080)
+    end
+
+    it 'parses an http proxy auth' do
+      proxy = "http://user:pass@myhost:8080"
+      allow_any_instance_of(Celluloid::EventSource).to receive_message_chain(:async, :listen)
+      es = Celluloid::EventSource.new("http://#{url}", :proxy => proxy)
+
+      instanceProxy = es.instance_variable_get('@proxy')
+      expect(instanceProxy.host).to eq('myhost')
+      expect(instanceProxy.port).to eq(8080)
+      expect(instanceProxy.user).to eq('user')
+      expect(instanceProxy.password).to eq('pass')
+    end
   end
 
   context 'callbacks' do
@@ -67,6 +89,7 @@ RSpec.describe Celluloid::EventSource do
 
         Celluloid::EventSource.new("#{dummy.endpoint}/error") do |conn|
           conn.on_error do |error|
+            conn.close
             future.signal(value_class.new({ msg: error, state: conn.ready_state }))
           end
         end

data/spec/spec_helper.rb

@@ -14,9 +14,7 @@ RSpec.configure do |config|
   config.expose_dsl_globally = false
 
   config.around(:each) do |ex|
-    Celluloid.boot
     ex.run
-    Celluloid.shutdown
   end
 
   # Run specs in random order to surface order dependencies. If you find an

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ld-celluloid-eventsource
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - LaunchDarkly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io
@@ -38,6 +38,20 @@ 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
@@ -130,9 +144,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circle.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- Contributing.md
 - Gemfile
 - LICENSE
 - README.md
@@ -167,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: ld-celluloid-eventsource is a gem to consume SSE streaming API.

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-
-before_install: gem update bundler
-
-rvm:
-  - "2.0.0"
-  - "2.1.0"
-  - "2.2.2"