websocket-td 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 549ad5df2619ccc64b9be924d85d1bb34e7d5601
-  data.tar.gz: 8e3a9c62a78aab4095f71e8fa26c0cf922127ee3
+  metadata.gz: 8804a66bcfbd10f025de18c6c29b6cc44ce304f3
+  data.tar.gz: a0c8d9d49c56ddcf17361638bf80b25f2c06eedc
 SHA512:
-  metadata.gz: d64310c37daa3d8783c82249d76b5933e5d31c191c9b2fb837f0d49edd59a684dd5e87abe8abc0281d23459cb203f1299ae258addace1c8df3775b7dc0d00dbb
-  data.tar.gz: b17d9279fa42be544bad826b647c49ac0dd269db0379806aa53b32e42decb045b417ca9c7fcb434998951af81540e3fb1cf7834cc6f4bc6eb5c0df479e4a7d97
+  metadata.gz: 904fed1fbf29f9445ab06fe1d65d571db86336e2994b7405f1c23a3bab66efe1b20383bd6924857141119eb8e42934b95d885fca86132e5d3ab812b56ac34b93
+  data.tar.gz: 51a140921ec9f4be73144983d361a345990151eb31e7e32ebf701d81fa699c4e0d2786ba54ba4b768dfba68bb360505922da035a3181c9bfdee5feddd0d88567

data/Gemfile.lock

@@ -0,0 +1,24 @@
+PATH
+  remote: .
+  specs:
+    websocket-td (0.0.2)
+      websocket (~> 1.1.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    json (1.8.0)
+    rdoc (4.0.1)
+      json (~> 1.4)
+    shoulda (2.11.3)
+    test-unit (2.5.5)
+    websocket (1.1.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rdoc (> 0)
+  shoulda (~> 2.11.3)
+  test-unit (>= 2.5.5)
+  websocket-td!

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/websocket_td.rb

@@ -4,6 +4,7 @@ require '../lib/errors'
 
 module WebsocketTD
   class Websocket
+    IS_WINDOWS   = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
     # max length bytes to try to read from a socket per attempt
     @read_buffer = 0
     #true when reading data from a socket
@@ -11,6 +12,7 @@ module WebsocketTD
     #the tread currently being used to read data
     @read_thread = nil
     @auto_pong   = true
+
     ##
     # +host+:: Host of request. Required if no :url param was provided.
     # +path+:: Path of request. Should start with '/'. Default: '/'
@@ -48,7 +50,51 @@ module WebsocketTD
       else
         @socket = tcp_socket
       end
+      perform_handshake
+    end
+
+    attr_reader :read_thread, :read_buffer, :socket, :active, :auto_pong
+    attr_writer :read_buffer, :auto_pong, :on_ping, :on_error, :on_message # :on_open, :on_close
+
+    ##
+    #Send the data given by the data param
+    #if running on a posix system this uses Ruby's fork method to send
+    #if on windows fork won't be attempted.
+    #+data+:: the data to send
+    #+type+:: :text or :binary, defaults to :text
+    def send(data, type = :text)
+      if IS_WINDOWS
+        do_send(data, type) #fork not supported on windows
+      else
+        fork do
+          do_send(data, type)
+        end
+      end
+    end
+
+    ##
+    #sets a Proc to be executed when the connection is opened and ready for writing
+    #+p+:: the Proc to execute
+    def on_open=(p)
+      @on_open = p
+      if @opened
+        fire_on_open
+      end
+    end
+
+    ##
+    #sets a Proc to be executed when the connection is closed and ready for writing
+    #+p+:: the Proc to execute
+    def on_close=(p)
+      @on_close = p
+      if @closed
+        fire_on_close
+      end
+    end
 
+#protected methods after this
+    protected
+    def perform_handshake
       @socket.write @handshake.to_s
       buf     = ''
       headers = ''
@@ -89,24 +135,6 @@ module WebsocketTD
           # ignored
         end
       end
-      puts headers
-    end
-
-    attr_reader :read_thread, :read_buffer, :socket, :active, :auto_pong
-    attr_writer :read_buffer, :auto_pong, :on_ping, :on_error, :on_message # :on_open, :on_close
-
-    def on_open=(p)
-      @on_open = p
-      if @opened
-        fire_on_open
-      end
-    end
-
-    def on_close=(p)
-      @on_close = p
-      if @closed
-        fire_on_close
-      end
     end
 
     #Use one thread to perform blocking read on the socket
@@ -125,10 +153,15 @@ module WebsocketTD
           @active = false
           fire_on_close
         else
-          frame << @socket.readpartial(@read_buffer)
-          if (message = frame.next) != nil
-            #"text", "binary", "ping", "pong" and "close" (according to websocket/base.rb)
-            determine_message_type(message)
+          begin
+            frame << @socket.readpartial(@read_buffer)
+            if (message = frame.next) != nil
+              #"text", "binary", "ping", "pong" and "close" (according to websocket/base.rb)
+              determine_message_type(message)
+            end
+          rescue EOFError => eof
+            fire_on_error(eof)
+            fire_on_close
           end
         end
       end
@@ -151,8 +184,7 @@ module WebsocketTD
       end
     end
 
-
-    def send(data, type = :text)
+    def do_send(data, type=:text)
       frame = WebSocket::Frame::Outgoing::Client.new(:version => @handshake.version, :data => data, :type => type)
       begin
         @socket.write frame #_nonblock

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: websocket-td
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Courtney Robinson
@@ -75,6 +75,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - VERSION