websocket-client-simple 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c77561031da6ed2b7c158b90a359714d86c9c4c
-  data.tar.gz: 5e3db2931d4fab5c52438b3dc4373ba69b604bac
+  metadata.gz: b4ea337a582d882d5b994ae917ead5f8bb7d8366
+  data.tar.gz: c5ba071b095d13b4d2e0a94b5d005f5bb0d40e83
 SHA512:
-  metadata.gz: 515e8e4fe7f48323186324b6271a25febe05a6b0e52f6e132fef21ff4caaf81dc7c7130ff1eb45c5c08aa34d89778f183ed61ce4ec51a991cba8812c3e5a58e1
-  data.tar.gz: 6b681526e86e0812d3c4bfdac5b23acac4584b367fc9cafae92915bb9798b4aae719d9d074b958fe5852612fe0d3184cdf54c25d8b0696308e433d2c9499a74c
+  metadata.gz: ce374970d37e555925969ef5bb6c126c5020e0fdd3743d6a996604802b1751620819984c40efc7bb8d5749fc25e23930c5f9ec8f88ad57577623a423cb3d3773
+  data.tar.gz: 60453f1fcb3df824ffcbc88f099d38dbb2576c8a4b14a208d44ce2157bed2b3f2f23d0236e041410b62188c099d9f46506ac5d742a445b1225b557fe45397210

data/.travis.yml

@@ -2,4 +2,3 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - jruby-head

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.1.0 2014-05-08
+
+* add accessor Client#handshake  #5
+* bugfix socket reading
+
 === 0.0.9 2014-04-03
 
 * emit "error" in receive thread

data/lib/websocket-client-simple/client.rb

@@ -8,13 +8,13 @@ module WebSocket
 
       class Client
         include EventEmitter
-        attr_reader :url
+        attr_reader :url, :handshake
 
         def initialize(url)
           @url = url
           uri = URI.parse url
           @socket = TCPSocket.new(uri.host, uri.port || 80)
-          @hs = ::WebSocket::Handshake::Client.new :url => url
+          @handshake = ::WebSocket::Handshake::Client.new :url => url
           @handshaked = false
           frame = ::WebSocket::Frame::Incoming::Client.new
           @closed = false
@@ -26,10 +26,10 @@ module WebSocket
           @thread = Thread.new do
             while !@closed do
               begin
-                recv_data = @socket.getc
-                if !@handshaked
-                  @hs << recv_data
-                  if @hs.finished?
+                next unless recv_data = @socket.getc
+                unless @handshaked
+                  @handshake << recv_data
+                  if @handshake.finished?
                     @handshaked = true
                     emit :open
                   end
@@ -45,13 +45,13 @@ module WebSocket
             end
           end
 
-          @socket.write @hs.to_s
+          @socket.write @handshake.to_s
         end
 
         def send(data, opt={:type => :text})
           return if !@handshaked or @closed
           type = opt[:type]
-          frame = ::WebSocket::Frame::Outgoing::Client.new(:data => data, :type => type, :version => @hs.version)
+          frame = ::WebSocket::Frame::Outgoing::Client.new(:data => data, :type => type, :version => @handshake.version)
           begin
             @socket.write frame.to_s
           rescue Errno::EPIPE => e
@@ -70,7 +70,7 @@ module WebSocket
         end
 
         def open?
-          !@closed
+          @handshake.finished? and !@closed
         end
 
       end

data/lib/websocket-client-simple/version.rb

@@ -1,7 +1,7 @@
 module WebSocket
   module Client
     module Simple
-      VERSION = "0.0.9"
+      VERSION = "0.1.0"
     end
   end
 end

data/test/test_websocket_client_simple.rb

@@ -33,7 +33,9 @@ class TestWebSocketClientSimple < MiniTest::Test
       EM::add_timer 1 do
         url = "ws://localhost:#{port}"
         client1 = WebSocket::Client::Simple.connect url
+        assert_equal client1.open?, false
         client2 = WebSocket::Client::Simple.connect url
+        assert_equal client2.open?, false
 
         client1.on :message do |msg|
           res1.push msg
@@ -58,6 +60,8 @@ class TestWebSocketClientSimple < MiniTest::Test
         end
 
         EM::add_timer 3 do
+          assert_equal client1.open?, true
+          assert_equal client2.open?, true
           client1.close
           client2.close
           EM::stop_event_loop
@@ -65,12 +69,12 @@ class TestWebSocketClientSimple < MiniTest::Test
       end
     }
 
-    assert msgs.size == res1.size
-    assert msgs.size == res2.size
+    assert_equal msgs.size, res1.size
+    assert_equal msgs.size, res2.size
 
     msgs.each_with_index do |msg,i|
-      assert msg == res1[i].to_s
-      assert msg == res2[i].to_s
+      assert_equal msg, res1[i].to_s
+      assert_equal msg, res2[i].to_s
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: websocket-client-simple
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler