tubesock 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9afa3d6df0f09dcb321800bb855c0fa9417d1f87
-  data.tar.gz: ff607d84808e0078895d6131d14b58e76068edb3
+  metadata.gz: 5dcfa51a0e1492175493e56346c8a623ae7d3945
+  data.tar.gz: 223777060aa74001df982d0c736349051060ba3a
 SHA512:
-  metadata.gz: 94a757017908ead3b021b9c2acac18ae278a59c73b47ea14f04a6866e84350158873730d2a93e4dd94bf838052bb8617c503525f3e7e5d4616305aa98371aedf
-  data.tar.gz: 4d310ffcf12a483c7a1845ec13cbf672431c338d24407f2d89d678c34e787d126f568444143b0d93be9470fad727017628db57150c767f51e14636fc8bad76ad
+  metadata.gz: 55dbb0c0136509521c4176a0f9cd546f77a36efbde56abd1bc253d6bb7054073e1bf65f45b483d26c87cd6dcdc9bbbf937f478d33aafa237b55f062e4c6f363b
+  data.tar.gz: 095f6094b95b7bcf29aac098afc889baefe0b09339ed41d474a3b272dadf7d315ec243f0dc76d87d564be4e1c835e32bd97b3ed138d66ab2698ea1432af29a3f

data/Gemfile

@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
 
 gemspec
+gem 'puma', group: :test

data/README.md

@@ -29,21 +29,29 @@ Or install it yourself as:
 To use Tubesock with rack, you need to hijack the rack environment and then return an asynchronous response. For example:
 
 ```ruby
-def self.call(env)
-  if websocket?(env)
-    tubesock = hijack(env)
-    tubesock.listen
-    tubesock.onmessage do |message|
-      puts "Got #{message}"
+require 'tubesock'
+
+class Server
+  def call(env)
+    if env["HTTP_UPGRADE"] == 'websocket'
+      tubesock = Tubesock.hijack(env)
+      tubesock.onmessage do |message|
+        puts "Got #{message}"
+      end
+      tubesock.listen
+      [ -1, {}, [] ]
+    else
+      [404, {'Content-Type' => 'text/plain'}, ['Not Found']]
     end
-    [ -1, {}, [] ]
-  else
-    [404, {'Content-Type' => 'text/plain'}, ['Not Found']]
   end
 end
 ```
 
-NOTE: I have not gotten the above to work just yet with just puma or thin. For now, check out the rails example.
+Then you could do the following in your config.ru file to use this class:
+
+```ruby
+run Server.new
+```
 
 ### Rails 4+
 

data/lib/tubesock.rb

@@ -69,7 +69,11 @@ class Tubesock
 
   def close
     @close_handlers.each(&:call)
-    @socket.close unless @socket.closed?
+    if @socket.respond_to?(:closed?)
+      @socket.close unless @socket.closed?
+    else
+      @socket.close
+    end
   end
 
   def closed?
@@ -94,7 +98,11 @@ class Tubesock
   def each_frame
     framebuffer = WebSocket::Frame::Incoming::Server.new(version: @version)
     while IO.select([@socket])
-      data, addrinfo = @socket.recvfrom(2000)
+      if @socket.respond_to?(:recvfrom)
+        data, addrinfo = @socket.recvfrom(2000)
+      else
+        data, addrinfo = @socket.readpartial(2000), @socket.peeraddr
+      end
       break if data.empty?
       framebuffer << data
       while frame = framebuffer.next

data/lib/tubesock/version.rb

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

data/test/test_helper.rb

@@ -14,8 +14,9 @@ end
 # Abstract away frames and sockets so that
 # tests can focus on message interaction
 class Tubesock::TestCase::TestInteraction
-  def initialize
+  def initialize(socket = nil)
     @client_socket, @server_socket = UNIXSocket.pair
+    @client_socket, @server_socket = socket, socket if socket
   end
 
   def handshake
@@ -70,7 +71,11 @@ class Tubesock::TestCase::TestInteraction
     tubesock = Tubesock.hijack(env)
     yield tubesock
     @thread = tubesock.listen
-    @client_socket.recvfrom 2000 # flush the handshake
+    if @client_socket.respond_to?(:recvfrom)
+      @client_socket.recvfrom 2000 # flush the handshake
+    else
+      @client_socket.readpartial 2000 # flush the handshake
+    end
     tubesock
   end
 end

data/test/tubesocket_puma_test.rb

@@ -0,0 +1,43 @@
+require_relative './test_helper'
+require 'puma'
+require 'puma/minissl'
+
+class MockEngine
+  def read; "data" end
+  def inject(data); end
+  def extract; end
+  def write(data)
+    1
+  end
+end
+
+class MockSocket < IO
+  def initialize; end
+  def close; end
+  def readpartial(len); end
+end
+
+class Puma::MiniSSL::Socket
+  def initialize
+    @socket = MockSocket.new
+    @engine = MockEngine.new
+  end
+end
+
+class TubesockPumaTest < Tubesock::TestCase
+  def test_integration
+    socket = Puma::MiniSSL::Socket.new
+
+    interaction = TestInteraction.new(socket)
+
+    proc { interaction.close }.must_raise NoMethodError
+
+    proc { interaction.read }.must_raise NoMethodError
+
+    interaction.tubesock do |tubesock|
+      proc { tubesock.close }.must_be_silent
+
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tubesock
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Nick Gauthier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -126,6 +126,7 @@ files:
 - lib/tubesock/version.rb
 - test/test_helper.rb
 - test/tubesock_test.rb
+- test/tubesocket_puma_test.rb
 - tubesock.gemspec
 homepage: http://github.com/ngauthier/tubesock
 licenses:
@@ -147,10 +148,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Handle websocket connections via Rack and Rails 4 using concurrency
 test_files:
 - test/test_helper.rb
 - test/tubesock_test.rb
+- test/tubesocket_puma_test.rb