tubesock 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a5fc91c6e49797a1595e75ac1fa8425259370a3
-  data.tar.gz: 3af86ddcbe0fe0cf80aac51d25f27420ca2bb444
+  metadata.gz: 641bbc3cadfe10190a32eba8504b498fd2bbd080
+  data.tar.gz: 715eb149abbe8e475ce89ef8556d4e05586231a7
 SHA512:
-  metadata.gz: b6fa82ff09d335de5942b2ee415a328c15a40ba579f82f1f1293dd6c40de9edb100eb633384d1debb7cde05c017ff69239e9ceff8da37bf8f8c583a9338757aa
-  data.tar.gz: 3b5050954b14fafc27df74ddaabb5a34f3e8399db95e3d256f5b71c14385f803a28a552a026fd679c2c3ec5e43408b9b0c3881806343e1dd2cc5129edf9d3f1f
+  metadata.gz: a20f7fbb5814018a5faa5b882e80d3701db747ca8b7808933a1cb707a7df2095ddf788067196ddd98ab202607b37dd2fd3c71802e11c022b8be0913b2552381d
+  data.tar.gz: 37db65ca33059d3af8b9a2c5d06cf44e2cc7ffbc8abdb5c8dae76feebe3928bb87ab17fc28ee0512cec591e618104f362fee065d9cc082e6a33cc8466ea2d281

data/Gemfile

@@ -1,5 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in tubesock.gemspec
-gem "websocket", github: "imanel/websocket-ruby", ref: "49cc8e00eca912726c9980ccb6c927afd718c2de"
 gemspec

data/README.md

@@ -4,7 +4,7 @@
 
 Tubesock lets you use websockets from rack and rails 4+ by using Rack's new hijack interface to access the underlying socket connection.
 
-In contrast to other websocket libraries, Tubesock does not use a reactor (read: no eventmachine). Instead, it leverages Rails 4's new full-stack concurrency support. Note that this means you must use a concurrent server. We recommend Puma.
+In contrast to other websocket libraries, Tubesock does not use a reactor (read: no eventmachine). Instead, it leverages Rails 4's new full-stack concurrency support. Note that this means you must use a concurrent server. We recommend Puma > 2.0.0.
 
 ## Installation
 
@@ -12,9 +12,6 @@ Add this line to your application's Gemfile:
 
 ```ruby
 gem 'tubesock'
-# currently, the ability to setup a websocket from rack is only
-# available on my fork. If/when the PR is merged this will become a gem dependency
-gem 'websocket', github: "ngauthier/websocket-ruby"
 ```
 
 And then execute:
@@ -59,19 +56,17 @@ class ChatController < ApplicationController
   def chat
     hijack do |tubesock|
       tubesock.onopen do
-        tubesock.send_data message: "Hello, friend"
+        tubesock.send_data "Hello, friend"
       end
 
       tubesock.onmessage do |data|
-        tubesock.send_data message: "You said: #{data[:message]}"
+        tubesock.send_data "You said: #{data}"
       end
     end
   end
 end
 ```
 
-For a full example, check out [Tubesock Example](http://github.com/ngauthier/tubesock-example).
-
 ## Contributing
 
 1. Fork it

data/lib/tubesock.rb

@@ -36,7 +36,7 @@ class Tubesock
   def send_data data, type = :text
     frame = WebSocket::Frame::Outgoing::Server.new(
       version: @version,
-      data: JSON.dump(data),
+      data: data,
       type: type
     )
     @socket.write frame.to_s
@@ -61,7 +61,7 @@ class Tubesock
       Thread.current.abort_on_exception = true
       @open_handlers.each(&:call)
       each_frame do |data|
-        @message_handlers.each{|h| h.call(JSON.load(data)) }
+        @message_handlers.each{|h| h.call(data) }
       end
       @close_handlers.each(&:call)
       @socket.close

data/lib/tubesock/version.rb

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

data/test/test_helper.rb

@@ -42,10 +42,10 @@ class Tubesock::TestCase::TestInteraction
     @client_socket << message
   end
 
-  def write(message)
+  def write(data)
     write_raw WebSocket::Frame::Outgoing::Client.new(
       version: version,
-      data:    JSON.dump(message),
+      data:    data,
       type:    :text
     ).to_s
   end
@@ -54,7 +54,7 @@ class Tubesock::TestCase::TestInteraction
     framebuffer = WebSocket::Frame::Incoming::Client.new(version: version)
     data, addrinfo = @client_socket.recvfrom(2000)
     framebuffer << data
-    JSON.load(framebuffer.next.data)
+    framebuffer.next.data
   end
 
   def join

data/test/tubesock_test.rb

@@ -25,13 +25,13 @@ class TubesockTest < Tubesock::TestCase
       tubesock.onclose &closed
 
       tubesock.onmessage do |message|
-        tubesock.send_data message: "Hello #{message["name"]}"
+        tubesock.send_data "Hello #{message}"
       end
     end
 
-    interaction.write name: "Nick"
+    interaction.write "Nick"
     data = interaction.read
-    data["message"].must_equal "Hello Nick"
+    data.must_equal "Hello Nick"
     interaction.close
 
     opened.called.must_equal true

data/tubesock.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rack", "> 1.5.0"
-  spec.add_dependency "websocket" # TODO specify the new version when my PR is merged
+  spec.add_dependency "rack", ">= 1.5.0"
+  spec.add_dependency "websocket", ">= 1.1.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: tubesock
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Nick Gauthier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
 - !ruby/object:Gem::Dependency
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Handle websocket connections via Rack and Rails 4 using concurrency