tubesock 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 641bbc3cadfe10190a32eba8504b498fd2bbd080
-  data.tar.gz: 715eb149abbe8e475ce89ef8556d4e05586231a7
+  metadata.gz: 98b9142f247f9e2022ff5626f8b0a3ab352a182d
+  data.tar.gz: 7bbce8c9207ecde3c9defa17e59bee69cef2b51f
 SHA512:
-  metadata.gz: a20f7fbb5814018a5faa5b882e80d3701db747ca8b7808933a1cb707a7df2095ddf788067196ddd98ab202607b37dd2fd3c71802e11c022b8be0913b2552381d
-  data.tar.gz: 37db65ca33059d3af8b9a2c5d06cf44e2cc7ffbc8abdb5c8dae76feebe3928bb87ab17fc28ee0512cec591e618104f362fee065d9cc082e6a33cc8466ea2d281
+  metadata.gz: 63e99f053868723800d97737be978438f92080b7ef80e50a0b83cea7544b940c7f53ba373a90951427a07b7f64c1fe98cbd8a7d6a4aab519b82b7253b4969e43
+  data.tar.gz: 7982ff410c1ca3cb3b48871c50ea52532f2bfaf25d0f5226d8e7a3d1ba11411057c4482d7cdfdcbdeff298f44407ec55571ecbcbc468b3d20c577188fe6ed613

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 rvm:
-  - "1.9.2"
-  - "1.9.3"
-  - "2.0.0"
-  - jruby-19mode # JRuby in 1.9 mode
+  - 1.9.3
+  - 2.0.0
+  - jruby-19mode
   - rbx-19mode

data/lib/tubesock/version.rb

@@ -1,3 +1,3 @@
 class Tubesock
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/tubesock.rb

@@ -5,8 +5,7 @@ require "websocket"
 # Easily interact with WebSocket connections over Rack.
 # TODO: Example with pure Rack
 class Tubesock
-  class HijackNotAvailable < RuntimeError
-  end
+  HijackNotAvailable = Class.new RuntimeError
 
   def initialize(socket, version)
     @socket     = socket
@@ -57,21 +56,40 @@ class Tubesock
   end
 
   def listen
+    keepalive
     Thread.new do
       Thread.current.abort_on_exception = true
       @open_handlers.each(&:call)
       each_frame do |data|
         @message_handlers.each{|h| h.call(data) }
       end
-      @close_handlers.each(&:call)
-      @socket.close
+      close
     end
   end
 
+  def close
+    @close_handlers.each(&:call)
+    @socket.close unless @socket.closed?
+  end
+
+  def keepalive
+    Thread.new do
+      Thread.current.abort_on_exception = true
+      loop do
+        sleep 5
+        ping
+      end
+    end
+  end
+
+  def ping
+    send_data "tubesock-ping", :ping
+  end
+
   private
   def each_frame
     framebuffer = WebSocket::Frame::Incoming::Server.new(version: @version)
-    while !@socket.closed?
+    while IO.select([@socket])
       data, addrinfo = @socket.recvfrom(2000)
       break if data.empty?
       framebuffer << data
@@ -80,5 +98,7 @@ class Tubesock
         yield frame.data
       end
     end
+  rescue Errno::ECONNRESET
+    nil # client disconnected
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tubesock
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Nick Gauthier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Handle websocket connections via Rack and Rails 4 using concurrency