ws_client 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 623fede1a088f4f9ebdea245aa16ce11fc3a82e8
-  data.tar.gz: 45a531ee91368609cda816b4316569ee54a69dbb
+  metadata.gz: d6c418fc7b686210fc3ea7d779fa8953b7990209
+  data.tar.gz: a0843638a3b961aba33b3c89bf35add83a110c58
 SHA512:
-  metadata.gz: 6983cc6b405ef101c3ede5e27ea194982b4722f73ef6b0b15ad4bae796598026968366ee4abf4ad102441b622f18bc4a25bbd181d9a307144e9449ff695d11ac
-  data.tar.gz: 8b6471536121d3c270187cb4e8f541e059e2382da4dd54582c92943b42e9fe4e890485966d41ce9f8b1dac92b3a9d3578efc83c3fb7eaf4966bb409b21fb044b
+  metadata.gz: 717b41e9d41803e667c625b9f2b372db5e9cc8bb078176dfc801c0088f77cae419a7bf5917c3aba53a6bcdd32bccd50758a1b21ac303efe0d0c8e931bdcd7dad
+  data.tar.gz: c97d5e0c0fe34c5ca963afbef21b59dcb6a086826fc1ca4035c224e750f0884bee79a1521876016ae2d44b51d3da44f2b91eaca92bee024eeee35c557ea7d027

data/lib/ws_client.rb

@@ -62,13 +62,8 @@ module WsClient
       connect(nil)
     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
-
     # Returns all responses that have been accepted
-    def send_data_and_wait(data, timeout, opt = { :type => :text })
+    def send_data_and_wait(data, timeout = MS_2, opt = { :type => :text })
       response_data = []
       write_data(data, opt)
       pull_next_message_off_of_socket(@socket, timeout)
@@ -82,6 +77,7 @@ module WsClient
 
       response_data
     end
+    alias_method :send_data, :send_data_and_wait
 
     def close
       return if @closed
@@ -92,7 +88,6 @@ module WsClient
       @closed = true
       @socket.close if @socket
       @socket = nil
-      Thread.kill @thread if @thread
     end
 
     def closed?
@@ -134,18 +129,6 @@ module WsClient
       emit :open if @handshaked
     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
-        end
-      end
-    end
-
     def pull_next_message_off_of_socket(socket, timeout = 10, last_frame = nil)
       read_sockets, _, _ = IO.select([socket], nil, nil, timeout)
 
@@ -204,4 +187,29 @@ module WsClient
       end
     end
   end
+
+  class AsyncClient < ::WsClient::Client
+    def close
+      super
+    ensure
+      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
+        end
+      end
+    end
+  end
 end

data/lib/ws_client/version.rb

@@ -1,3 +1,3 @@
 module WsClient
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ws_client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Brandon Dewitt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler