faye-websocket 0.4.6 → 0.4.7

data/lib/faye/websocket/adapter.rb

@@ -1,21 +1,21 @@
 module Faye
   class WebSocket
-    
+
     module Adapter
       def websocket?
         e = defined?(@env) ? @env : env
         WebSocket.websocket?(e)
       end
-      
+
       def eventsource?
         e = defined?(@env) ? @env : env
         EventSource.eventsource?(e)
       end
-      
-      def async_connection?
+
+      def socket_connection?
         websocket? or eventsource?
       end
     end
-    
+
   end
 end

data/lib/faye/websocket/api.rb

@@ -1,6 +1,6 @@
 module Faye
   class WebSocket
-    
+
     module API
       module ReadyStates
         CONNECTING = 0
@@ -8,35 +8,35 @@ module Faye
         CLOSING    = 2
         CLOSED     = 3
       end
-      
+
       class IllegalStateError < StandardError
       end
-      
+
       require File.expand_path('../api/event_target', __FILE__)
       require File.expand_path('../api/event', __FILE__)
       include EventTarget
       include ReadyStates
-      
+
       attr_reader :url, :ready_state, :buffered_amount
-      
+
     private
-      
+
       def open
         return if @parser and not @parser.open?
         @ready_state = OPEN
-        
+
         buffer = @send_buffer || []
         while message = buffer.shift
           send(*message)
         end
-        
+
         event = Event.new('open')
         event.init_event('open', false, false)
         dispatch_event(event)
       end
-      
+
     public
-      
+
       def receive(data)
         return false unless @ready_state == OPEN
         event = Event.new('message')
@@ -44,7 +44,7 @@ module Faye
         event.data = data
         dispatch_event(event)
       end
-      
+
       def send(data, type = nil, error_type = nil)
         if @ready_state == CONNECTING
           if @send_buffer
@@ -54,22 +54,21 @@ module Faye
             raise IllegalStateError, 'Cannot call send(), socket is not open yet'
           end
         end
-        
+
         return false if @ready_state == CLOSED
-        
+
         data = data.to_s unless Array === data
-        
+
         data = WebSocket.encode(data) if String === data
         frame = @parser.frame(data, type, error_type)
         @stream.write(frame) if frame
       end
-      
+
       def close(code = nil, reason = nil, ack = true)
-        return if [CLOSING, CLOSED].include?(@ready_state)
-        
-        @ready_state = CLOSING
-        
-        close = lambda do
+        return if @ready_state == CLOSED
+        return if @ready_state == CLOSING && ack
+
+        finalize = lambda do
           @ready_state = CLOSED
           EventMachine.cancel_timer(@ping_timer) if @ping_timer
           @stream.close_connection_after_writing
@@ -77,20 +76,24 @@ module Faye
           event.init_event('close', false, false)
           dispatch_event(event)
         end
-        
+
+        return finalize.call if @ready_state == CONNECTING
+
+        @ready_state = CLOSING
+
         if ack
           if @parser.respond_to?(:close)
-            @parser.close(code, reason, &close)
+            @parser.close(code, reason, &finalize)
           else
-            close.call
+            finalize.call
           end
         else
           @parser.close(code, reason) if @parser.respond_to?(:close)
-          close.call
+          finalize.call
         end
       end
     end
-    
+
   end
 end
 

data/lib/faye/websocket/api/event.rb

@@ -1,13 +1,13 @@
 module Faye::WebSocket::API
   class Event
-    
+
     attr_reader   :type, :bubbles, :cancelable
     attr_accessor :target, :current_target, :event_phase, :data
-    
+
     CAPTURING_PHASE = 1
     AT_TARGET       = 2
     BUBBLING_PHASE  = 3
-    
+
     def initialize(event_type, options = {})
       @type = event_type
       metaclass = (class << self ; self ; end)
@@ -15,19 +15,19 @@ module Faye::WebSocket::API
         metaclass.__send__(:define_method, key) { value }
       end
     end
-    
+
     def init_event(event_type, can_bubble, cancelable)
       @type       = event_type
       @bubbles    = can_bubble
       @cancelable = cancelable
     end
-    
+
     def stop_propagation
     end
-    
+
     def prevent_default
     end
-    
+
   end
 end
 

data/lib/faye/websocket/api/event_target.rb

@@ -1,34 +1,34 @@
 module Faye::WebSocket::API
   module EventTarget
-    
+
     attr_accessor :onopen, :onmessage, :onerror, :onclose
-    
+
     def add_event_listener(event_type, listener, use_capture = false)
       @listeners ||= {}
       list = @listeners[event_type] ||= []
       list << listener
     end
-    
+
     def remove_event_listener(event_type, listener, use_capture = false)
       return unless @listeners and @listeners[event_type]
       return @listeners.delete(event_type) unless listener
-      
+
       @listeners[event_type].delete_if(&listener.method(:==))
     end
-    
+
     def dispatch_event(event)
       event.target = event.current_target = self
       event.event_phase = Event::AT_TARGET
-      
+
       callback = __send__("on#{ event.type }")
       callback.call(event) if callback
-      
+
       return unless @listeners and @listeners[event.type]
       @listeners[event.type].each do |listener|
         listener.call(event)
       end
     end
-    
+
   end
 end
 

data/lib/faye/websocket/client.rb

@@ -1,51 +1,51 @@
 module Faye
   class WebSocket
-    
+
     class Client
       include API
       attr_reader :protocol, :uri
-      
+
       def initialize(url, protocols = nil)
         @parser = HybiParser.new(self, :masking => true, :protocols => protocols)
         @url    = url
         @uri    = URI.parse(url)
-        
+
         @protocol = ''
         @ready_state = CONNECTING
         @buffered_amount = 0
-        
+
         port = @uri.port || (@uri.scheme == 'wss' ? 443 : 80)
-        
+
         EventMachine.connect(@uri.host, port, Connection) do |conn|
           @stream = conn
           conn.parent = self
         end
       end
-      
+
     private
-      
+
       def on_connect
         @stream.start_tls if @uri.scheme == 'wss'
         @handshake = @parser.create_handshake
         @message = []
         @stream.write(@handshake.request_data)
       end
-      
+
       def receive_data(data)
         data = WebSocket.encode(data)
-        
+
         case @ready_state
           when CONNECTING then
             @message += @handshake.parse(data)
             return unless @handshake.complete?
-            
+
             if @handshake.valid?
               @protocol = @handshake.protocol || ''
               @ready_state = OPEN
               event = Event.new('open')
               event.init_event('open', false, false)
               dispatch_event(event)
-              
+
               receive_data(@message)
             else
               @ready_state = CLOSED
@@ -53,32 +53,32 @@ module Faye
               event.init_event('close', false, false)
               dispatch_event(event)
             end
-            
+
           when OPEN, CLOSING then
             @parser.parse(data)
         end
       end
-      
+
       module Connection
         attr_accessor :parent
-        
+
         def connection_completed
           parent.__send__(:on_connect)
         end
-        
+
         def receive_data(data)
           parent.__send__(:receive_data, data)
         end
-        
+
         def unbind
           parent.close(1006, '', false)
         end
-        
+
         def write(data)
           send_data(data) rescue nil
         end
       end
     end
-    
+
   end
 end

data/lib/faye/websocket/draft75_parser.rb

@@ -1,18 +1,18 @@
 module Faye
   class WebSocket
-    
+
     class Draft75Parser
       attr_reader :protocol
-      
+
       def initialize(web_socket, options = {})
         @socket = web_socket
         @stage  = 0
       end
-      
+
       def version
         'hixie-75'
       end
-      
+
       def handshake_response
         upgrade =  "HTTP/1.1 101 Web Socket Protocol Handshake\r\n"
         upgrade << "Upgrade: WebSocket\r\n"
@@ -22,21 +22,21 @@ module Faye
         upgrade << "\r\n"
         upgrade
       end
-      
+
       def open?
         true
       end
-      
+
       def parse(buffer)
         buffer.each_byte do |data|
           case @stage
             when 0 then
               parse_leading_byte(data)
-              
+
             when 1 then
               value = (data & 0x7F)
               @length = value + 128 * @length
-              
+
               if @closing and @length.zero?
                 @socket.close(nil, nil, false)
               elsif (0x80 & data) != 0x80
@@ -48,7 +48,7 @@ module Faye
                   @stage = 2
                 end
               end
-              
+
             when 2 then
               if data == 0xFF
                 @socket.receive(WebSocket.encode(@buffer))
@@ -61,10 +61,10 @@ module Faye
               end
           end
         end
-        
+
         nil
       end
-      
+
       def parse_leading_byte(data)
         if (0x80 & data) == 0x80
           @length = 0
@@ -75,13 +75,13 @@ module Faye
           @stage = 2
         end
       end
-      
+
       def frame(data, type = nil, error_type = nil)
         return WebSocket.encode(data) if Array === data
         ["\x00", data, "\xFF"].map(&WebSocket.method(:encode)) * ''
       end
     end
-    
+
   end
 end
 

data/lib/faye/websocket/draft76_parser.rb

@@ -1,15 +1,15 @@
 module Faye
   class WebSocket
-    
+
     class Draft76Parser < Draft75Parser
       def version
         'hixie-76'
       end
-      
+
       def handshake_response
         env = @socket.env
         signature = handshake_signature(env['rack.input'].read)
-        
+
         upgrade =  "HTTP/1.1 101 Web Socket Protocol Handshake\r\n"
         upgrade << "Upgrade: WebSocket\r\n"
         upgrade << "Connection: Upgrade\r\n"
@@ -19,57 +19,57 @@ module Faye
         upgrade << signature if signature
         upgrade
       end
-      
+
       def handshake_signature(head)
         return nil if head.empty?
         env = @socket.env
-        
+
         key1   = env['HTTP_SEC_WEBSOCKET_KEY1']
         value1 = number_from_key(key1) / spaces_in_key(key1)
-        
+
         key2   = env['HTTP_SEC_WEBSOCKET_KEY2']
         value2 = number_from_key(key2) / spaces_in_key(key2)
-        
+
         @handshake_complete = true
-        
+
         Digest::MD5.digest(big_endian(value1) +
                            big_endian(value2) +
                            head)
       end
-      
+
       def open?
         !!@handshake_complete
       end
-      
+
       def parse(data)
         return super if @handshake_complete
         handshake_signature(data)
       end
-      
+
       def close(code = nil, reason = nil, &callback)
         return if @closed
         @socket.send([0xFF, 0x00]) if @closing
         @closed = true
         callback.call if callback
       end
-      
+
     private
-      
+
       def parse_leading_byte(data)
         return super unless data == 0xFF
         @closing = true
         @length = 0
         @stage = 1
       end
-      
+
       def number_from_key(key)
         key.scan(/[0-9]/).join('').to_i(10)
       end
-      
+
       def spaces_in_key(key)
         key.scan(/ /).size
       end
-      
+
       def big_endian(number)
         string = ''
         [24,16,8,0].each do |offset|
@@ -78,7 +78,7 @@ module Faye
         string
       end
     end
-    
+
   end
 end