faye 0.6.4 → 0.6.5

data/spec/ruby/web_socket/protocol8_parser_spec.rb

@@ -0,0 +1,120 @@
+# encoding=utf-8
+
+require "spec_helper"
+
+describe Faye::WebSocket::Protocol8Parser do
+  include EncodingHelper
+  
+  before do
+    @web_socket = mock Faye::WebSocket
+    @parser = Faye::WebSocket::Protocol8Parser.new(@web_socket)
+  end
+  
+  describe :parse do
+    let(:mask) { (1..4).map { rand 255 } }
+    
+    def mask_message(*bytes)
+      output = []
+      bytes.each_with_index do |byte, i|
+        output[i] = byte ^ mask[i % 4]
+      end
+      output
+    end
+    
+    it "parses unmasked text frames" do
+      @web_socket.should_receive(:receive).with("Hello")
+      parse [0x81, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f]
+    end
+    
+    it "parses fragmented text frames" do
+      @web_socket.should_receive(:receive).with("Hello")
+      parse [0x01, 0x03, 0x48, 0x65, 0x6c]
+      parse [0x80, 0x02, 0x6c, 0x6f]
+    end
+    
+    it "parses masked text frames" do
+      @web_socket.should_receive(:receive).with("Hello")
+      parse [0x81, 0x85] + mask + mask_message(0x48, 0x65, 0x6c, 0x6c, 0x6f)
+    end
+    
+    it "parses masked fragmented text frames" do
+      @web_socket.should_receive(:receive).with("Hello")
+      parse [0x01, 0x81] + mask + mask_message(0x48)
+      parse [0x80, 0x84] + mask + mask_message(0x65, 0x6c, 0x6c, 0x6f)
+    end
+    
+    it "closes the socket if the frame has an unrecognized opcode" do
+      @web_socket.should_receive(:close).with(:protocol_error)
+      parse [0x83, 0x00]
+    end
+    
+    it "parses unmasked multibyte text frames" do
+      @web_socket.should_receive(:receive).with(encode "Apple = ")
+      parse [0x81, 0x0b, 0x41, 0x70, 0x70, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0xef, 0xa3, 0xbf]
+    end
+    
+    it "parses fragmented multibyte text frames" do
+      @web_socket.should_receive(:receive).with(encode "Apple = ")
+      parse [0x01, 0x0a, 0x41, 0x70, 0x70, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0xef, 0xa3]
+      parse [0x80, 0x01, 0xbf]
+    end
+    
+    it "parses masked multibyte text frames" do
+      @web_socket.should_receive(:receive).with(encode "Apple = ")
+      parse [0x81, 0x8b] + mask + mask_message(0x41, 0x70, 0x70, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0xef, 0xa3, 0xbf)
+    end
+    
+    it "parses masked fragmented multibyte text frames" do
+      @web_socket.should_receive(:receive).with(encode "Apple = ")
+      parse [0x01, 0x8a] + mask + mask_message(0x41, 0x70, 0x70, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0xef, 0xa3)
+      parse [0x80, 0x81] + mask + mask_message(0xbf)
+    end
+    
+    it "parses unmasked medium-length text frames" do
+      @web_socket.should_receive(:receive).with("Hello" * 40)
+      parse [0x81, 0x7e, 0x00, 0xc8] + [0x48, 0x65, 0x6c, 0x6c, 0x6f] * 40
+    end
+    
+    it "parses masked medium-length text frames" do
+      @web_socket.should_receive(:receive).with("Hello" * 40)
+      parse [0x81, 0xfe, 0x00, 0xc8] + mask + mask_message(*([0x48, 0x65, 0x6c, 0x6c, 0x6f] * 40))
+    end
+    
+    it "replies to pings with a pong" do
+      @web_socket.should_receive(:send).with("OHAI", :pong)
+      parse [0x89, 0x04, 0x4f, 0x48, 0x41, 0x49]
+    end
+  end
+  
+  describe :frame do
+    it "returns the given string formatted as a WebSocket frame" do
+      bytes(@parser.frame "Hello").should == [0x81, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f]
+    end
+    
+    it "encodes multibyte characters correctly" do
+      message = encode "Apple = "
+      bytes(@parser.frame message).should == [0x81, 0x0b, 0x41, 0x70, 0x70, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0xef, 0xa3, 0xbf]
+    end
+    
+    it "encodes medium-length strings using extra length bytes" do
+      message = "Hello" * 40
+      bytes(@parser.frame message).should == [0x81, 0x7e, 0x00, 0xc8] + [0x48, 0x65, 0x6c, 0x6c, 0x6f] * 40
+    end
+    
+    it "encodes long strings using extra length bytes" do
+      message = "Hello" * 13108
+      bytes(@parser.frame message).should == [0x81, 0x7f] +
+                                             [0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04] +
+                                             [0x48, 0x65, 0x6c, 0x6c, 0x6f] * 13108
+    end
+    
+    it "encodes close frames with an error code" do
+      frame = @parser.frame "Hello", :close, :protocol_error
+      bytes(frame).should == [0x88, 0x07, 0x03, 0xea, 0x48, 0x65, 0x6c, 0x6c, 0x6f]
+    end
+    
+    it "encodes pong frames" do
+      bytes(@parser.frame '', :pong).should == [0x8a, 0x00]
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,3 +3,22 @@ dir = File.expand_path(File.dirname(__FILE__))
 require dir + '/../lib/faye'
 require dir + '/../vendor/em-rspec/lib/em-rspec'
 require 'rack/test'
+
+module EncodingHelper
+  def encode(message)
+    message.respond_to?(:force_encoding) ?
+        message.force_encoding("UTF-8") :
+        message
+  end
+  
+  def bytes(string)
+    count = string.respond_to?(:bytes) ? string.bytes.count : string.size
+    (0...count).map do |i|
+      string.respond_to?(:getbyte) ? string.getbyte(i) : string[i]
+    end
+  end
+  
+  def parse(bytes)
+    @parser.parse(bytes.map { |b| b.chr } * '')
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: faye
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors: 
 - James Coglan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-17 00:00:00 Z
+date: 2011-08-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -189,6 +189,7 @@ files:
 - spec/ruby/server/disconnect_spec.rb
 - spec/ruby/server/unsubscribe_spec.rb
 - spec/ruby/server/connect_spec.rb
+- spec/ruby/server/integration_spec.rb
 - spec/ruby/rack_adapter_spec.rb
 - spec/ruby/client_spec.rb
 - spec/ruby/server_spec.rb
@@ -196,6 +197,8 @@ files:
 - spec/ruby/transport_spec.rb
 - spec/ruby/engine_spec.rb
 - spec/ruby/faye_spec.rb
+- spec/ruby/web_socket/draft75_parser_spec.rb
+- spec/ruby/web_socket/protocol8_parser_spec.rb
 - spec/ruby/grammar_spec.rb
 - spec/node.js
 - spec/javascript/faye_spec.js
@@ -203,6 +206,7 @@ files:
 - spec/javascript/server/subscribe_spec.js
 - spec/javascript/server/extensions_spec.js
 - spec/javascript/server/unsubscribe_spec.js
+- spec/javascript/server/integration_spec.js
 - spec/javascript/server/connect_spec.js
 - spec/javascript/server/handshake_spec.js
 - spec/javascript/server_spec.js
@@ -211,6 +215,8 @@ files:
 - spec/javascript/channel_spec.js
 - spec/javascript/node_adapter_spec.js
 - spec/javascript/client_spec.js
+- spec/javascript/web_socket/protocol8parser_spec.js
+- spec/javascript/web_socket/draft75parser_spec.js
 - spec/javascript/grammar_spec.js
 - spec/testswarm
 - spec/spec_helper.rb
@@ -223,6 +229,7 @@ files:
 - lib/faye/mixins/logging.rb
 - lib/faye/mixins/publisher.rb
 - lib/faye/mixins/timeouts.rb
+- lib/faye/thin_extensions.rb
 - lib/faye/transport/http.rb
 - lib/faye/transport/local.rb
 - lib/faye/transport/transport.rb
@@ -237,7 +244,6 @@ files:
 - lib/faye/engines/memory.rb
 - lib/faye/engines/redis.rb
 - lib/faye/engines/base.rb
-- lib/thin_extensions.rb
 - lib/faye.rb
 homepage: http://faye.jcoglan.com
 licenses: []