faye-websocket 0.5.0 → 0.6.0

data/examples/tmp/pids/passenger.7000.pid

@@ -0,0 +1 @@
+13712

data/lib/faye/websocket.rb

@@ -59,14 +59,12 @@ module Faye
       @url     = WebSocket.determine_url(@env)
       @driver  = ::WebSocket::Driver.rack(self, :protocols => protocols)
       @stream  = Stream.new(self)
-      @ping    = options[:ping]
-      @ping_id = 0
 
       if callback = @env['async.callback']
         callback.call([101, {}, @stream])
       end
 
-      super()
+      super(options)
       @driver.start
     end
 

data/lib/faye/websocket/api.rb

@@ -17,10 +17,16 @@ module Faye
 
       attr_reader :url, :ready_state, :buffered_amount
 
-      def initialize
-        super
+      def initialize(options = {})
+        super()
 
-        @ready_state = CONNECTING
+        if headers = options[:headers]
+          headers.each { |name, value| @driver.set_header(name, value) }
+        end
+
+        @ping            = options[:ping]
+        @ping_id         = 0
+        @ready_state     = CONNECTING
         @buffered_amount = 0
 
         @driver.on(:open)    { |e| open }

data/lib/faye/websocket/client.rb

@@ -4,15 +4,23 @@ module Faye
     class Client
       include API
 
-      def initialize(url, protocols = nil)
+      attr_reader :headers, :status
+
+      def initialize(url, protocols = nil, options = {})
         @url    = url
         @uri    = URI.parse(url)
         @driver = ::WebSocket::Driver.client(self, :protocols => protocols)
 
-        super()
+        [:open, :error].each do |event|
+          @driver.on(event) do
+            @headers = @driver.headers
+            @status  = @driver.status
+          end
+        end
+
+        super(options)
 
         port = @uri.port || (@uri.scheme == 'wss' ? 443 : 80)
-
         EventMachine.connect(@uri.host, port, Connection) do |conn|
           @stream = conn
           conn.parent = self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faye-websocket
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-05 00:00:00.000000000 Z
+date: 2013-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +155,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: passenger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 description: 
 email: jcoglan@gmail.com
 executables: []
@@ -180,9 +196,13 @@ files:
 - examples/config.ru
 - examples/rainbows.conf
 - examples/sse.html
+- examples/log/passenger.8001.log
 - examples/app.rb
 - examples/server.rb
 - examples/client.rb
+- examples/tmp/pids/passenger.7000.pid
+- examples/tmp/pids/passenger.7000.pid.lock
+- examples/tmp/pids/passenger.8001.pid.lock
 - examples/haproxy.conf
 - examples/autobahn_client.rb
 homepage: http://github.com/faye/faye-websocket-ruby