faye 0.8.8 → 0.8.9

data/lib/faye/protocol/client.rb

@@ -1,28 +1,28 @@
 module Faye
   class Client
-    
+
     include EventMachine::Deferrable
     include Publisher
     include Logging
     include Extensible
-    
+
     UNCONNECTED         = 1
     CONNECTING          = 2
     CONNECTED           = 3
     DISCONNECTED        = 4
-    
+
     HANDSHAKE           = 'handshake'
     RETRY               = 'retry'
     NONE                = 'none'
-    
+
     CONNECTION_TIMEOUT  = 60.0
     DEFAULT_RETRY       = 5.0
-    
+
     attr_reader :client_id, :endpoint, :endpoints, :retry, :transports
-    
+
     def initialize(endpoint = nil, options = {})
       info('New client created for ?', endpoint)
-      
+
       @options    = options
       @endpoint   = endpoint || RackAdapter::DEFAULT_ENDPOINT
       @endpoints  = @options[:endpoints] || {}
@@ -32,29 +32,27 @@ module Faye
       @disabled   = []
       @retry      = @options[:retry] || DEFAULT_RETRY
 
-      select_transport(MANDATORY_CONNECTION_TYPES)
-      
       @state      = UNCONNECTED
       @channels   = Channel::Set.new
       @message_id = 0
-      
+
       @response_callbacks = {}
-      
+
       @advice = {
         'reconnect' => RETRY,
         'interval'  => 1000.0 * (@options[:interval] || Engine::INTERVAL),
         'timeout'   => 1000.0 * (@options[:timeout]  || CONNECTION_TIMEOUT)
       }
     end
-    
+
     def disable(feature)
       @disabled << feature
     end
-    
+
     def set_header(name, value)
       @headers[name.to_s] = value.to_s
     end
-    
+
     def state
       case @state
       when UNCONNECTED  then :UNCONNECTED
@@ -71,7 +69,7 @@ module Faye
     # MAY include:   * minimumVersion
     #                * ext
     #                * id
-    # 
+    #
     # Success Response                             Failed Response
     # MUST include:  * channel                     MUST include:  * channel
     #                * version                                    * successful
@@ -86,30 +84,30 @@ module Faye
     def handshake(&block)
       return if @advice['reconnect'] == NONE
       return if @state != UNCONNECTED
-      
+
       @state = CONNECTING
-      
+
       info('Initiating handshake with ?', @endpoint)
-      
+      select_transport(MANDATORY_CONNECTION_TYPES)
+
       send({
         'channel'     => Channel::HANDSHAKE,
         'version'     => BAYEUX_VERSION,
         'supportedConnectionTypes' => [@transport.connection_type]
-        
+
       }) do |response|
-        
+
         if response['successful']
           @state     = CONNECTED
           @client_id = response['clientId']
-          
-          connection_types = response['supportedConnectionTypes'] - @disabled
-          select_transport(connection_types)
-          
+
+          select_transport(response['supportedConnectionTypes'])
+
           info('Handshake successful: ?', @client_id)
-          
+
           subscribe(@channels.keys, true)
           block.call if block_given?
-          
+
         else
           info('Handshake unsuccessful')
           EventMachine.add_timer(@advice['interval'] / 1000.0) { handshake(&block) }
@@ -117,7 +115,7 @@ module Faye
         end
       end
     end
-    
+
     # Request                              Response
     # MUST include:  * channel             MUST include:  * channel
     #                * clientId                           * successful
@@ -130,31 +128,31 @@ module Faye
     def connect(&block)
       return if @advice['reconnect'] == NONE or
                 @state == DISCONNECTED
-      
+
       return handshake { connect(&block) } if @state == UNCONNECTED
-      
+
       callback(&block)
       return unless @state == CONNECTED
-      
+
       info('Calling deferred actions for ?', @client_id)
       set_deferred_status(:succeeded)
       set_deferred_status(:deferred)
-      
+
       return unless @connect_request.nil?
       @connect_request = true
-      
+
       info('Initiating connection for ?', @client_id)
-      
+
       send({
         'channel'         => Channel::CONNECT,
         'clientId'        => @client_id,
         'connectionType'  => @transport.connection_type
-        
+
       }) do
         cycle_connection
       end
     end
-    
+
     # Request                              Response
     # MUST include:  * channel             MUST include:  * channel
     #                * clientId                           * successful
@@ -165,21 +163,21 @@ module Faye
     def disconnect
       return unless @state == CONNECTED
       @state = DISCONNECTED
-      
+
       info('Disconnecting ?', @client_id)
-      
+
       send({
         'channel'   => Channel::DISCONNECT,
         'clientId'  => @client_id
-        
+
       }) do |response|
         @transport.close if response['successful']
       end
-      
+
       info('Clearing channel listeners for ?', @client_id)
       @channels = Channel::Set.new
     end
-    
+
     # Request                              Response
     # MUST include:  * channel             MUST include:  * channel
     #                * clientId                           * successful
@@ -194,31 +192,31 @@ module Faye
       if Array === channel
         return channel.map { |c| subscribe(c, force, &block) }
       end
-      
+
       subscription  = Subscription.new(self, channel, block)
       has_subscribe = @channels.has_subscription?(channel)
-      
+
       if has_subscribe and not force
         @channels.subscribe([channel], block)
         subscription.set_deferred_status(:succeeded)
         return subscription
       end
-      
+
       connect {
         info('Client ? attempting to subscribe to ?', @client_id, channel)
         @channels.subscribe([channel], block) unless force
-        
+
         send({
           'channel'       => Channel::SUBSCRIBE,
           'clientId'      => @client_id,
           'subscription'  => channel
-          
+
         }) do |response|
           unless response['successful']
             subscription.set_deferred_status(:failed, Error.parse(response['error']))
             next @channels.unsubscribe(channel, block)
           end
-          
+
           channels = [response['subscription']].flatten
           info('Subscription acknowledged for ? to ?', @client_id, channels)
           subscription.set_deferred_status(:succeeded)
@@ -226,7 +224,7 @@ module Faye
       }
       subscription
     end
-    
+
     # Request                              Response
     # MUST include:  * channel             MUST include:  * channel
     #                * clientId                           * successful
@@ -241,27 +239,27 @@ module Faye
       if Array === channel
         return channel.map { |c| unsubscribe(c, &block) }
       end
-      
+
       dead = @channels.unsubscribe(channel, block)
       return unless dead
-      
+
       connect {
         info('Client ? attempting to unsubscribe from ?', @client_id, channel)
-        
+
         send({
           'channel'       => Channel::UNSUBSCRIBE,
           'clientId'      => @client_id,
           'subscription'  => channel
-          
+
         }) do |response|
           next unless response['successful']
-            
+
           channels = [response['subscription']].flatten
           info('Unsubscription acknowledged for ? from ?', @client_id, channels)
         end
       }
     end
-    
+
     # Request                              Response
     # MUST include:  * channel             MUST include:  * channel
     #                * data                               * successful
@@ -272,7 +270,7 @@ module Faye
       publication = Publication.new
       connect {
         info('Client ? queueing published message to ?: ?', @client_id, channel, data)
-        
+
         send({
           'channel'   => channel,
           'data'      => data,
@@ -287,41 +285,41 @@ module Faye
       }
       publication
     end
-    
+
     def receive_message(message)
       pipe_through_extensions(:incoming, message) do |message|
         next unless message
-        
+
         handle_advice(message['advice']) if message['advice']
         deliver_message(message)
-        
+
         next unless message.has_key?('successful')
-        
+
         callback = @response_callbacks[message['id']]
         next unless callback
-        
+
         @response_callbacks.delete(message['id'])
         callback.call(message)
       end
     end
-    
+
   private
-    
+
     def select_transport(transport_types)
-      Transport.get(self, transport_types) do |transport|
+      Transport.get(self, transport_types, @disabled) do |transport|
         debug('Selected ? transport for ?', transport.connection_type, transport.endpoint)
-        
+
         @transport = transport
         @transport.cookies = @cookies
         @transport.headers = @headers
-        
+
         transport.bind :down do
           if @transport_up.nil? or @transport_up
             @transport_up = false
             trigger('transport:down')
           end
         end
-        
+
         transport.bind :up do
           if @transport_up.nil? or not @transport_up
             @transport_up = true
@@ -330,7 +328,7 @@ module Faye
         end
       end
     end
-    
+
     def send(message, &callback)
       message['id'] = generate_message_id
       @response_callbacks[message['id']] = callback if callback
@@ -339,40 +337,40 @@ module Faye
         @transport.send(message, @advice['timeout'] / 1000.0) if message
       end
     end
-    
+
     def generate_message_id
       @message_id += 1
       @message_id = 0 if @message_id >= 2**32
       @message_id.to_s(36)
     end
-    
+
     def handle_advice(advice)
       @advice.update(advice)
-      
+
       if @advice['reconnect'] == HANDSHAKE and @state != DISCONNECTED
         @state     = UNCONNECTED
         @client_id = nil
         cycle_connection
       end
     end
-    
+
     def deliver_message(message)
       return unless message.has_key?('channel') and message.has_key?('data')
       info('Client ? calling listeners for ? with ?', @client_id, message['channel'], message['data'])
       @channels.distribute_message(message)
     end
-    
+
     def teardown_connection
       return unless @connect_request
       @connect_request = nil
       info('Closed connection for ?', @client_id)
     end
-    
+
     def cycle_connection
       teardown_connection
       EventMachine.add_timer(@advice['interval'] / 1000.0) { connect }
     end
-    
+
   end
 end
 

data/lib/faye/protocol/extensible.rb

@@ -1,13 +1,13 @@
 module Faye
   module Extensible
     include Logging
-    
+
     def add_extension(extension)
       @extensions ||= []
       @extensions << extension
       extension.added(self) if extension.respond_to?(:added)
     end
-    
+
     def remove_extension(extension)
       return unless @extensions
       @extensions.delete_if do |ext|
@@ -16,19 +16,19 @@ module Faye
         true
       end
     end
-    
+
     def pipe_through_extensions(stage, message, &callback)
       debug 'Passing through ? extensions: ?', stage, message
 
       return callback.call(message) unless @extensions
       extensions = @extensions.dup
-      
+
       pipe = lambda do |message|
         next callback.call(message) unless message
-        
+
         extension = extensions.shift
         next callback.call(message) unless extension
-        
+
         if extension.respond_to?(stage)
           extension.__send__(stage, message, pipe)
         else
@@ -37,7 +37,7 @@ module Faye
       end
       pipe.call(message)
     end
-    
+
   end
 end
 

data/lib/faye/protocol/grammar.rb

@@ -1,28 +1,28 @@
 module Faye
   module Grammar
-    
+
     def self.rule(&block)
       source = instance_eval(&block)
       %r{^#{string(source)}$}
     end
-    
+
     def self.choice(*list)
       '(' + list.map(&method(:string)) * '|' + ')'
     end
-    
+
     def self.repeat(*pattern)
       '(' + string(pattern) + ')*'
     end
-    
+
     def self.oneormore(*pattern)
       '(' + string(pattern) + ')+'
     end
-    
+
     def self.string(item)
       return item.map(&method(:string)) * '' if Array === item
       String === item ? item : item.source.gsub(/^\^/, '').gsub(/\$$/, '')
     end
-    
+
     LOWALPHA          = rule {[ '[a-z]' ]}
     UPALPHA           = rule {[ '[A-Z]' ]}
     ALPHA             = rule {[ choice(LOWALPHA, UPALPHA) ]}
@@ -32,27 +32,27 @@ module Faye
     STRING            = rule {[ repeat(choice(ALPHANUM, MARK, ' ', '\\/', '\\*', '\\.')) ]}
     TOKEN             = rule {[ oneormore(choice(ALPHANUM, MARK)) ]}
     INTEGER           = rule {[ oneormore(DIGIT) ]}
-    
+
     CHANNEL_SEGMENT   = rule {[ TOKEN ]}
     CHANNEL_SEGMENTS  = rule {[ CHANNEL_SEGMENT, repeat('\\/', CHANNEL_SEGMENT) ]}
     CHANNEL_NAME      = rule {[ '\\/', CHANNEL_SEGMENTS ]}
-    
+
     WILD_CARD         = rule {[ '\\*{1,2}' ]}
     CHANNEL_PATTERN   = rule {[ repeat('\\/', CHANNEL_SEGMENT), '\\/', WILD_CARD ]}
-    
+
     VERSION_ELEMENT   = rule {[ ALPHANUM, repeat(choice(ALPHANUM, '\\-', '\\_')) ]}
     VERSION           = rule {[ INTEGER, repeat('\\.', VERSION_ELEMENT) ]}
-    
+
     CLIENT_ID         = rule {[ oneormore(ALPHANUM) ]}
-    
+
     ID                = rule {[ oneormore(ALPHANUM) ]}
-    
+
     ERROR_MESSAGE     = rule {[ STRING ]}
     ERROR_ARGS        = rule {[ STRING, repeat(',', STRING) ]}
     ERROR_CODE        = rule {[ DIGIT, DIGIT, DIGIT ]}
     ERROR             = rule {[ choice(string([ERROR_CODE, ':', ERROR_ARGS, ':', ERROR_MESSAGE]),
                                        string([ERROR_CODE, ':', ':', ERROR_MESSAGE])) ]}
-    
+
   end
 end