net-ws 0.0.2 → 0.0.3

data/lib/net/ws/version.rb

@@ -1,5 +1,6 @@
+# -*- coding: utf-8 -*-
 module Net
   module Ws
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/net/ws.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require "net/http"
 require "uri"
 require "base64"
@@ -145,7 +146,9 @@ module Net
     end
 
     def extract_unmasked_payload(length)
-      @socket.read(length)
+      # Use force_encoding here, as there's no way to know what's coming in
+      # from the socket, and ruby will assume ASCII-8BIT.
+      @socket.read(length).force_encoding("UTF-8")
     end
 
     # Control frames are identified by opcodes where the most significant bit
@@ -211,16 +214,16 @@ module Net
 
       if payload.nil?
         @socket.write [mask_flag].pack("C")
-      elsif payload.size < LENGTH_IS_16BIT
-        @socket.write [mask_flag + payload.size].pack("C")
-      elsif payload.size <= UNSIGNED_16BIT_MAX
+      elsif payload.bytes.count < LENGTH_IS_16BIT
+        @socket.write [mask_flag + payload.bytes.count].pack("C")
+      elsif payload.bytes.count <= UNSIGNED_16BIT_MAX
         @socket.write [mask_flag + 126].pack("C")
-        @socket.write [payload.size].pack("n*")
-      elsif payload.size <= UNSIGNED_64BIT_MAX
-        @socket.write [mask_flag + 127, payload.size].pack("C")
-        @socket.write [payload.size].pack("n*")
+        @socket.write [payload.bytes.count].pack("n*")
+      elsif payload.bytes.count <= UNSIGNED_64BIT_MAX
+        @socket.write [mask_flag + 127, payload.bytes.count].pack("C")
+        @socket.write [payload.bytes.count].pack("n*")
       else
-        raise Error, "Unhandled payload size: #{payload.size.inspect}"
+        raise Error, "Unhandled payload size: #{payload.bytes.count.inspect}"
       end
     end
 
@@ -234,7 +237,7 @@ module Net
       return unless payload
 
       # FIXME we only support text for now
-      @socket.write(mask(payload.unpack("U*"), masking_key).pack("C*"))
+      @socket.write(mask(payload.unpack("C*"), masking_key).pack("C*"))
     end
 
     def mask(payload, key)

data/test/support/echo_server.py

@@ -0,0 +1,28 @@
+#!/usr/bin/env python2.7 -u -Wall
+
+import sys
+from twisted.internet import reactor
+from twisted.python import log
+from autobahn.websocket import WebSocketServerFactory, \
+                               WebSocketServerProtocol, \
+                               listenWS
+
+
+class EchoServerProtocol(WebSocketServerProtocol):
+
+   def onMessage(self, msg, binary):
+      self.sendMessage(msg, binary)
+
+   def onClose(self, *args):
+      reactor.stop()
+
+
+if __name__ == '__main__':
+   factory = WebSocketServerFactory("ws://localhost:9001", debug = True, debugCodePaths = True)
+   log.startLogging(sys.stdout)
+   factory.protocol = EchoServerProtocol
+   listenWS(factory)
+   print "Here we go"
+   sys.stdout.flush() # flush the line so that tests know we're up
+   sys.stderr.flush()
+   reactor.run()

data/test/test_helper.rb

@@ -1,3 +1,4 @@
-require "net/ws"
+require File.dirname(__FILE__) + "/../lib/net/ws"
+
 require "minitest/autorun"
 require "minitest/rg"

data/test/unit/ws_spec.rb

@@ -1,9 +1,49 @@
+# -*- coding: utf-8 -*-
 require File.expand_path("../test_helper", File.dirname(__FILE__))
+require "open3"
+
 
 describe Net::WS do
 
+  def with_echo_server(&block)
+    echo_server_path = File.expand_path("../support/echo_server.py",
+                                        File.dirname(__FILE__))
+
+    Open3.popen3(echo_server_path) do |stdin, stdout, stderr|
+      stdout.readline # the readline tells us the server is up
+      yield "localhost", 9001
+    end
+  end
+
   it "should be sane" do
     true.must_equal true
   end
 
+  it "can send and receive message" do
+    msg = "foo"
+
+    with_echo_server do |host, port|
+      @ws = Net::WS.new("ws://#{host}:#{port}")
+
+      @ws.open("/")
+      @ws.send_text(msg)
+      @ws.receive_message.must_equal(msg)
+      @ws.close
+    end
+  end
+
+  it "can send and receive a UTF-8 message" do
+    msg = "∆AIMON"
+
+    host = "localhost"; port = 9001
+    with_echo_server do |host, port|
+      @ws = Net::WS.new("ws://#{host}:#{port}")
+
+      @ws.open("/")
+      @ws.send_text(msg)
+      @ws.receive_message.must_equal(msg)
+      @ws.close
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ws
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -107,6 +107,7 @@ files:
 - lib/net/ws.rb
 - lib/net/ws/version.rb
 - net-ws.gemspec
+- test/support/echo_server.py
 - test/test_helper.rb
 - test/unit/ws_spec.rb
 homepage: ''
@@ -123,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 786680391120177558
+      hash: -2090776782556819373
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -132,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 786680391120177558
+      hash: -2090776782556819373
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -140,5 +141,6 @@ signing_key:
 specification_version: 3
 summary: A websocket client built on top of Net::HTTP.
 test_files:
+- test/support/echo_server.py
 - test/test_helper.rb
 - test/unit/ws_spec.rb