websocket-td 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d8a2552cc751d247fbf1c6d2da7131496cb14c7
-  data.tar.gz: 6b06681bc4ea248aa573ea23c6ad54d144ec32db
+  metadata.gz: 559335d8c9eb309fcd0e39cc2a36be020ca30a4c
+  data.tar.gz: d60da560306edf6659b1197a29ae987eaed29109
 SHA512:
-  metadata.gz: 0ddecf9cf0bc04a74ea1541667ad81264a3e74b039330e76b232e49b75aea9cfa791183067bf87425eef6a428ce1bfb60055f93f7c966c8238d9f9a9ab7eff52
-  data.tar.gz: a1d5bc49e8e149e10167e443a3625d3577f8bd4f58546c28d5c6846bc9ec6147e818aae8af1623071de359e94d87cc45dbf2f8fe1d6ab92d3c88d47c412adb9a
+  metadata.gz: 4ebb60bce20e2aeef754db2641d4933335d69b3b1c94040ce11983cbffc4f4f983c9fd32b2c05ef19260198301a90ed871f757bd80e51f6067d7f406e5fc977e
+  data.tar.gz: 724644597d956e91c365578abbbe81fc478096bc03d644423543e8c27c8d9f9361914417f7fd8b4ff783c1526468d785f30bb8d089c4ce366791ad327b1a84f2

data/CHANGELOG.md

@@ -0,0 +1,2 @@
+### 0.0.5
+Address #3 - prevent zombie processes

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/websocket_td.rb

@@ -107,7 +107,7 @@ module WebsocketTD
             init_messaging
             #don't stop reading until after init_message to guarantee @read_thread != nil for a successful connection
             reading = false
-            @opened =true
+            @opened = true
             fire_on_open
           else
             #do non blocking reads on headers - 1 byte at a time
@@ -140,30 +140,21 @@ module WebsocketTD
 
     #Use one thread to perform blocking read on the socket
     def init_messaging
-      if @read_thread == nil
-        @read_thread = Thread.new do
-          read_loop
-        end
-      end
+      @read_thread ||= Thread.new { read_loop }
     end
 
     def read_loop
       frame = WebSocket::Frame::Incoming::Client.new(:version => @handshake.version)
       while @active
-        if @socket.closed?
-          @active = false
-          fire_on_close
-        else
-          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
+        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 Exception => e
+          fire_on_error(e)
+          fire_on_close if @socket.closed?
         end
       end
     end
@@ -218,8 +209,8 @@ module WebsocketTD
       @active = false
       @closed = true
       @on_close.call(message) unless @on_close == nil
-      @socket.close
+      @socket.close unless @socket.closed?
     end
 
   end # class
-end # module
+end # module

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: websocket-td
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Courtney Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.3
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.5.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.5.5
 description: A multi-threaded WebSocket client, i.e. without event machine
@@ -73,7 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -93,17 +94,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A client which will offer the option of using green threads or a single threaded