em-websocket-request 0.0.6 → 0.0.7

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

@@ -10,8 +10,9 @@ module EventMachine
       super
       @p.on_message_complete = proc do
         if not client.continue?
-          if client.state == :websocket
+          if client.state == :upgrade
             client.state = :stream
+            client.succeed
           else
             client.state = :finished
             client.on_request_complete
@@ -41,7 +42,7 @@ module EventMachine
 
     def send(data, frame_type = :text)
       @connection = @conn
-      if state == :stream || state == :websocket # FIXME
+      if state == :stream
         @wswrapper.send_frame(frame_type, data)
       end
     end
@@ -85,8 +86,7 @@ module EventMachine
 
           fail "websocket handshake failed (mismatched key)"
         else
-          @state = :websocket
-          succeed
+          @state = :upgrade
         end
       end
     end
@@ -97,7 +97,7 @@ module EventMachine
     end
 
     def unbind(reason = nil)
-      if state == :stream || state == :websocket # FIXME
+      if state == :stream
         @disconnect.call(self) if @disconnect
         on_error(reason) # TODO: Should we really barf on unbind?
       else

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

@@ -300,16 +300,10 @@ 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"]
-        raise(WebSocket::Error, "Connection header is missing")
-      end
-      if @header["connection"].split(/,/).grep(/\A\s*Upgrade\s*\z/i).empty?
+      if !(@header["connection"] =~ /\AUpgrade\z/i)
         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.6"
+  WS_REQUEST_VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-websocket-request
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70323345919160 !ruby/object:Gem::Requirement
+  requirement: &70163894954540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70323345919160
+  version_requirements: *70163894954540
 description: EventMachine WebSocket client
 email:
 - mrykov@gmail.com