ws_client 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab35da491f4c5d26b8afd50f14e0f195c44db4a2
-  data.tar.gz: db726294b252fd3494b1c80c91b92f5e1c231032
+  metadata.gz: c2d53418c6bbb54f0c051e616d3256a5fe5e9bce
+  data.tar.gz: 6af2067a5ce411a5c65c7349505dae6ff02f7a4d
 SHA512:
-  metadata.gz: 9c0d8d40e04d5f255c31b7417efbe4af44126315fabe84ba3abf9414254d26d0f5710e803cdfed148b26cda6cb009535a33c3e232b15ae004f4065ac23169ffb
-  data.tar.gz: 64f09b2ec2e11af8744950987dee3596516f0fe1b90c9317c698b5331422f040b30f0cafdecaf9f66db1aa92a4e925745e3c7e3738ea6de941ee78348b0823b2
+  metadata.gz: e079fd73f3b812caf77c2ce22f7998ffa4d450ba5c3428b1e65beda2ebf8047eeedae590bae681609627280aed7725f30a075ecb07a5917382387f79efa94113
+  data.tar.gz: 77b177a3c60dde80db51f4719db75614b6b31fc8f5c3a55ef113c0b956c08cd8dfc13ecc1d38e94df0d5f8ad21b2732935ea51f3c3f44119a811f5da63926224

data/lib/ws_client.rb

@@ -1,5 +1,4 @@
 require 'thread'
-require 'event_emitter'
 require 'websocket'
 require 'socket'
 require 'openssl'
@@ -15,7 +14,6 @@ module WsClient
   end
 
   class Client
-    include EventEmitter
     attr_reader :url, :handshake, :message_queue, :connect_options
 
     MS_2 = (1/500.0)
@@ -54,13 +52,11 @@ module WsClient
         @socket.connect
       end
 
-      @pipe_broken = false
       @closed = false
 
       handshake
     rescue OpenSSL::SSL::SSLError, EOFError
       # Re-use the socket cleanup logic if we have a connect failure.
-      @pipe_broken = true
       close
       raise
     end
@@ -88,8 +84,7 @@ module WsClient
     def close
       return if @closed
 
-      write_data nil, :type => :close if !@pipe_broken
-      emit :close
+      write_data nil, :type => :close rescue nil
     ensure
       @closed = true
       @socket.close if @socket
@@ -133,8 +128,6 @@ module WsClient
           retry
         end
       end
-
-      emit :open if @handshaked
     end
 
     def pull_next_message_off_of_socket(socket, timeout = 10, last_frame = nil)
@@ -170,7 +163,7 @@ module WsClient
           retry
         rescue => e
           close
-          emit :error, e
+          raise
         end
       end
     end
@@ -191,45 +184,9 @@ module WsClient
         rescue IO::WaitWritable, Errno::EINTR
           IO.select(nil, [@socket])
           retry
-        rescue Errno::EPIPE => e
-          @pipe_broken = true
-          close
         rescue => e
           close
-          emit :error, e
-        end
-      end
-    end
-  end
-
-  class AsyncClient < ::WsClient::Client
-    def close
-      return if @closed
-
-      write_data nil, :type => :close if !@pipe_broken
-      emit :close
-    ensure
-      @closed = true
-      @socket.close if @socket
-      @tcp_socket.close if @tcp_socket
-      @socket = nil
-      @tcp_socket = nil
-      Thread.kill @thread if @thread
-    end
-
-    def send_data(data, opt={:type => :text})
-      @thread ||= poll # utilize the polling interface, could probably be split into another class
-      write_data(data, opt)
-    end
-
-    def poll
-      return Thread.new(@socket) do |socket|
-        while !@closed do
-          pull_next_message_off_of_socket(socket)
-
-          message_queue.length.times do
-            emit :message, message_queue.pop
-          end
+          raise
         end
       end
     end

data/lib/ws_client/version.rb

@@ -1,3 +1,3 @@
 module WsClient
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

data/ws_client.gemspec

@@ -34,5 +34,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
 
   spec.add_dependency "websocket"
-  spec.add_dependency "event_emitter"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ws_client
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Brandon Dewitt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,20 +81,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: event_emitter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: " Simple websocket client in ruby "
 email:
 - brandonsdewitt+rubygems@gmail.com