faye 0.6.8 → 0.7.0

data/spec/ruby/server_spec.rb

@@ -32,21 +32,10 @@ describe Faye::Server do
       server.process([{}, {"channel" => "invalid"}], false) { |r| response = r }
       response.should == []
     end
-
-    it "rejects unknown meta channels" do
-      response = nil
-      server.process([{"channel" => "/meta/p"}], false) { |r| response = r }
-      response.should == [
-        { "channel"     => "/meta/p",
-          "successful"  => false,
-          "error"       => "403:/meta/p:Forbidden channel"
-        }
-      ]
-    end
     
     it "routes single messages to appropriate handlers" do
       server.should_receive(:handshake).with(handshake, false)
-      server.process(handshake, false) {}
+      server.process(handshake, false)
     end
     
     it "routes a list of messages to appropriate handlers" do

data/spec/ruby/transport_spec.rb

@@ -9,13 +9,19 @@ describe Faye::Transport do
   
   describe :get do
     before do
-      Faye::Transport::Local.stub(:usable?).and_return(false)
-      Faye::Transport::Http.stub(:usable?).and_return(false)
+      Faye::Transport::Local.stub(:usable?).and_yield(false)
+      Faye::Transport::Http.stub(:usable?).and_yield(false)
     end
     
-    let(:transport)       { Faye::Transport.get(client, ["long-polling", "in-process"]) }
-    let(:local_transport) { Faye::Transport.get(client, ["in-process"]) }
-    let(:http_transport)  { Faye::Transport.get(client, ["long-polling"]) }
+    def get_transport(connection_types)
+      transport = nil
+      Faye::Transport.get(client, connection_types) { |t| transport = t }
+      transport
+    end
+    
+    let(:transport)       { get_transport ["long-polling", "in-process"] }
+    let(:local_transport) { get_transport ["in-process"] }
+    let(:http_transport)  { get_transport ["long-polling"] }
     
     describe "when no transport is usable" do
       it "raises an exception" do
@@ -25,7 +31,7 @@ describe Faye::Transport do
     
     describe "when a less preferred transport is usable" do
       before do
-        Faye::Transport::Http.stub(:usable?).and_return(true)
+        Faye::Transport::Http.stub(:usable?).and_yield(true)
       end
       
       it "returns a transport of the usable type" do
@@ -43,8 +49,8 @@ describe Faye::Transport do
     
     describe "when all transports are usable" do
       before do
-        Faye::Transport::Local.stub(:usable?).and_return(true)
-        Faye::Transport::Http.stub(:usable?).and_return(true)
+        Faye::Transport::Local.stub(:usable?).and_yield(true)
+        Faye::Transport::Http.stub(:usable?).and_yield(true)
       end
       
       it "returns the most preferred type" do

data/spec/ruby/web_socket/client_spec.rb

@@ -0,0 +1,126 @@
+# encoding=utf-8
+
+require "spec_helper"
+
+require "thin"
+Thin::Logging.silent = true
+
+WebSocketSteps = EM::RSpec.async_steps do
+  def server(port, &callback)
+    @adapter = Faye::RackAdapter.new(:mount => "/bayeux", :timeout => 25)
+    @adapter.listen(port)
+    @port = port
+    EM.add_timer(0.1, &callback)
+  end
+  
+  def stop(&callback)
+    @adapter.stop
+    EM.next_tick(&callback)
+  end
+  
+  def open_socket(url, &callback)
+    done = false
+    
+    resume = lambda do |open|
+      unless done
+        done = true
+        @open = true
+        callback.call
+      end
+    end
+    
+    @ws = Faye::WebSocket::Client.new(url)
+    
+    @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
+      callback.call
+    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 listen_for_message(&callback)
+    @ws.onmessage = lambda { |e| @message = e.data }
+    callback.call
+  end
+  
+  def send_sunscription(&callback)
+    @ws.send(JSON.dump "channel" => "/meta/subscribe", "subscription" => "/ws")
+    EM.add_timer(0.1, &callback)
+  end
+  
+  def check_subscribe_response(&callback)
+    JSON.parse(@message).should == [{ "channel"      => "/meta/subscribe",
+                                      "successful"   => false,
+                                      "error"        => "402:clientId:Missing required parameter",
+                                      "subscription" => "/ws"
+                                   }]
+    callback.call
+  end
+  
+  def check_no_response(&callback)
+    @message.should == nil
+    callback.call
+  end
+end
+
+describe Faye::WebSocket::Client do
+  include WebSocketSteps
+  
+  before do
+    Faye.ensure_reactor_running!
+    server 8000
+    sync
+  end
+  
+  after { sync ; stop }
+  
+  it "can open a connection" do
+    open_socket "ws://localhost:8000/bayeux"
+    check_open
+  end
+  
+  it "can close the connection" do
+    open_socket "ws://localhost:8000/bayeux"
+    close_socket
+    check_closed
+  end
+  
+  describe "in the OPEN state" do
+    before { open_socket "ws://localhost:8000/bayeux" }
+    
+    it "can send and receive messages" do
+      listen_for_message
+      send_sunscription
+      check_subscribe_response
+    end
+  end
+  
+  describe "in the CLOSED state" do
+    before do
+      open_socket "ws://localhost:8000/bayeux"
+      close_socket
+    end
+    
+    it "cannot send and receive messages" do
+      listen_for_message
+      send_sunscription
+      check_no_response
+    end
+  end
+end
+

data/spec/ruby/web_socket/protocol8_parser_spec.rb

@@ -26,6 +26,11 @@ describe Faye::WebSocket::Protocol8Parser do
       parse [0x81, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f]
     end
     
+    it "parses empty text frames" do
+      @web_socket.should_receive(:receive).with("")
+      parse [0x81, 0x00]
+    end
+    
     it "parses fragmented text frames" do
       @web_socket.should_receive(:receive).with("Hello")
       parse [0x01, 0x03, 0x48, 0x65, 0x6c]
@@ -37,6 +42,11 @@ describe Faye::WebSocket::Protocol8Parser do
       parse [0x81, 0x85] + mask + mask_message(0x48, 0x65, 0x6c, 0x6c, 0x6f)
     end
     
+    it "parses masked empty text frames" do
+      @web_socket.should_receive(:receive).with("")
+      parse [0x81, 0x80] + mask + mask_message()
+    end
+    
     it "parses masked fragmented text frames" do
       @web_socket.should_receive(:receive).with("Hello")
       parse [0x01, 0x81] + mask + mask_message(0x48)
@@ -44,10 +54,15 @@ describe Faye::WebSocket::Protocol8Parser do
     end
     
     it "closes the socket if the frame has an unrecognized opcode" do
-      @web_socket.should_receive(:close).with(:protocol_error)
+      @web_socket.should_receive(:close).with(1002, nil, false)
       parse [0x83, 0x00]
     end
     
+    it "closes the socket if a close frame is received" do
+      @web_socket.should_receive(:close).with(1000, "Hello", false)
+      parse [0x88, 0x07, 0x03, 0xe8, 0x48, 0x65, 0x6c, 0x6c, 0x6f]
+    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]
@@ -81,7 +96,7 @@ describe Faye::WebSocket::Protocol8Parser do
     end
     
     it "replies to pings with a pong" do
-      @web_socket.should_receive(:send).with("OHAI", :pong)
+      @web_socket.should_receive(:send).with([0x4f, 0x48, 0x41, 0x49], :pong)
       parse [0x89, 0x04, 0x4f, 0x48, 0x41, 0x49]
     end
   end
@@ -109,7 +124,7 @@ describe Faye::WebSocket::Protocol8Parser do
     end
     
     it "encodes close frames with an error code" do
-      frame = @parser.frame "Hello", :close, :protocol_error
+      frame = @parser.frame "Hello", :close, 1002
       bytes(frame).should == [0x88, 0x07, 0x03, 0xea, 0x48, 0x65, 0x6c, 0x6c, 0x6f]
     end
     
@@ -117,4 +132,14 @@ describe Faye::WebSocket::Protocol8Parser do
       bytes(@parser.frame '', :pong).should == [0x8a, 0x00]
     end
   end
+  
+  describe :utf8 do
+    it "detects valid UTF-8" do
+      Faye.valid_utf8?( [72, 101, 108, 108, 111, 45, 194, 181, 64, 195, 159, 195, 182, 195, 164, 195, 188, 195, 160, 195, 161, 45, 85, 84, 70, 45, 56, 33, 33] ).should be_true
+    end
+    
+    it "detects invalid UTF-8" do
+      Faye.valid_utf8?( [206, 186, 225, 189, 185, 207, 131, 206, 188, 206, 181, 237, 160, 128, 101, 100, 105, 116, 101, 100] ).should be_false
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faye
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,27 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2011-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
+  name: cookiejar
+  requirement: &10861660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *10861660
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: &10856580 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *10856580
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10855420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +43,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.3'
+  version_requirements: *10855420
 - !ruby/object:Gem::Dependency
   name: em-hiredis
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10854340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +54,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.1
+  version_requirements: *10854340
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10853720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +65,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.0'
+  version_requirements: *10853720
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10847560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -85,15 +76,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
+  version_requirements: *10847560
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10843740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,15 +87,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.0'
+  version_requirements: *10843740
 - !ruby/object:Gem::Dependency
   name: jake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10840940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,15 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *10840940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10836240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,15 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *10836240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10831220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -149,15 +120,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.5.0
+  version_requirements: *10831220
 - !ruby/object:Gem::Dependency
   name: rack-proxy
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10828160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,15 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *10828160
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10826460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -181,15 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *10826460
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10823260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,15 +153,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+  version_requirements: *10823260
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10821560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -213,15 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *10821560
 - !ruby/object:Gem::Dependency
   name: staticmatic
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10000600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -229,12 +175,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *10000600
 description: 
 email: jcoglan@gmail.com
 executables: []
@@ -246,72 +187,78 @@ files:
 - README.rdoc
 - lib/faye-browser-min.js
 - spec/browser.html
+- spec/phantom.js
+- spec/redis.conf
 - spec/install.sh
 - spec/thin_proxy.rb
-- spec/javascript/web_socket/protocol8parser_spec.js
-- spec/javascript/web_socket/draft75parser_spec.js
+- spec/ruby/server/handshake_spec.rb
+- spec/ruby/server/extensions_spec.rb
+- spec/ruby/server/subscribe_spec.rb
+- 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
+- spec/ruby/channel_spec.rb
+- 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/client_spec.rb
+- spec/ruby/web_socket/protocol8_parser_spec.rb
+- spec/ruby/grammar_spec.rb
+- spec/node.js
+- spec/javascript/faye_spec.js
+- spec/javascript/server/disconnect_spec.js
+- 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
 - spec/javascript/engine_spec.js
+- spec/javascript/transport_spec.js
 - spec/javascript/channel_spec.js
+- spec/javascript/node_adapter_spec.js
 - spec/javascript/client_spec.js
-- spec/javascript/server_spec.js
-- spec/javascript/faye_spec.js
-- spec/javascript/transport_spec.js
+- spec/javascript/web_socket/protocol8parser_spec.js
+- spec/javascript/web_socket/client_spec.js
+- spec/javascript/web_socket/draft75parser_spec.js
 - spec/javascript/grammar_spec.js
-- spec/javascript/node_adapter_spec.js
-- spec/javascript/server/handshake_spec.js
-- spec/javascript/server/connect_spec.js
-- spec/javascript/server/extensions_spec.js
-- spec/javascript/server/integration_spec.js
-- spec/javascript/server/unsubscribe_spec.js
-- spec/javascript/server/disconnect_spec.js
-- spec/javascript/server/subscribe_spec.js
-- spec/node.js
 - spec/testswarm
-- spec/phantom.js
-- spec/redis.conf
-- spec/ruby/web_socket/protocol8_parser_spec.rb
-- spec/ruby/web_socket/draft75_parser_spec.rb
-- spec/ruby/transport_spec.rb
-- spec/ruby/channel_spec.rb
-- spec/ruby/faye_spec.rb
-- spec/ruby/client_spec.rb
-- spec/ruby/server_spec.rb
-- spec/ruby/engine_spec.rb
-- spec/ruby/grammar_spec.rb
-- spec/ruby/rack_adapter_spec.rb
-- spec/ruby/server/extensions_spec.rb
-- spec/ruby/server/integration_spec.rb
-- spec/ruby/server/unsubscribe_spec.rb
-- spec/ruby/server/subscribe_spec.rb
-- spec/ruby/server/handshake_spec.rb
-- spec/ruby/server/disconnect_spec.rb
-- spec/ruby/server/connect_spec.rb
 - spec/spec_helper.rb
-- lib/faye.rb
-- lib/faye/protocol/grammar.rb
-- lib/faye/protocol/channel.rb
-- lib/faye/protocol/extensible.rb
-- lib/faye/protocol/subscription.rb
-- lib/faye/protocol/server.rb
-- lib/faye/protocol/client.rb
-- lib/faye/engines/redis.rb
-- lib/faye/engines/memory.rb
-- lib/faye/engines/connection.rb
-- lib/faye/engines/base.rb
-- lib/faye/thin_extensions.rb
+- lib/faye/error.rb
+- lib/faye/util/namespace.rb
 - lib/faye/util/web_socket/draft75_parser.rb
-- lib/faye/util/web_socket/draft76_parser.rb
+- lib/faye/util/web_socket/client.rb
 - lib/faye/util/web_socket/protocol8_parser.rb
-- lib/faye/util/namespace.rb
+- lib/faye/util/web_socket/draft76_parser.rb
+- lib/faye/util/web_socket/api.rb
 - lib/faye/util/web_socket.rb
-- lib/faye/adapters/rack_adapter.rb
-- lib/faye/mixins/timeouts.rb
 - lib/faye/mixins/logging.rb
 - lib/faye/mixins/publisher.rb
-- lib/faye/error.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
+- lib/faye/transport/web_socket.rb
+- lib/faye/protocol/client.rb
+- lib/faye/protocol/publication.rb
+- lib/faye/protocol/subscription.rb
+- lib/faye/protocol/server.rb
+- lib/faye/protocol/extensible.rb
+- lib/faye/protocol/channel.rb
+- lib/faye/protocol/grammar.rb
+- lib/faye/adapters/rack_adapter.rb
+- lib/faye/engines/connection.rb
+- lib/faye/engines/memory.rb
+- lib/faye/engines/redis.rb
+- lib/faye/engines/base.rb
+- lib/faye.rb
 homepage: http://faye.jcoglan.com
 licenses: []
 post_install_message: 
@@ -334,9 +281,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Simple pub/sub messaging for the web
 test_files: []
-has_rdoc: