faye-websocket 0.4.6 → 0.4.7

data/lib/faye/websocket/hybi_parser.rb

@@ -50,7 +50,7 @@ module Faye
         @masking   = options[:masking]
         @protocols = options[:protocols]
         @protocols = @protocols.split(/\s*,\s*/) if String === @protocols
-        
+
         @ping_callbacks = {}
       end
 
@@ -89,11 +89,11 @@ module Faye
       def create_handshake
         Handshake.new(@socket.uri, @protocols)
       end
-      
+
       def open?
         true
       end
-      
+
       def parse(data)
         @reader.put(data.bytes.to_a)
         buffer = true
@@ -178,7 +178,7 @@ module Faye
 
         WebSocket.encode(frame)
       end
-      
+
       def ping(message = '', &callback)
         @ping_callbacks[message] = callback if callback
         @socket.send(message, :ping)

data/lib/faye/websocket/utf8_match.rb

@@ -1,8 +1,8 @@
 module Faye
   class WebSocket
-    
+
     # http://www.w3.org/International/questions/qa-forms-utf-8.en.php
     UTF8_MATCH = /^([\x00-\x7F]|[\xC2-\xDF][\x80-\xBF]|\xE0[\xA0-\xBF][\x80-\xBF]|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}|\xED[\x80-\x9F][\x80-\xBF]|\xF0[\x90-\xBF][\x80-\xBF]{2}|[\xF1-\xF3][\x80-\xBF]{3}|\xF4[\x80-\x8F][\x80-\xBF]{2})*$/
-    
+
   end
 end

data/spec/faye/websocket/client_spec.rb

@@ -9,15 +9,15 @@ WebSocketSteps = EM::RSpec.async_steps do
     @port = port
     EM.add_timer(0.1, &callback)
   end
-  
+
   def stop(&callback)
     @server.stop
     EM.next_tick(&callback)
   end
-  
+
   def open_socket(url, protocols, &callback)
     done = false
-    
+
     resume = lambda do |open|
       unless done
         done = true
@@ -25,13 +25,13 @@ WebSocketSteps = EM::RSpec.async_steps do
         callback.call
       end
     end
-    
+
     @ws = Faye::WebSocket::Client.new(url, protocols)
-    
+
     @ws.onopen  = lambda { |e| resume.call(true) }
     @ws.onclose = lambda { |e| resume.call(false) }
   end
-  
+
   def close_socket(&callback)
     @ws.onclose = lambda do |e|
       @open = false
@@ -39,37 +39,37 @@ WebSocketSteps = EM::RSpec.async_steps do
     end
     @ws.close
   end
-  
+
   def check_open(&callback)
     @open.should == true
     callback.call
   end
-  
+
   def check_closed(&callback)
     @open.should == false
     callback.call
   end
-  
+
   def check_protocol(protocol, &callback)
     @ws.protocol.should == protocol
     callback.call
   end
-  
+
   def listen_for_message(&callback)
     @ws.add_event_listener('message', lambda { |e| @message = e.data })
     callback.call
   end
-  
+
   def send_message(message, &callback)
     @ws.send(message)
     EM.add_timer(0.1, &callback)
   end
-  
+
   def check_response(message, &callback)
     @message.should == message
     callback.call
   end
-  
+
   def check_no_response(&callback)
     @message.should == nil
     callback.call
@@ -79,61 +79,56 @@ end
 describe Faye::WebSocket::Client do
   next if Faye::WebSocket.jruby?
   include WebSocketSteps
-  
+
   let(:protocols)      { ["foo", "echo"]       }
   let(:plain_text_url) { "ws://0.0.0.0:8000/"  }
   let(:secure_url)     { "wss://0.0.0.0:8000/" }
-  
-  before do
-    Thread.new { EM.run }
-    sleep(0.1) until EM.reactor_running?
-  end
-  
+
   shared_examples_for "socket client" do
     it "can open a connection" do
       open_socket(socket_url, protocols)
       check_open
       check_protocol("echo")
     end
-    
+
     it "cannot open a connection to the wrong host" do
       open_socket(blocked_url, protocols)
       check_closed
     end
-    
+
     it "cannot open a connection with unacceptable protocols" do
       open_socket(socket_url, ["foo"])
       check_closed
     end
-    
+
     it "can close the connection" do
       open_socket(socket_url, protocols)
       close_socket
       check_closed
     end
-    
+
     describe "in the OPEN state" do
       before { open_socket(socket_url, protocols) }
-      
+
       it "can send and receive messages" do
         listen_for_message
         send_message "I expect this to be echoed"
         check_response "I expect this to be echoed"
       end
-      
+
       it "sends numbers as strings" do
         listen_for_message
         send_message 13
         check_response "13"
       end
     end
-    
+
     describe "in the CLOSED state" do
       before do
         open_socket(socket_url, protocols)
         close_socket
       end
-      
+
       it "cannot send and receive messages" do
         listen_for_message
         send_message "I expect this to be echoed"
@@ -141,38 +136,26 @@ describe Faye::WebSocket::Client do
       end
     end
   end
-  
+
   describe "with a plain-text Thin server" do
     let(:socket_url)  { plain_text_url }
     let(:blocked_url) { secure_url }
-    
+
     before { server 8000, :thin, false }
-    after  { sync ; stop }
-    
-    it_should_behave_like "socket client"
-  end
-  
-  describe "with a plain-text Rainbows server" do
-    next if Faye::WebSocket.rbx?
-    
-    let(:socket_url)  { plain_text_url }
-    let(:blocked_url) { secure_url }
-    
-    before { server 8000, :rainbows, false }
-    after  { sync ; stop }
-    
+    after  { stop }
+
     it_should_behave_like "socket client"
   end
-  
+
   describe "with a secure Thin server" do
     next if Faye::WebSocket.rbx?
-    
+
     let(:socket_url)  { secure_url }
     let(:blocked_url) { plain_text_url }
-    
+
     before { server 8000, :thin, true }
-    after  { sync ; stop }
-    
+    after  { stop }
+
     it_should_behave_like "socket client"
   end
 end

data/spec/faye/websocket/draft75_parser_examples.rb

@@ -7,38 +7,38 @@ shared_examples_for "draft-75 parser" do
     @web_socket.should_receive(:receive).with("Hello")
     parse [0x00, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0xff]
   end
-  
+
   it "parses multiple frames from the same packet" do
     @web_socket.should_receive(:receive).with("Hello").exactly(2)
     parse [0x00, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0xff, 0x00, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0xff]
   end
-  
+
   it "parses text frames beginning 0x00-0x7F" do
     @web_socket.should_receive(:receive).with("Hello")
     parse [0x66, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0xff]
   end
-  
+
   it "ignores frames with a length header" do
     @web_socket.should_not_receive(:receive)
     parse [0x80, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f]
   end
-  
+
   it "parses text following an ignored block" do
     @web_socket.should_receive(:receive).with("Hello")
     parse [0x80, 0x02, 0x48, 0x65, 0x00, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0xff]
   end
-  
+
   it "parses multibyte text frames" do
     @web_socket.should_receive(:receive).with(encode "Apple = ")
     parse [0x00, 0x41, 0x70, 0x70, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0xef, 0xa3, 0xbf, 0xff]
   end
-  
+
   it "parses frames received in several packets" do
     @web_socket.should_receive(:receive).with(encode "Apple = ")
     parse [0x00, 0x41, 0x70, 0x70, 0x6c, 0x65]
     parse [0x20, 0x3d, 0x20, 0xef, 0xa3, 0xbf, 0xff]
   end
-  
+
   it "parses fragmented frames" do
     @web_socket.should_receive(:receive).with("Hello")
     parse [0x00, 0x48, 0x65, 0x6c]

data/spec/faye/websocket/draft75_parser_spec.rb

@@ -4,21 +4,21 @@ require "spec_helper"
 
 describe Faye::WebSocket::Draft75Parser do
   include EncodingHelper
-  
+
   before do
     @web_socket = mock Faye::WebSocket
     @parser = Faye::WebSocket::Draft75Parser.new(@web_socket)
   end
-  
+
   describe :parse do
     it_should_behave_like "draft-75 parser"
   end
-  
+
   describe :frame do
     it "returns the given string formatted as a WebSocket frame" do
       bytes(@parser.frame "Hello").should == [0x00, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0xff]
     end
-    
+
     it "encodes multibyte characters correctly" do
       message = encode "Apple = "
       bytes(@parser.frame message).should == [0x00, 0x41, 0x70, 0x70, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0xef, 0xa3, 0xbf, 0xff]

data/spec/faye/websocket/draft76_parser_spec.rb

@@ -4,27 +4,27 @@ require "spec_helper"
 
 describe Faye::WebSocket::Draft76Parser do
   include EncodingHelper
-  
+
   before do
     @web_socket = mock Faye::WebSocket
     @parser = Faye::WebSocket::Draft76Parser.new(@web_socket)
     @parser.instance_eval { @handshake_complete = true }
   end
-  
+
   describe :parse do
     it_should_behave_like "draft-75 parser"
-    
+
     it "closes the socket if a close frame is received" do
       @web_socket.should_receive(:close)
       parse [0xFF, 0x00]
     end
   end
-  
+
   describe :frame do
     it "returns the given string formatted as a WebSocket frame" do
       bytes(@parser.frame "Hello").should == [0x00, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0xff]
     end
-    
+
     it "encodes multibyte characters correctly" do
       message = encode "Apple = "
       bytes(@parser.frame message).should == [0x00, 0x41, 0x70, 0x70, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0xef, 0xa3, 0xbf, 0xff]

data/spec/spec_helper.rb

@@ -18,11 +18,11 @@ module EncodingHelper
         message.force_encoding("UTF-8") :
         message
   end
-  
+
   def bytes(string)
     string.bytes.to_a
   end
-  
+
   def parse(bytes)
     @parser.parse(bytes.pack('C*'))
   end
@@ -36,7 +36,7 @@ class EchoServer
     end
     socket.rack_response
   end
-  
+
   def listen(port, backend, ssl = false)
     case backend
     when :rainbows
@@ -60,7 +60,7 @@ class EchoServer
       end
     end
   end
-  
+
   def stop
     @server.stop
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faye-websocket
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.12.0
+- !ruby/object:Gem::Dependency
+  name: progressbar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -64,17 +80,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rainbows
   requirement: !ruby/object:Gem::Requirement