faye 0.8.8 → 0.8.9

data/lib/faye/engines/memory.rb

@@ -1,13 +1,13 @@
 module Faye
   module Engine
-    
+
     class Memory
       include Timeouts
-      
+
       def self.create(server, options)
         new(server, options)
       end
-      
+
       def initialize(server, options)
         @server    = server
         @options   = options
@@ -16,7 +16,7 @@ module Faye
         @channels  = {}
         @messages  = {}
       end
-      
+
       def create_client(&callback)
         client_id = @namespace.generate
         @server.debug 'Created new client ?', client_id
@@ -24,14 +24,14 @@ module Faye
         @server.trigger(:handshake, client_id)
         callback.call(client_id)
       end
-      
+
       def destroy_client(client_id, &callback)
         return unless @namespace.exists?(client_id)
-        
+
         if @clients.has_key?(client_id)
           @clients[client_id].each { |channel| unsubscribe(client_id, channel) }
         end
-        
+
         remove_timeout(client_id)
         @namespace.release(client_id)
         @messages.delete(client_id)
@@ -39,11 +39,11 @@ module Faye
         @server.trigger(:disconnect, client_id)
         callback.call if callback
       end
-      
+
       def client_exists(client_id, &callback)
         callback.call(@namespace.exists?(client_id))
       end
-      
+
       def ping(client_id)
         timeout = @server.timeout
         return unless Numeric === timeout
@@ -51,45 +51,45 @@ module Faye
         remove_timeout(client_id)
         add_timeout(client_id, 2 * timeout) { destroy_client(client_id) }
       end
-      
+
       def subscribe(client_id, channel, &callback)
         @clients[client_id] ||= Set.new
         should_trigger = @clients[client_id].add?(channel)
-        
+
         @channels[channel] ||= Set.new
         @channels[channel].add(client_id)
-        
+
         @server.debug 'Subscribed client ? to channel ?', client_id, channel
         @server.trigger(:subscribe, client_id, channel) if should_trigger
         callback.call(true) if callback
       end
-      
+
       def unsubscribe(client_id, channel, &callback)
         if @clients.has_key?(client_id)
           should_trigger = @clients[client_id].delete?(channel)
           @clients.delete(client_id) if @clients[client_id].empty?
         end
-        
+
         if @channels.has_key?(channel)
           @channels[channel].delete(client_id)
           @channels.delete(channel) if @channels[channel].empty?
         end
-        
+
         @server.debug 'Unsubscribed client ? from channel ?', client_id, channel
         @server.trigger(:unsubscribe, client_id, channel) if should_trigger
         callback.call(true) if callback
       end
-      
+
       def publish(message, channels)
         @server.debug 'Publishing message ?', message
-        
+
         clients = Set.new
-        
+
         channels.each do |channel|
           next unless subs = @channels[channel]
           subs.each(&clients.method(:add))
         end
-        
+
         clients.each do |client_id|
           @server.debug 'Queueing for client ?: ?', client_id, message
           @messages[client_id] ||= []
@@ -99,14 +99,14 @@ module Faye
 
         @server.trigger(:publish, message['clientId'], message['channel'], message['data'])
       end
-      
+
       def empty_queue(client_id)
         return unless @server.has_connection?(client_id)
         @server.deliver(client_id, @messages[client_id])
         @messages.delete(client_id)
       end
     end
-    
+
   end
 end
 

data/lib/faye/engines/proxy.rb

@@ -1,24 +1,24 @@
 module Faye
   module Engine
-    
+
     METHODS   = %w[create_client client_exists destroy_client ping subscribe unsubscribe]
     MAX_DELAY = 0.0
     INTERVAL  = 0.0
     TIMEOUT   = 60.0
     ID_LENGTH = 160
-    
+
     autoload :Connection, File.expand_path('../connection', __FILE__)
     autoload :Memory,     File.expand_path('../memory', __FILE__)
-    
+
     def self.ensure_reactor_running!
       Thread.new { EventMachine.run } unless EventMachine.reactor_running?
       Thread.pass until EventMachine.reactor_running?
     end
-    
+
     def self.get(options)
       Proxy.new(options)
     end
-    
+
     def self.random(bitlength = ID_LENGTH)
       limit    = 2 ** bitlength - 1
       max_size = limit.to_s(36).size
@@ -26,32 +26,32 @@ module Faye
       string = '0' + string while string.size < max_size
       string
     end
-    
+
     class Proxy
       include Publisher
       include Logging
-      
+
       attr_reader :interval, :timeout
-      
+
       extend Forwardable
       def_delegators :@engine, *METHODS
-      
+
       def initialize(options)
         @options     = options
         @connections = {}
         @interval    = @options[:interval] || INTERVAL
         @timeout     = @options[:timeout]  || TIMEOUT
-        
+
         engine_class = @options[:type] || Memory
         @engine      = engine_class.create(self, @options)
-        
+
         bind :disconnect do |client_id|
           EventMachine.next_tick { close_connection(client_id) }
         end
-        
+
         debug 'Created new engine: ?', @options
       end
-      
+
       def connect(client_id, options = {}, &callback)
         debug 'Accepting connection from ?', client_id
         @engine.ping(client_id)
@@ -59,11 +59,11 @@ module Faye
         conn.connect(options, &callback)
         @engine.empty_queue(client_id)
       end
-      
+
       def has_connection?(client_id)
         @connections.has_key?(client_id)
       end
-      
+
       def connection(client_id, create)
         conn = @connections[client_id]
         return conn if conn or not create
@@ -71,7 +71,7 @@ module Faye
         trigger('connection:open', client_id)
         @connections[client_id]
       end
-      
+
       def close_connection(client_id)
         debug 'Closing connection for ?', client_id
         conn = @connections[client_id]
@@ -80,13 +80,13 @@ module Faye
         trigger('connection:close', client_id)
         @connections.delete(client_id)
       end
-      
+
       def open_socket(client_id, socket)
         return unless client_id
         conn = connection(client_id, true)
         conn.socket = socket
       end
-      
+
       def deliver(client_id, messages)
         return if !messages || messages.empty?
         conn = connection(client_id, false)
@@ -94,28 +94,28 @@ module Faye
         messages.each(&conn.method(:deliver))
         true
       end
-      
+
       def generate_id
         Engine.random
       end
-      
+
       def flush(client_id)
         return unless client_id
         debug 'Flushing connection for ?', client_id
         conn = connection(client_id, false)
         conn.flush!(true) if conn
       end
-      
+
       def disconnect
         @engine.disconnect if @engine.respond_to?(:disconnect)
       end
-      
+
       def publish(message)
         channels = Channel.expand(message['channel'])
         @engine.publish(message, channels)
       end
     end
-    
+
   end
 end
 

data/lib/faye/error.rb

@@ -1,11 +1,11 @@
 module Faye
   class Error
-    
+
     def self.method_missing(type, *args)
       code = const_get(type.to_s.upcase)
       new(code[0], args, code[1]).to_s
     end
-    
+
     def self.parse(message)
       message ||= ''
       return new(nil, [], message) unless Grammar::ERROR =~ message
@@ -19,17 +19,17 @@ module Faye
     end
 
     attr_reader :code, :params, :message
-    
+
     def initialize(code, params, message)
       @code     = code
       @params   = params
       @message  = message
     end
-    
+
     def to_s
       "#{ @code }:#{ @params * ',' }:#{ @message }"
     end
-    
+
     # http://code.google.com/p/cometd/wiki/BayeuxCodes
     VERSION_MISMATCH    = [300, 'Version mismatch']
     CONNTYPE_MISMATCH   = [301, 'Connection types not supported']
@@ -43,7 +43,7 @@ module Faye
     EXT_UNKNOWN         = [406, 'Unknown extension']
     PUBLISH_FAILED      = [407, 'Failed to publish']
     SERVER_ERROR        = [500, 'Internal server error']
-    
+
   end
 end
 

data/lib/faye/mixins/logging.rb

@@ -1,47 +1,47 @@
 module Faye
   module Logging
-    
+
     DEFAULT_LOG_LEVEL = :error
-    
+
     LOG_LEVELS = {
       :error  => 3,
       :warn   => 2,
       :info   => 1,
       :debug  => 0
     }
-    
+
     class << self
       attr_writer :log_level
-      
+
       def log_level
         @log_level || DEFAULT_LOG_LEVEL
       end
     end
-    
+
     attr_writer :log_level
-    
+
     def log_level
       @log_level || Logging.log_level
     end
-    
+
     def log(message_args, level)
       return unless Faye.logger
       return if LOG_LEVELS[log_level] > LOG_LEVELS[level]
-      
+
       message = message_args.shift.gsub(/\?/) do
         Faye.to_json(message_args.shift)
       end
-      
+
       timestamp = Time.now.strftime('%Y-%m-%d %H:%M:%S')
       banner = " [#{ level.to_s.upcase }] [#{ self.class.name }] "
-      
+
       Faye.logger.call(timestamp + banner + message)
     end
-    
+
     LOG_LEVELS.each do |level, value|
       define_method(level) { |*args| log(args, level) }
     end
-    
+
   end
 end
 

data/lib/faye/mixins/publisher.rb

@@ -1,30 +1,30 @@
 module Faye
   module Publisher
-    
+
     def count_listeners(event_type)
       return 0 unless @subscribers and @subscribers[event_type]
       @subscribers[event_type].size
     end
-    
+
     def bind(event_type, &listener)
       @subscribers ||= {}
       list = @subscribers[event_type] ||= []
       list << listener
     end
-    
+
     def unbind(event_type, &listener)
       return unless @subscribers and @subscribers[event_type]
       return @subscribers.delete(event_type) unless listener
-      
+
       @subscribers[event_type].delete_if(&listener.method(:==))
     end
-    
+
     def trigger(event_type, *args)
       return unless @subscribers and @subscribers[event_type]
       listeners = @subscribers[event_type].dup
       listeners.each { |listener| listener.call(*args) }
     end
-    
+
   end
 end
 

data/lib/faye/mixins/timeouts.rb

@@ -9,7 +9,7 @@ module Faye
         block.call
       end
     end
-    
+
     def remove_timeout(name)
       @timeouts ||= {}
       timeout = @timeouts[name]

data/lib/faye/protocol/channel.rb

@@ -1,95 +1,95 @@
 module Faye
   class Channel
-    
+
     include Publisher
     attr_reader :name
-    
+
     def initialize(name)
       @name = name
     end
-    
+
     def <<(message)
       trigger(:message, message)
     end
-    
+
     def unused?
       count_listeners(:message).zero?
     end
-    
+
     HANDSHAKE   = '/meta/handshake'
     CONNECT     = '/meta/connect'
     SUBSCRIBE   = '/meta/subscribe'
     UNSUBSCRIBE = '/meta/unsubscribe'
     DISCONNECT  = '/meta/disconnect'
-    
+
     META        = 'meta'
     SERVICE     = 'service'
-    
+
     class << self
       def expand(name)
         segments = parse(name)
         channels = ['/**', name]
-        
+
         copy = segments.dup
         copy[copy.size - 1] = '*'
         channels << unparse(copy)
-        
+
         1.upto(segments.size - 1) do |i|
           copy = segments[0...i]
           copy << '**'
           channels << unparse(copy)
         end
-        
+
         channels
       end
-      
+
       def valid?(name)
         Grammar::CHANNEL_NAME =~ name or
         Grammar::CHANNEL_PATTERN =~ name
       end
-      
+
       def parse(name)
         return nil unless valid?(name)
         name.split('/')[1..-1]
       end
-      
+
       def unparse(segments)
         '/' + segments.join('/')
       end
-      
+
       def meta?(name)
         segments = parse(name)
         segments ? (segments.first == META) : nil
       end
-      
+
       def service?(name)
         segments = parse(name)
         segments ? (segments.first == SERVICE) : nil
       end
-      
+
       def subscribable?(name)
         return nil unless valid?(name)
         not meta?(name) and not service?(name)
       end
     end
-    
+
     class Set
       def initialize(parent = nil, value = nil)
         @channels = {}
       end
-      
+
       def keys
         @channels.keys
       end
-      
+
       def remove(name)
         @channels.delete(name)
       end
-      
+
       def has_subscription?(name)
         @channels.has_key?(name)
       end
-      
+
       def subscribe(names, callback)
         return unless callback
         names.each do |name|
@@ -97,7 +97,7 @@ module Faye
           channel.bind(:message, &callback)
         end
       end
-      
+
       def unsubscribe(name, callback)
         channel = @channels[name]
         return false unless channel
@@ -109,7 +109,7 @@ module Faye
           false
         end
       end
-      
+
       def distribute_message(message)
         channels = Channel.expand(message['channel'])
         channels.each do |name|
@@ -118,7 +118,7 @@ module Faye
         end
       end
     end
-    
+
   end
 end