alondra 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,138 +1,134 @@
 PATH
   remote: .
   specs:
-    alondra (0.0.2)
+    alondra (0.0.4)
       daemons
       em-websocket
-      em-zeromq (= 0.2.1)
-      eventmachine (>= 1.0.0.beta.3)
-      ffi-rzmq (= 0.8.0)
+      em-zeromq (= 0.2.2)
       rails (>= 3.1.0)
       uuidtools
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.1)
-      actionpack (= 3.1.1)
-      mail (~> 2.3.0)
-    actionpack (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
+    actionmailer (3.2.0)
+      actionpack (= 3.2.0)
+      mail (~> 2.4.0)
+    actionpack (3.2.0)
+      activemodel (= 3.2.0)
+      activesupport (= 3.2.0)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.2)
+      journey (~> 1.0.0)
+      rack (~> 1.4.0)
       rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.2)
-    activemodel (3.1.1)
-      activesupport (= 3.1.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.0)
+      activesupport (= 3.2.0)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
-      arel (~> 2.2.1)
+    activerecord (3.2.0)
+      activemodel (= 3.2.0)
+      activesupport (= 3.2.0)
+      arel (~> 3.0.0)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
-    activesupport (3.1.1)
+    activeresource (3.2.0)
+      activemodel (= 3.2.0)
+      activesupport (= 3.2.0)
+    activesupport (3.2.0)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.2.6)
-    arel (2.2.1)
+    arel (3.0.2)
     builder (3.0.0)
-    capybara (1.1.1)
+    capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    capybara-webkit (0.7.2)
+    capybara-webkit (0.8.0)
       capybara (>= 1.0.0, < 1.2)
-    childprocess (0.2.2)
+      json
+    childprocess (0.3.0)
       ffi (~> 1.0.6)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.1.2)
-    daemons (1.1.4)
-    em-websocket (0.3.5)
+    coffee-script-source (1.2.0)
+    daemons (1.1.8)
+    em-websocket (0.3.6)
       addressable (>= 2.1.1)
       eventmachine (>= 0.12.9)
-    em-zeromq (0.2.1)
-      eventmachine (>= 1.0.0.beta.3)
-      ffi-rzmq (>= 0.7.2)
+    em-zeromq (0.2.2)
+      eventmachine (>= 1.0.0.beta.4)
+      ffi (>= 1.0.0)
+      ffi-rzmq (~> 0.9.0)
     erubis (2.7.0)
     eventmachine (1.0.0.beta.4)
-    execjs (1.2.9)
+    execjs (1.3.0)
       multi_json (~> 1.0)
-    factory_girl (2.2.0)
+    factory_girl (2.5.0)
       activesupport
-    ffi (1.0.9)
-    ffi-rzmq (0.8.0)
+    ffi (1.0.11)
+    ffi-rzmq (0.9.3)
+      ffi
     hike (1.2.1)
     i18n (0.6.0)
-    jquery-rails (1.0.16)
-      railties (~> 3.0)
+    journey (1.0.0)
+    jquery-rails (2.0.0)
+      railties (>= 3.2.0.beta, < 5.0)
       thor (~> 0.14)
-    json (1.6.1)
-    json_pure (1.6.1)
+    json (1.6.5)
     launchy (2.0.5)
       addressable (~> 2.2.6)
-    mail (2.3.0)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
-    multi_json (1.0.3)
-    mysql2 (0.3.7)
+    multi_json (1.0.4)
+    mysql2 (0.3.11)
     nokogiri (1.5.0)
     polyglot (0.3.3)
-    rack (1.3.5)
+    rack (1.4.1)
     rack-cache (1.1)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.1)
-      actionmailer (= 3.1.1)
-      actionpack (= 3.1.1)
-      activerecord (= 3.1.1)
-      activeresource (= 3.1.1)
-      activesupport (= 3.1.1)
+    rails (3.2.0)
+      actionmailer (= 3.2.0)
+      actionpack (= 3.2.0)
+      activerecord (= 3.2.0)
+      activeresource (= 3.2.0)
+      activesupport (= 3.2.0)
       bundler (~> 1.0)
-      railties (= 3.1.1)
-    railties (3.1.1)
-      actionpack (= 3.1.1)
-      activesupport (= 3.1.1)
+      railties (= 3.2.0)
+    railties (3.2.0)
+      actionpack (= 3.2.0)
+      activesupport (= 3.2.0)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2.2)
-    rdoc (3.11)
+    rdoc (3.12)
       json (~> 1.4)
-    rubyzip (0.9.4)
-    sass (3.1.10)
-    sass-rails (3.1.4)
-      actionpack (~> 3.1.0)
-      railties (~> 3.1.0)
-      sass (>= 3.1.4)
-      sprockets (~> 2.0.0)
-      tilt (~> 1.3.2)
-    selenium-webdriver (2.10.0)
-      childprocess (>= 0.2.1)
-      ffi (= 1.0.9)
-      json_pure
+    rubyzip (0.9.5)
+    sass (3.1.12)
+    sass-rails (3.2.3)
+      railties (~> 3.2.0.beta)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    selenium-webdriver (2.17.0)
+      childprocess (>= 0.2.5)
+      ffi (~> 1.0.9)
+      multi_json (~> 1.0.4)
       rubyzip
-    sprockets (2.0.3)
+    sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -141,8 +137,8 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    uglifier (1.0.4)
+    tzinfo (0.3.32)
+    uglifier (1.2.2)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     uuidtools (2.1.2)

data/alondra.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.name = "alondra"
   s.summary = "Add real time capabilities to your rails app"
   s.description = "Add real time capabilities to your rails app"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
   s.authors = ['Alberto F. Capel', 'Ryan LeCompte']
 
   s.files         = `git ls-files`.split("\n")
@@ -16,8 +16,6 @@ Gem::Specification.new do |s|
   s.add_dependency('daemons')
   s.add_dependency('uuidtools')
   s.add_dependency('rails', '>= 3.1.0')
-  s.add_dependency('eventmachine', '>= 1.0.0.beta.3')
   s.add_dependency('em-websocket')
-  s.add_dependency('ffi-rzmq', '0.8.0')
-  s.add_dependency('em-zeromq', '0.2.1')
+  s.add_dependency('em-zeromq', '0.2.2')
 end

data/app/assets/javascripts/alondra-client.js.coffee.erb

@@ -7,57 +7,61 @@
 window.WEB_SOCKET_SWF_LOCATION = "<%= asset_path 'WebSocketMain.swf' %>"
 
 class @AlondraClient
-  constructor: (host, port, channels, token = null, retry = 5000) ->
-    @channels = channels
-    @token    = token
-    @retry    = retry
-    @url = "ws://#{host}:#{port}"
-
+  constructor: (@server, @channels=[], @token = null, @retry = 10000) ->
+    
+    @channels = [@channels] unless @channels instanceof Array
+    
+    @url = "ws://#{@server}"
     @url += "?token=#{@token}" if @token
 
-    this.connect()
+    @connect()
 
-  subscribe: (channel) ->
+  subscribe: (channel) =>
+    if @socket.readyState ==  0 # Socket is connecting
+      @channels.push(channel)   # Schedule for later subscription
+      return
+    
     subscription =
       command: 'subscribe'
       channel: channel
 
     @socket.send $.toJSON(subscription)
-
-  connect: ->
-    @socket   = new WebSocket(@url)
-
-    @socket.onopen = () =>
-      if @reconnectInterval
-        clearInterval(@reconnectInterval)
-        @reconnectInterval = null
-
-      if @channels instanceof Array
-        this.subscribe(channel) for channel in @channels
-      else
-        this.subscribe(@channels)
+    @
+    
+  connected: () =>
+    if @reconnectInterval
+      clearInterval(@reconnectInterval)
+      @reconnectInterval = null
+      
+    @subscribe(channel) for channel in @channels
+    
+  connect: =>
+    @socket = new WebSocket(@url)
+    
+    @socket.onopen = @connected
 
     @socket.onclose = () =>
       this.reconnect()
 
-
     @socket.onmessage = (message) =>
       msg = $.parseJSON(message.data)
       if msg.event
-        this.process(msg)
+        @process(msg)
       else
-        this.execute(msg)
+        @execute(msg)
 
 
     @socket.onerror = (error) =>
-      this.reconnect()
+      @reconnect()
+    
+    @
 
   process: (serverEvent) ->
     eventName    = serverEvent.event
     resourceType = serverEvent.resource_type
     resource     = serverEvent.resource
 
-    $(this).trigger("#{eventName}.#{resourceType}", resource)
+    $(@).trigger("#{eventName}.#{resourceType}", resource)
 
   execute: (message) ->
     eval(message.message)

data/lib/alondra.rb

@@ -1,3 +1,4 @@
+require_relative 'alondra/log'
 require_relative 'alondra/message'
 require_relative 'alondra/event'
 require_relative 'alondra/connection'
@@ -27,6 +28,13 @@ module Alondra
     config.port         = Rails.env == 'test' ? 12346 : 12345
     config.host         = 'localhost'
     config.queue_socket = 'ipc:///tmp/alondra.ipc'
+    
+    initializer "configure EM thread pool" do
+      # If we have more threads than db connections we will exhaust the conn pool
+      threadpool_size = ActiveRecord::Base.connection_pool.instance_variable_get :@size
+      threadpool_size -= 2 if threadpool_size > 2
+      EM.threadpool_size = threadpool_size
+    end
 
     initializer "enable sessions for flash websockets" do
       Rails.application.config.session_store :cookie_store, httponly: false
@@ -35,9 +43,13 @@ module Alondra
     initializer "load listeners" do
       listeners_dir = File.join(Rails.root, 'app', 'listeners')
       
-      Rails.logger.info "Loading event listeners in #{listeners_dir}"
+      Log.info "Loading event listeners in #{listeners_dir}"
       Dir[File.join(listeners_dir, '*.rb')].each { |file| require_dependency file }
     end
+    
+    config.after_initialize do
+      PushController.send :include, Rails.application.routes.url_helpers
+    end
 
     def self.start_server_in_new_thread!
       Thread.new do
@@ -46,29 +58,29 @@ module Alondra
     end
 
     def self.start_server!
+      
+      start_server_proc = Proc.new do
+        MessageQueue.instance.start_listening
+        Server.run
+        die_gracefully_on_signal
+      end
+      
       if EM.reactor_running?
-        EM.schedule do
-          MessageQueue.instance.start_listening
-          Server.run
-        end
+        EM.schedule(start_server_proc) 
       else
-        Rails.logger.info "starting EM reactor"
-        EM.run do
-          MessageQueue.instance.start_listening
-          Server.run
-        end
-        die_gracefully_on_signal
+        Log.info "starting EM reactor"
+        EM.run(start_server_proc)
       end
     end
 
     def self.die_gracefully_on_signal
       Signal.trap("INT")  do
-        Rails.logger.warn "INT signal trapped. Shutting down EM reactor"
+        Log.warn "INT signal trapped. Shutting down EM reactor"
         EM.stop
       end
 
       Signal.trap("TERM") do
-        Rails.logger.warn "TERM signal trapped. Shutting down EM reactor"
+        Log.warn "TERM signal trapped. Shutting down EM reactor"
         EM.stop
       end
     end

data/lib/alondra/command.rb

@@ -27,10 +27,12 @@ module Alondra
     end
 
     def fire_event(event_type)
-      event_hash = {:event         => event_type,
-                    :resource      => @connection.session,
-                    :resource_type => @connection.session.class.name,
-                    :channel       => @channel_name}
+      event_hash = {
+        :event         => event_type,
+        :resource      => @connection.session,
+        :resource_type => @connection.session.class.name,
+        :channel       => @channel_name
+      }
 
       Event.new(event_hash, nil, connection).fire!
     end

data/lib/alondra/connection.rb

@@ -40,7 +40,7 @@ module Alondra
     end
 
     def receive(event_or_message)
-      Rails.logger.debug "sending: #{event_or_message.to_json}"
+      Log.info "sending: #{event_or_message.to_json}"
       websocket.send event_or_message.to_json
     end
 

data/lib/alondra/event.rb

@@ -11,20 +11,8 @@ module Alondra
       @type         = event_hash[:event].to_sym
       @json_encoded = from_json
 
-      if Hash === event_hash[:resource]
-        @resource = fetch(event_hash[:resource_type], event_hash[:resource])
-      else
-        @resource = event_hash[:resource]
-      end
-
-      @resource_type = event_hash[:resource_type] || resource.class.name
-
-      if event_hash[:channel].present?
-        @channel_name  = event_hash[:channel]
-      else
-        channel_type = type == :updated ? :member : :collection
-        Channel.default_name_for(resource, channel_type)
-      end
+      set_resource_from(event_hash)
+      set_channel_from(event_hash)
     end
 
     def channel
@@ -70,5 +58,24 @@ module Alondra
       resource.assign_attributes(filtered_attributes, :without_protection => true)
       resource
     end
+    
+    def set_resource_from(event_hash)
+      if Hash === event_hash[:resource]
+        @resource = fetch(event_hash[:resource_type], event_hash[:resource])
+      else
+        @resource = event_hash[:resource]
+      end
+      
+      @resource_type = event_hash[:resource_type] || resource.class.name
+    end
+    
+    def set_channel_from(event_hash)
+      if event_hash[:channel].present?
+        @channel_name  = event_hash[:channel]
+      else
+        channel_type = type == :updated ? :member : :collection
+        Channel.default_name_for(resource, channel_type)
+      end
+    end
   end
 end

data/lib/alondra/event_listener.rb

@@ -64,9 +64,9 @@ module Alondra
           begin
             new_instance.instance_exec(event, &callback.proc)
           rescue Exception => ex
-            Rails.logger.error 'Error while processing event listener callback'
-            Rails.logger.error ex.message
-            Rails.logger.error ex.stacktrace if ex.respond_to? :stacktrace
+            Log.error 'Error while processing event listener callback'
+            Log.error ex.message
+            Log.error ex.backtrace.join("\n")
           end
         end
       end

data/lib/alondra/log.rb

@@ -0,0 +1,43 @@
+module Alondra
+  module Log
+    extend self
+    
+    NUMBER_TO_NAME_MAP  = {0=>'DEBUG', 1=>'INFO', 2=>'WARN', 3=>'ERROR', 4=>'FATAL', 5=>'UNKNOWN'}
+    NUMBER_TO_COLOR_MAP = {0=>'0;37', 1=>'32', 2=>'33', 3=>'31', 4=>'31', 5=>'37'}
+   
+    
+    def debug(message)
+      add(ActiveSupport::BufferedLogger::Severity::DEBUG, message)
+    end
+    
+    def info(message)
+      add(ActiveSupport::BufferedLogger::Severity::INFO, message)
+    end
+    
+    def warn(message)
+      add(ActiveSupport::BufferedLogger::Severity::WARN, message)
+    end
+    
+    def error(message)
+      add(ActiveSupport::BufferedLogger::Severity::ERROR, message)
+    end
+    
+    def fatal(message)
+      add(ActiveSupport::BufferedLogger::Severity::FATAL, message)
+    end
+    
+    def unkwon(message)
+      add(ActiveSupport::BufferedLogger::Severity::UNKNOWN, message)
+    end
+    
+    private
+    
+    def add(severity, message = nil, progname = 'ALONDRA')
+      sevstring = NUMBER_TO_NAME_MAP[severity]
+      color     = NUMBER_TO_COLOR_MAP[severity]
+      
+      message = "\n\033[35m#{progname}:\033[0m[\033[#{color}m#{sevstring}\033[0m] #{message.strip}\033\n"
+      Rails.logger.add(severity, message, progname)
+    end
+  end
+end

data/lib/alondra/message_queue.rb

@@ -7,10 +7,10 @@ module Alondra
     include Singleton
 
     def start_listening
-      Rails.logger.info "Starting message queue"
+      Log.info "Starting message queue"
 
       if @connection
-        Rails.logger.warn 'Push connection to message queue started twice'
+        Log.warn 'Push connection to message queue started twice'
         reset!
       end
 
@@ -23,9 +23,9 @@ module Alondra
         begin
           parse received.copy_out_string
         rescue Exception => ex
-          Rails.logger.error "Error raised while processing message"
-          Rails.logger.error "#{ex.class}: #{ex.message}"
-          Rails.logger.error ex.backtrace.join("\n") if ex.respond_to? :backtrace
+          Log.error "Error raised while processing message"
+          Log.error "#{ex.class}: #{ex.message}"
+          Log.error ex.backtrace.join("\n") if ex.respond_to? :backtrace
         end
       end
     end
@@ -40,7 +40,7 @@ module Alondra
         message = Message.new(received_hash[:message], received_hash[:channel_names])
         message.send_to_channels
       else
-        Rails.logger.warn "Unrecognized message type #{received_string}"
+        Log.warn "Unrecognized message type #{received_string}"
       end
     end
 

data/lib/alondra/message_queue_client.rb

@@ -32,7 +32,7 @@ module Alondra
         begin
           push_socket.send_msg(message.to_json)
         rescue Exception => ex
-          Rails.logger.error "Exception while sending message to message queue: #{ex.message}"
+          Log.error "Exception while sending message to message queue: #{ex.message}"
         end
       end
     end
@@ -52,7 +52,7 @@ module Alondra
       begin
         push_socket.send_string(message.to_json)
       rescue Exception => ex
-        Rails.logger.error "Exception while sending message to message queue: #{ex.message}"
+        Log.error "Exception while sending message to message queue: #{ex.message}"
       end
     end
 

data/lib/alondra/push_controller.rb

@@ -6,22 +6,23 @@ module Alondra
     include AbstractController::Helpers
     include AbstractController::Translation
     include AbstractController::AssetPaths
-    include AbstractController::ViewPaths
+    include ActionController::RequestForgeryProtection
 
     attr_accessor :channel_names
+    attr_accessor :request
 
-    def initialize(context, to)
+    def initialize(context, to, request = nil)
       @channel_names = Channel.names_for(to)
-
+      @request = request
+      
       self.class.view_paths = ActionController::Base.view_paths
       copy_instance_variables_from(context)
     end
 
     def render_push(options)
-
       if EM.reactor_thread?
-        Rails.logger.warn('Your are rendering a view from the Event Machine reactor thread')
-        Rails.logger.warn('Rendering a view is a possibly blocking operation, so be careful')
+        Log.warn 'You are rendering a view from the Event Machine reactor thread'
+        Log.warn 'Rendering a view is a possibly blocking operation, so be careful'
       end
 
       message_content = render_to_string(*options)
@@ -36,7 +37,7 @@ module Alondra
     def view_paths
       @view_paths ||= ApplicationController.send '_view_paths'
     end
-
+    
     def action_name
       'push'
     end

data/lib/alondra/pushing.rb

@@ -7,7 +7,12 @@ module Alondra
       raise PushingException.new('You need to specify the channel to push') unless args.last[:to].present?
 
       to = args.last.delete(:to)
-      controller = PushController.new(self, to)
+      
+      # If we are called in the context of a request we save this information
+      # so we can create proper routes
+      caller_request = self.respond_to?(:request) ? request : nil
+      
+      controller = PushController.new(self, to, caller_request)
       controller.render_push(args)
     end
   end

data/lib/alondra/server.rb

@@ -5,39 +5,39 @@ module Alondra
     extend self
 
     def run
-      Rails.logger.info "Server starting on port #{Alondra.config.port}"
+      Log.info "Server starting on port #{Alondra.config.port}"
 
       EM::WebSocket.start(:host => '0.0.0.0', :port => Alondra.config.port) do |websocket|
 
         websocket.onopen do
           session = SessionParser.parse(websocket)
-          
-          Rails.logger.info "client connected."
+
+          Log.info "client connected."
           Connection.new(websocket, session)
         end
 
         websocket.onclose do
-          Rails.logger.info "Connection closed"
+          Log.info "Connection closed"
           Connections[websocket].destroy! if Connections[websocket].present?
         end
 
         websocket.onerror do |ex|
           puts "Error: #{ex.message}"
-          Rails.logger.error "Error: #{ex.message}"
-          Rails.logger.error ex.backtrace.join("\n")
+          Log.error "Error: #{ex.message}"
+          Log.error ex.backtrace.join("\n")
           Connections[websocket].destroy! if Connections[websocket]
         end
 
         websocket.onmessage do |msg|
-          Rails.logger.info "received: #{msg}"
+          Log.info "received: #{msg}"
           CommandDispatcher.dispatch(msg, Connections[websocket])
         end
       end
 
       EM.error_handler do |error|
         puts "Error raised during event loop: #{error.message}"
-        Rails.logger.error "Error raised during event loop: #{error.message}"
-        Rails.logger.error error.stacktrace if error.respond_to? :stacktrace
+        Log.error "Error raised during event loop: #{error.message}"
+        Log.error error.backtrace.join("\n")
       end
     end
   end

data/lib/alondra/session_parser.rb

@@ -29,10 +29,10 @@ module Alondra
         encoded_session = cookies.detect{|c| c.include?(session_key)}.gsub("#{session_key}=",'').strip
         verifier.verify(CGI.unescape(encoded_session))
       rescue ActiveSupport::MessageVerifier::InvalidSignature => ex
-        Rails.logger.error "invalid session cookie: #{cookie}"
+        Log.error "invalid session cookie: #{cookie}"
         Hash.new
       rescue Exception => ex
-        Rails.logger.error "Exception parsing session from cookie: #{ex.message}"
+        Log.error "Exception parsing session from cookie: #{ex.message}"
       end
     end
 
@@ -41,7 +41,7 @@ module Alondra
         decoded_token = verifier.verify(token)
         ActiveSupport::JSON.decode(decoded_token)
       rescue ActiveSupport::MessageVerifier::InvalidSignature => ex
-        Rails.logger.error "invalid session token: #{token}"
+        Log.error "invalid session token: #{token}"
         Hash.new
       end
     end

data/lib/generators/alondra/templates/alondra

@@ -6,28 +6,25 @@ require 'rubygems'
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
 require 'daemons'
 
-
-log_dir = File.expand_path('../log', File.dirname(__FILE__))
-
 options = {
   :app_name   => 'alondra',
   :dir_mode   => :script,
-  :dir        => 'log',
-  :log_dir    => log_dir
+  :dir        => 'tmp/pids'
 }
 
 Daemons.run_proc 'alondra', options do
 
   ENV["ALONDRA_SERVER"] = 'true'
+  
   require_relative File.join('..', 'config', 'environment')
-
-  log_path = File.join(log_path, 'alondra.log')
+  
+  log_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'log', 'alondra.log'))
+  
   Rails.logger =  ActiveSupport::BufferedLogger.new(log_path)
 
-  Alondra::Alondra.start_server!
-
-  Rails.logger.info "Started alondra server... #{EM.reactor_running?}"
+  Log.info "Started alondra server on port #{Alondra::Alondra.config.port}... #{EM.reactor_running?}"
 
   EM.reactor_thread.join
-  Rails.logger.info 'Alondra server terminated'
+  
+  Log.info 'Alondra server terminated'
 end

data/test/dummy/app/views/chats/show.html.erb

@@ -36,7 +36,7 @@
 <%= javascript_include_tag 'alondra-client' %>
 
 <script type="text/javascript">
-  var client = new AlondraClient('localhost', <%= Alondra::Alondra.config.port %>, '<%= chat_path(@path) %>', '<%= encrypted_token %>');
+  var client = new AlondraClient('localhost:<%= Alondra::Alondra.config.port %>', '<%= chat_path(@path) %>', '<%= encrypted_token %>');
 
   $(client).bind('subscribed.Chat', function(event, resource){
     console.log('Received subscribed event!');

data/test/integration/push_changes_test.rb

@@ -31,7 +31,7 @@ module Alondra
 
       chat.update_attributes! :name => 'A chat about everything'
 
-      sleep(0.5)
+      sleep(0.1)
 
       wait_until(15) do
         page.has_content? 'A chat about everything'

data/test/integration/push_messages_test.rb

@@ -31,6 +31,8 @@ module Alondra
       end
 
       push :partial => '/shared/message', :to => chat_path
+      
+      sleep(0.1)
 
       wait_until 20 do
         page.has_content? "#{@user.username} says hola!"

data/test/models/channel_test.rb

@@ -40,7 +40,7 @@ module Alondra
 
       assert EM.reactor_running?
 
-      sleep(0.5) # Leave event machine to catch up
+      sleep(0.1) # Leave event machine to catch up
 
       last_message = @connection.messages.last
       assert_equal event.to_json, last_message

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alondra
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-24 00:00:00.000000000Z
+date: 2012-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &2152723200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152723200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &2152722760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152722760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152722260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,21 +54,15 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152722260
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: &2152721740 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.3
-  type: :runtime
-  prerelease: false
-  version_requirements: *2152721740
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &2152721360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,29 +70,28 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152721360
-- !ruby/object:Gem::Dependency
-  name: ffi-rzmq
-  requirement: &2152720780 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *2152720780
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: em-zeromq
-  requirement: &2152720280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152720280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 description: Add real time capabilities to your rails app
 email: 
 executables: []
@@ -121,6 +124,7 @@ files:
 - lib/alondra/event_listener.rb
 - lib/alondra/event_router.rb
 - lib/alondra/listener_callback.rb
+- lib/alondra/log.rb
 - lib/alondra/message.rb
 - lib/alondra/message_queue.rb
 - lib/alondra/message_queue_client.rb
@@ -231,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Add real time capabilities to your rails app
@@ -314,3 +318,4 @@ test_files:
 - test/support/mocks/mock_event_router.rb
 - test/support/mocks/mock_listener.rb
 - test/test_helper.rb
+has_rdoc: