em-websocket-request 0.0.4 → 0.0.5

data/lib/em-websocket-request.rb

@@ -1,5 +1,6 @@
 require 'em-http-request'
 require "em-ws-request/version"
+require "em-ws-request/options"
 require "em-ws-request/client"
 require "em-ws-request/wrapper"
 

data/lib/em-ws-request/client.rb

@@ -1,7 +1,7 @@
 module EventMachine
   class WebsocketConnection < HttpConnection
     def setup_request(method, options = {}, c = nil)
-      c ||= WebsocketClient.new(self, HttpClientOptions.new(@uri, options, method))
+      c ||= WebsocketClient.new(self, WsClientOptions.new(@uri, options, method))
       @deferred ? activate_connection(c) : finalize_request(c)
       c
     end
@@ -30,7 +30,7 @@ module EventMachine
   end
 
   class WebsocketClient < HttpClient
-    PROTOCOL_VERSION = '8'
+    PROTOCOL_VERSION = '13'
 
     def initialize(conn, options)
       super(conn, options)

data/lib/em-ws-request/options.rb

@@ -0,0 +1,5 @@
+module EventMachine
+  class WsClientOptions < HttpClientOptions
+    def ssl?; @uri.scheme == "wss" || super; end
+  end
+end

data/lib/em-ws-request/vendor/web-socket-ruby/lib/web_socket.rb

@@ -300,10 +300,16 @@ class WebSocket
         @header[$1] = $2
         @header[$1.downcase()] = $2
       end
+      if !@header["upgrade"]
+        raise(WebSocket::Error, "Upgrade header is missing")
+      end
       if !(@header["upgrade"] =~ /\AWebSocket\z/i)
         raise(WebSocket::Error, "invalid Upgrade: " + @header["upgrade"])
       end
-      if !(@header["connection"] =~ /\AUpgrade\z/i)
+      if !@header["connection"]
+        raise(WebSocket::Error, "Connection header is missing")
+      end
+      if @header["connection"].split(/,/).grep(/\A\s*Upgrade\s*\z/i).empty?
         raise(WebSocket::Error, "invalid Connection: " + @header["connection"])
       end
     end

data/lib/em-ws-request/version.rb

@@ -1,3 +1,3 @@
 module EventMachine
-  WS_REQUEST_VERSION = "0.0.4"
+  WS_REQUEST_VERSION = "0.0.5"
 end

data/lib/em-ws-request/wrapper.rb

@@ -6,6 +6,7 @@ module EventMachine
       @handshaked = true
       @client = client
       @web_socket_version = version
+      @read_buffer = ''
     end
 
     def send_frame(opcode, data, mask = true)
@@ -18,14 +19,18 @@ module EventMachine
     end
 
     def receive(data)
-      @incoming_data = data
+      @read_buffer << data if data
       super()
     end
 
     def read(num_bytes)
-      str = @incoming_data.slice(0, num_bytes)
-      @incoming_data = @incoming_data[num_bytes..-1]
-      return str
+      if(@read_buffer.size < num_bytes)
+        raise EOFError
+      else
+        str = @read_buffer.slice(0, num_bytes)
+        @read_buffer = @read_buffer[num_bytes..-1]
+        return str
+      end
     end
 
     # Called on a CLOSE frame

data/spec/websocket_spec.rb

@@ -94,11 +94,11 @@ describe EventMachine::WebsocketRequest do
         http = websocket_test_request
         http.errback  { failed(http) }
         http.callback { http.send(MSG) }
+        http.disconnect { EventMachine.stop }
         http.stream { |chunk|
+          # FIXME We should not receive a chunk!
           chunk.should be_nil
-          EventMachine.stop
         }
-
       }
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-websocket-request
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-02 00:00:00.000000000 Z
+date: 2012-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70226843904280 !ruby/object:Gem::Requirement
+  requirement: &70159723186380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70226843904280
+  version_requirements: *70159723186380
 description: EventMachine WebSocket client
 email:
 - mrykov@gmail.com
@@ -36,6 +36,7 @@ files:
 - em-websocket-request.gemspec
 - lib/em-websocket-request.rb
 - lib/em-ws-request/client.rb
+- lib/em-ws-request/options.rb
 - lib/em-ws-request/version.rb
 - lib/em-ws-request/wrapper.rb
 - spec/websocket_spec.rb