tubesock 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dcfa51a0e1492175493e56346c8a623ae7d3945
-  data.tar.gz: 223777060aa74001df982d0c736349051060ba3a
+  metadata.gz: d841d7d707c6478a67478ceae2ed26d3b25b7b78
+  data.tar.gz: 21d0276fe0b599b83d1bcf5867bf5f2a280a3116
 SHA512:
-  metadata.gz: 55dbb0c0136509521c4176a0f9cd546f77a36efbde56abd1bc253d6bb7054073e1bf65f45b483d26c87cd6dcdc9bbbf937f478d33aafa237b55f062e4c6f363b
-  data.tar.gz: 095f6094b95b7bcf29aac098afc889baefe0b09339ed41d474a3b272dadf7d315ec243f0dc76d87d564be4e1c835e32bd97b3ed138d66ab2698ea1432af29a3f
+  metadata.gz: c3cfc1848b42e5d889a901a90279f123e9a53f2d87df6a86215cf7668e5644b7c17c39142ae51adafec517888dca0fa466344fbacfd9026aff7527aab37a4d98
+  data.tar.gz: 512157a89fb5f832e5b2b70cf16671cf96d8845048fa44307cf00de1131acc73b4340b02b5b1cd5ef7b3d2b8db6a0538b3cee21085a89b2fbb0b8020f7f78049

data/.travis.yml

@@ -1,6 +1,4 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
-  - jruby-19mode
+  - "2.1.6"
+  - "2.2.2"

data/lib/tubesock.rb

@@ -14,6 +14,11 @@ class Tubesock
     @open_handlers    = []
     @message_handlers = []
     @close_handlers   = []
+    @error_handlers   = []
+
+    @close_on_error = true
+
+    @active = true
   end
 
   def self.hijack(env)
@@ -32,6 +37,10 @@ class Tubesock
     end
   end
 
+  def prevent_close_on_error
+    @close_on_error = false
+  end
+
   def send_data data, type = :text
     frame = WebSocket::Frame::Outgoing::Server.new(
       version: @version,
@@ -39,7 +48,7 @@ class Tubesock
       type: type
     )
     @socket.write frame.to_s
-  rescue IOError, Errno::EPIPE
+  rescue IOError, Errno::EPIPE, Errno::ETIMEDOUT
     close
   end
 
@@ -55,20 +64,41 @@ class Tubesock
     @close_handlers << block
   end
 
+  def onerror(&block)
+    @error_handlers << block
+  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) }
+      begin
+        @open_handlers.each(&:call)
+        each_frame do |data|
+          @message_handlers.each do |h|
+            begin
+              h.call(data)
+            rescue => e
+              @error_handlers.each{|eh| eh.call(e,data)}
+              close if @close_on_error
+            end
+          end
+        end
+      ensure
+        close
       end
-      close
     end
   end
 
   def close
+    return unless @active
+
     @close_handlers.each(&:call)
+    close!
+
+    @active = false
+  end
+  
+  def close!
     if @socket.respond_to?(:closed?)
       @socket.close unless @socket.closed?
     else

data/lib/tubesock/version.rb

@@ -1,3 +1,3 @@
 class Tubesock
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/test/tubesock_test.rb

@@ -54,4 +54,103 @@ class TubesockTest < Tubesock::TestCase
 
     closed.called.must_equal true
   end
+
+  def test_onerror_callback
+    interaction = TestInteraction.new
+
+    closed = MockProc.new
+    errored = MockProc.new
+
+    interaction.tubesock do |tubesock|
+      tubesock.onclose &closed
+
+      tubesock.onerror &errored
+      tubesock.onmessage do |message|
+        raise "Really really really bad error"
+      end
+    end
+
+    interaction.write "Hello world"
+    interaction.join
+
+    errored.called.must_equal true
+
+  end
+
+  def test_prevent_close_on_error
+    interaction = TestInteraction.new
+
+    closed = MockProc.new
+
+    interaction.tubesock do |tubesock|
+      tubesock.onclose &closed
+
+      tubesock.onerror do |error, message|
+        tubesock.prevent_close_on_error
+      end
+      tubesock.onmessage do |message|
+        raise "Really really really bad error"
+      end
+    end
+
+    interaction.write "Hello world"
+    closed.called.must_equal nil
+
+    interaction.close
+  end
+
+  def test_default_close_on_error
+    interaction = TestInteraction.new
+
+    closed = MockProc.new
+
+    interaction.tubesock do |tubesock|
+      tubesock.onclose &closed
+
+      tubesock.onmessage do |message|
+        raise "Really really really bad error"
+      end
+    end
+
+    interaction.write "Hello world"
+    interaction.join
+
+    closed.called.must_equal true
+  end
+
+  def test_multi_frame_no_close
+    interaction = TestInteraction.new
+
+    closed = MockProc.new
+
+    messaged = MockProc.new
+
+    interaction.tubesock do |tubesock|
+      tubesock.onclose &closed
+      tubesock.onmessage &messaged
+    end
+
+    interaction.write "Hello world"
+    sleep 1
+    closed.called.must_equal nil
+
+    interaction.close
+  end
+
+  def test_close_on_open_handler
+    interaction = TestInteraction.new
+
+    closed = MockProc.new
+
+    interaction.tubesock do |tubesock|
+      tubesock.onclose &closed
+      tubesock.onopen do
+        raise "Error opening socket"
+      end
+    end
+
+    proc {interaction.join}.must_raise RuntimeError
+    closed.called.must_equal true
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tubesock
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Nick Gauthier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: Handle websocket connections via Rack and Rails 4 using concurrency