jschat 0.1.5 → 0.2.0

data/lib/jschat/client.rb

@@ -130,7 +130,7 @@ module JsChat
       command = get_command json
 
       if command
-        time = get_time json[json[command]]
+        time = get_time json
         response = send(protocol_method_name(command, json[command]), json[json[command]])
         case response
         when Array

data/lib/jschat/http/helpers/url_for.rb

@@ -0,0 +1,38 @@
+# From http://github.com/emk/sinatra-url-for/blob/master/lib/sinatra/url_for.rb
+module Sinatra
+  module UrlForHelper
+    # Construct a link to +url_fragment+, which should be given relative to
+    # the base of this Sinatra app. The mode should be either
+    # <code>:path_only</code>, which will generate an absolute path within
+    # the current domain (the default), or <code>:full</code>, which will
+    # include the site name and port number. (The latter is typically
+    # necessary for links in RSS feeds.) Example usage:
+    #
+    # url_for "/" # Returns "/myapp/"
+    # url_for "/foo" # Returns "/myapp/foo"
+    # url_for "/foo", :full # Returns "http://example.com/myapp/foo"
+    #--
+    # See README.rdoc for a list of some of the people who helped me clean
+    # up earlier versions of this code.
+    def url_for url_fragment, mode=:path_only
+      case mode
+      when :path_only
+        base = request.script_name
+      when :full
+        scheme = request.scheme
+        if (scheme == 'http' && request.port == 80 ||
+            scheme == 'https' && request.port == 443)
+          port = ""
+        else
+          port = ":#{request.port}"
+        end
+        base = "#{scheme}://#{request.host}#{port}#{request.script_name}"
+      else
+        raise TypeError, "Unknown url_for mode #{mode}"
+      end
+      "#{base}#{url_fragment}"
+    end
+  end
+ 
+  helpers UrlForHelper
+end

data/lib/jschat/http/jschat.rb

@@ -3,13 +3,64 @@ require 'sinatra'
 require 'sha1'
 require 'json'
 require 'sprockets'
-require 'jschat/server_options'
+require 'jschat/init'
+require 'jschat/http/helpers/url_for'
 
 set :public, File.join(File.dirname(__FILE__), 'public')
 set :views, File.join(File.dirname(__FILE__), 'views')
+set :sessions, true
+
+module JsChat::Auth
+end
+
+module JsChat::Auth::Twitter
+  def self.template
+    :twitter
+  end
+
+  def self.load
+    require 'twitter_oauth'
+    @loaded = true
+  rescue LoadError
+    puts 'Error: twitter_oauth gem not found'
+    @loaded = false
+  end
+
+  def self.loaded?
+    @loaded
+  end
+end
 
 module JsChat
   class ConnectionError < Exception ; end
+
+  def self.configure_authenticators
+    if ServerConfig['twitter']
+      JsChat::Auth::Twitter.load
+    end
+  end
+
+  def self.init
+    configure_authenticators
+    JsChat.init_storage
+  end
+end
+
+JsChat.init
+
+before do
+  if JsChat::Auth::Twitter.loaded?
+    @twitter = TwitterOAuth::Client.new(
+      :consumer_key => ServerConfig['twitter']['key'],
+      :consumer_secret => ServerConfig['twitter']['secret'],
+      :token => session[:access_token],
+      :secret => session[:secret_token]
+    )
+
+    if twitter_user?
+      load_twitter_user_and_set_bridge_id
+    end
+  end
 end
 
 # todo: can this be async and allow the server to have multiple threads? 
@@ -29,8 +80,8 @@ class JsChat::Bridge
     @cookie = response['cookie']
   end
 
-  def identify(name, ip)
-    response = send_json({ :identify => name, :ip => ip })
+  def identify(name, ip, session_length = nil)
+    response = send_json({ :identify => name, :ip => ip, :session_length => session_length })
     if response['display'] == 'error'
       @identification_error = response
       false
@@ -52,6 +103,10 @@ class JsChat::Bridge
     send_json({ 'since' => room })['messages']
   end
 
+  def room_update_times
+    send_json({ 'times' => 'all' })
+  end
+
   def join(room)
     send_json({ :join => room }, false)
   end
@@ -119,13 +174,13 @@ helpers do
   end
 
   def load_bridge
-    @bridge = JsChat::Bridge.new request.cookies['jschat-id']
+    @bridge = JsChat::Bridge.new session[:jschat_id]
   end
 
   def load_and_connect
-    @bridge = JsChat::Bridge.new request.cookies['jschat-id']
+    @bridge = JsChat::Bridge.new session[:jschat_id]
     @bridge.connect
-    response.set_cookie 'jschat-id', @bridge.cookie
+    session[:jschat_id] = @bridge.cookie
   end
 
   def save_last_room(room)
@@ -152,7 +207,44 @@ helpers do
 
   def clear_cookies
     response.set_cookie 'last-room', nil
-    response.set_cookie 'jschat-id', nil
+    session[:jschat_id] = nil
+    session[:request_token] = nil
+    session[:request_token_secret] = nil
+    session[:access_token] = nil
+    session[:secret_token] = nil
+    session[:twitter_name] = nil
+  end
+
+  def twitter_user?
+    session[:access_token] && session[:secret_token]
+  end
+
+  def save_twitter_user(options = {})
+    options = load_twitter_user.merge(options).merge({
+      'name'         => nickname,
+      'twitter_name' => session[:twitter_name],
+      'access_token' => session[:access_token],
+      'secret_token' => session[:secret_token]
+    })
+    JsChat::Storage.driver.save_user(options)
+  end
+
+  def save_twitter_user_rooms
+    if twitter_user?
+      rooms = @bridge.rooms
+      save_twitter_user('rooms' => rooms)
+    end
+  end
+
+  def load_twitter_user
+    JsChat::Storage.driver.find_user({ 'twitter_name' => session[:twitter_name] }) || {}
+  end
+
+  def load_twitter_user_and_set_bridge_id
+    user = load_twitter_user
+    if user['jschat_id'] and user['jschat_id'].size > 0
+      response.set_cookie 'jschat_id', user['jschat_id']
+    end
   end
 
   def nickname
@@ -202,6 +294,13 @@ get '/messages' do
   end
 end
 
+get '/room_update_times' do
+  load_bridge
+  if @bridge.active?
+    messages_js @bridge.room_update_times
+  end
+end
+
 get '/names' do
   load_bridge
   save_last_room params['room']
@@ -220,13 +319,14 @@ post '/join' do
   load_bridge
   @bridge.join params['room']
   save_last_room params['room']
+  save_twitter_user_rooms
   'OK'
 end
 
 get '/part' do
   load_bridge
   @bridge.part params['room']
-
+  save_twitter_user_rooms
   if @bridge.last_error
     error 500, [@bridge.last_error].to_json 
   else
@@ -270,7 +370,70 @@ end
 
 get '/rooms' do
   load_bridge
-  @bridge.rooms.to_json
+  rooms = @bridge.rooms
+  save_twitter_user('rooms' => rooms) if twitter_user?
+  rooms.to_json
+end
+
+get '/twitter' do
+  request_token = @twitter.request_token(
+    :oauth_callback => url_for('/twitter_auth', :full)
+  )
+  session[:request_token] = request_token.token
+  session[:request_token_secret] = request_token.secret
+  redirect request_token.authorize_url.gsub('authorize', 'authenticate') 
+end
+
+get '/twitter_auth' do
+  # Exchange the request token for an access token.
+  begin
+    @access_token = @twitter.authorize(
+      session[:request_token],
+      session[:request_token_secret],
+      :oauth_verifier => params[:oauth_verifier]
+    )
+  rescue OAuth::Unauthorized => exception
+    puts exception
+  end
+  
+  if @twitter.authorized?
+    session[:access_token] = @access_token.token
+    session[:secret_token] = @access_token.secret
+    session[:twitter_name] = @twitter.info['screen_name']
+
+    # TODO: Make this cope if someone has the same name
+    room = '#jschat'
+    save_nickname @twitter.info['screen_name']
+    user = load_twitter_user
+    session[:jschat_id] = user['jschat_id'] if user['jschat_id'] and !user['jschat_id'].empty?
+    save_twitter_user('twitter_name' => @twitter.info['screen_name'], 'jschat_id' => session[:jschat_id])
+    user = load_twitter_user
+
+    load_bridge
+    if @bridge.active?
+      if user['rooms'] and user['rooms'].any?
+        room = user['rooms'].first
+      end
+    else
+      session[:jschat_id] = nil
+      load_and_connect
+      save_twitter_user('jschat_id' => session[:jschat_id])
+      @bridge.identify(@twitter.info['screen_name'], request.ip, (((60 * 60) * 24) * 7))
+      if user['rooms']
+        user['rooms'].each do |room|
+          @bridge.join room
+        end
+        room = user['rooms'].first
+      else
+        save_last_room '#jschat'
+        @bridge.join '#jschat'
+      end
+    end
+
+    redirect "/chat/#{room}"
+  else
+    redirect '/'
+  end
 end
 
 # This serves the JavaScript concat'd by Sprockets

data/lib/jschat/http/public/javascripts/app/controllers/chat_controller.js

@@ -14,6 +14,42 @@ JsChat.ChatController = Class.create({
     $('messages').observe('scroll', this.messagesScrolled.bindAsEventListener(this));
     $$('#rooms li.join a').first().observe('click', this.joinRoomClicked.bindAsEventListener(this));
     Event.observe(document, 'click', this.roomTabClick.bindAsEventListener(this));
+    this.allRecentMessages();
+  },
+
+  allRecentMessages: function() {
+    new Ajax.Request('/room_update_times', {
+      method: 'get',
+      onComplete: function(request) {
+        var times = request.responseText.evalJSON();
+        $H(this.lastUpdateTimes).each(function(data) {
+          var room = data[0],
+              time = data[1];
+          if (Date.parse(time) < Date.parse(times[room])) {
+            this.roomTabAlert(room);
+          }
+        }.bind(this));
+        this.lastUpdateTimes = times;
+      }.bind(this)
+    });
+  },
+
+  roomTabAlert: function(room) {
+    if (room === PageHelper.currentRoom()) return;
+
+    $$('ul#rooms li a').each(function(roomLink) {
+      if (roomLink.innerHTML === room) {
+        roomLink.addClassName('new');
+      }
+    });
+  },
+
+  clearRoomTabAlert: function(room) {
+    $$('ul#rooms li a').each(function(roomLink) {
+      if (roomLink.innerHTML === room) {
+        roomLink.removeClassName('new');
+      }
+    });
   },
 
   joinRoomClicked: function(e) {
@@ -77,7 +113,7 @@ JsChat.ChatController = Class.create({
           if (message.match(/^\//)) {
             Display.add_message('Error: Command not found.  Use /help display commands.', 'error');
           } else {
-            Display.message({ 'message': message.escapeHTML(), 'user': $('name').innerHTML }, true);
+            Display.message({ 'message': message.escapeHTML(), 'user': $('name').innerHTML }, new Date());
             new Ajax.Request('/message', {
               method: 'post',
               parameters: { 'message': message, 'to': PageHelper.currentRoom() }
@@ -112,8 +148,8 @@ JsChat.ChatController = Class.create({
     });
 
     this.createPollers();
+    this.getRoomList(this.addRoomAndCheckSelected);
     this.joinRoom(PageHelper.currentRoom());
-    this.getRoomList(this.addRoomToNav);
   },
 
   getRoomList: function(callback) {
@@ -121,8 +157,12 @@ JsChat.ChatController = Class.create({
       method: 'get',
       parameters: { time: new Date().getTime() },
       onComplete: function(response) {
-        response.responseText.evalJSON().each(function(roomName) {
-          callback(roomName);
+        response.responseText.evalJSON().sort().each(function(roomName) {
+          try {
+            callback.apply(this, [roomName]);
+          } catch (exception) {
+            console.log(exception);
+          }
         }.bind(this));
       }.bind(this)
     }); 
@@ -138,7 +178,7 @@ JsChat.ChatController = Class.create({
       },
       onComplete: function() {
         // Make the server update the last polled time
-        JsChat.Request.get('/messages');
+        JsChat.Request.get('/messages', function() {});
         document.title = PageHelper.title();
         UserCommands['/lastlog'].apply(this);
         $('loading').hide();
@@ -181,6 +221,10 @@ JsChat.ChatController = Class.create({
     $('rooms').insert({ bottom: '<li#{classAttribute}><a href="#{roomName}">#{roomName}</a></li>'.interpolate({ classAttribute: classAttribute, roomName: roomName }) });
   },
 
+  addRoomAndCheckSelected: function(roomName) {
+    this.addRoomToNav(roomName, PageHelper.currentRoom() == roomName);
+  },
+
   removeSelectedTab: function() {
     $$('#rooms .selected').invoke('removeClassName', 'selected');
   },
@@ -197,6 +241,7 @@ JsChat.ChatController = Class.create({
     this.removeSelectedTab();
     PageHelper.setCurrentRoomName(roomName);
     this.joinRoom(roomName);
+    $('message').focus();
   },
 
   switchRoom: function(roomName) {
@@ -208,6 +253,8 @@ JsChat.ChatController = Class.create({
     this.selectRoomTab(roomName);
     PageHelper.setCurrentRoomName(roomName);
     UserCommands['/lastlog'].apply(this);
+    this.clearRoomTabAlert(roomName);
+    $('message').focus();
   },
 
   rooms: function() {
@@ -263,6 +310,10 @@ JsChat.ChatController = Class.create({
   },
 
   updateMessages: function() {
+    if (this.pausePollers) {
+      return;
+    }
+
     new Ajax.Request('/messages', {
       method: 'get',
       parameters: { time: new Date().getTime(), room: PageHelper.currentRoom() },
@@ -284,9 +335,9 @@ JsChat.ChatController = Class.create({
     json_set.each(function(json) {
       try {
         if (json['change']) {
-          Change[json['change']](json[json['change']]);
+          Change[json['change']](json[json['change']], json['time']);
         } else {
-          Display[json['display']](json[json['display']]);
+          Display[json['display']](json[json['display']], json['time']);
           if (json['display'] !== 'error' && typeof successCallback !== 'undefined') {
             successCallback();
           }
@@ -316,5 +367,6 @@ JsChat.ChatController = Class.create({
     this.pollers = $A();
     this.pollers.push(new PeriodicalExecuter(this.updateMessages.bind(this), 3));
     this.pollers.push(new PeriodicalExecuter(this.checkIdleNames.bind(this), 5));
+    this.pollers.push(new PeriodicalExecuter(this.allRecentMessages.bind(this), 10));
   }
 });

data/lib/jschat/http/public/javascripts/app/protocol/change.js

@@ -1,11 +1,11 @@
 var Change = {
-  user: function(user) {
+  user: function(user, time) {
     if (user['name']) {
       change = $H(user['name']).toArray()[0];
       var old = change[0],
           new_value = change[1];
       if (new_value !== PageHelper.nickname()) {
-        Display.add_message("#{old} is now known as #{new_value}".interpolate({ old: old, new_value: new_value }), 'server', user['time']);
+        Display.add_message("#{old} is now known as #{new_value}".interpolate({ old: old, new_value: new_value }), 'server', time);
       }
       $$('#names li').each(function(element) {
         if (element.innerHTML == old) element.innerHTML = new_value;

data/lib/jschat/http/public/javascripts/app/protocol/display.js

@@ -13,7 +13,7 @@ var Display = {
     }.bind(this));
   },
 
-  message: function(message) {
+  message: function(message, time) {
     var name = $('name').innerHTML;
     var user_class = name == message['user'] ? 'user active' : 'user';
     var text = '<span class="\#{user_class}">\#{user}</span> <span class="\#{message_class}">\#{message}</span>';
@@ -24,9 +24,15 @@ var Display = {
 
     Display.clearIdleState(message['user']);
 
-    text = text.interpolate({ user_class: user_class, room: message['room'], user: TextHelper.truncateName(message['user']), message: TextHelper.decorateMessage(message['message']), message_class: 'message' });
-    this.add_message(text, 'message', message['time']);
+    text = text.interpolate({
+      user_class: user_class,
+      room: message['room'],
+      user: TextHelper.truncateName(message['user']),
+      message: TextHelper.decorateMessage(message['message']),
+      message_class: 'message'
+    });
 
+    this.add_message(text, 'message', time);
     this.addImageOnLoads();
 
     if (this.show_unread) {
@@ -110,9 +116,9 @@ var Display = {
     $('room-name').title = PageHelper.currentRoom();
   },
 
-  join_notice: function(join) {
+  join_notice: function(join, time) {
     this.add_user(join['user']);
-    this.add_message(join['user'] + ' has joined the room', 'server', join['time']);
+    this.add_message(join['user'] + ' has joined the room', 'server', time);
   },
 
   add_user: function(name) {
@@ -127,14 +133,14 @@ var Display = {
     }
   },
 
-  part_notice: function(part) {
+  part_notice: function(part, time) {
     this.remove_user(part['user']);
-    this.add_message(part['user'] + ' has left the room', 'server', part['time']);
+    this.add_message(part['user'] + ' has left the room', 'server', time);
   },
 
-  quit_notice: function(quit) {
+  quit_notice: function(quit, time) {
     this.remove_user(quit['user']);
-    this.add_message(quit['user'] + ' has quit', 'server', quit['time']);
+    this.add_message(quit['user'] + ' has quit', 'server', time);
   },
 
   notice: function(notice) {

data/lib/jschat/http/public/javascripts/app/ui/commands.js

@@ -27,11 +27,13 @@ var UserCommands = {
   },
 
   '/lastlog': function() {
+    this.pausePollers = true;
     $('messages').innerHTML = '';
     JsChat.Request.get('/lastlog', function(transport) {
       this.displayMessages(transport.responseText);
       $('names').innerHTML = '';
       this.updateNames();
+      this.pausePollers = false;
     }.bind(this));
   },
 

data/lib/jschat/http/public/javascripts/init.js

@@ -1,7 +1,7 @@
 var JsChat = {};
 
 document.observe('dom:loaded', function() {
- if ($('post_message')) {
+  if ($('post_message')) {
     var chatController = new JsChat.ChatController();
   }
 

data/lib/jschat/http/public/stylesheets/screen.css

@@ -20,6 +20,7 @@ h1 { text-align: left; margin-left: 20px }
 .header .rooms li { float: left; margin: 0 1px 0 0; padding: 2px 6px 3px 6px; background-color: #f0f0f0; border: 1px solid #aaa; border-bottom: #fff; font-size: 90%; height: 18px }
 .header .rooms li.selected { background-color: #fff; border: 1px solid #ccc; border-bottom: #fff }
 .header .rooms li a { color: #777; text-decoration: none }
+.header .rooms li a.new { color: #990000; font-weight: bold; }
 .header .rooms li a:hover { color: #000 }
 .header .rooms li.selected a { color: #444 }
 

data/lib/jschat/http/views/form.erb

@@ -0,0 +1,7 @@
+<div class="content">
+  <form method="post" action="/identify" id="sign-on">
+    Enter name: <input name="name" id="name" value="" type="text" />
+    and room: <input name="room" id="room" value="#jschat" type="text" />
+    <input type="submit" value="Go" id="sign-on-submit" />
+  </form>
+</div>

data/lib/jschat/http/views/index.erb

@@ -5,17 +5,18 @@
   <p>Read more on the <a href="http://blog.jschat.org">JsChat Blog</a>.</p>
   <h2>Try JsChat Now</h2>
   <div id="feedback" class="error" style="display: none"></div>
-  <form method="post" action="/identify" id="sign-on">
-    Enter name: <input name="name" id="name" value="" type="text" />
-    and room: <input name="room" id="room" value="#jschat" type="text" />
-    <input type="submit" value="Go" id="sign-on-submit" />
-  </form>
+  <%= erb :form, :layout => false %>
+  <% if JsChat::Auth::Twitter.loaded? %>
+    <%= erb JsChat::Auth::Twitter.template, :layout => false %>
+  <% end %>
   <h2>Features</h2>
   <ul>
     <li>Simple protocol that makes it easy to implement clients and bots</li>
     <li>Console client designed to look and feel like IRC clients</li>
     <li>Web client auto links and displays images/YouTube videos inline</li>
     <li>Protocol designed to be close to executable code, so creating clients and bots is easy</li>
+    <li>Optional mongodb logging</li>
+    <li>Optional Twitter authentication</li>
   </ul>
 </div>
 <div class="footer">

data/lib/jschat/http/views/twitter.erb

@@ -0,0 +1,6 @@
+<h2>Login with Twitter</h2>
+
+<p>JsChat will save your rooms and keep your presence online until you click <strong>Quit</strong>.</p>
+<p>This will persist even if you login on another computer.</p>
+
+<form method="get" action="/twitter"><input type="submit" value="Login with Twitter" /></form>

data/lib/jschat/init.rb

@@ -0,0 +1,19 @@
+module JsChat ; end
+
+require 'jschat/server_options'
+require 'jschat/storage/init'
+
+module JsChat
+  STATELESS_TIMEOUT = 60
+  LASTLOG_DEFAULT = 100
+
+  def self.init_storage
+    if JsChat::Storage::MongoDriver.available?
+      JsChat::Storage.enabled = true
+      JsChat::Storage.driver = JsChat::Storage::MongoDriver
+    else
+      JsChat::Storage.enabled = false
+      JsChat::Storage.driver = JsChat::Storage::NullDriver
+    end
+  end
+end

data/lib/jschat/server.rb

@@ -5,13 +5,11 @@ require 'time'
 require 'socket'
 
 # JsChat libraries
+require 'jschat/init'
 require 'jschat/errors'
 require 'jschat/flood_protection'
-require 'jschat/storage/init'
 
 module JsChat
-  STATELESS_TIMEOUT = 60
-
   module Server
     def self.pid_file_name
       File.join(ServerConfig['tmp_files'], 'jschat.pid')
@@ -26,23 +24,13 @@ module JsChat
       FileUtils.rm pid_file_name
     end
 
-    def self.init_storage
-      if JsChat::Storage::MongoDriver.available?
-        JsChat::Storage.enabled = true
-        JsChat::Storage.driver = JsChat::Storage::MongoDriver
-      else
-        JsChat::Storage.enabled = false
-        JsChat::Storage.driver = JsChat::Storage::NullDriver
-      end
-    end
-
     def self.stop
       rm_pid_file
     end
 
     def self.run!
       write_pid_file
-      init_storage
+      JsChat.init_storage
 
       at_exit do
         stop
@@ -58,7 +46,7 @@ module JsChat
     include JsChat::FloodProtection
 
     attr_accessor :name, :connection, :rooms, :last_activity,
-                  :identified, :ip, :last_poll
+                  :identified, :ip, :last_poll, :session_length
 
     def initialize(connection)
       @name = nil
@@ -68,6 +56,18 @@ module JsChat
       @last_poll = Time.now.utc
       @identified = false
       @ip = ''
+      @expires = nil
+      @session_length = nil
+    end
+
+    def session_expired?
+      return true if @expires.nil?
+      Time.now.utc >= @expires
+    end
+
+    def update_session_expiration
+      return if @session_length.nil?
+      @expires = Time.now.utc + @session_length
     end
 
     def to_json
@@ -147,33 +147,24 @@ module JsChat
       { 'display' => 'messages', 'messages' => messages_since(since) }
     end
 
+    def last_update_time
+      message = JsChat::Storage.driver.lastlog(LASTLOG_DEFAULT, name).last
+      message['time'] if message
+    end
+
     def messages_since(since)
-      messages = JsChat::Storage.driver.lastlog(100)
+      messages = JsChat::Storage.driver.lastlog(LASTLOG_DEFAULT, name)
       if since.nil?
         messages
       else
-        messages.select { |m| message_time(m) > since }
-      end
-    end
-
-    def message_time(message)
-      if message.has_key? 'display'
-        message[message['display']]['time']
-      elsif message.has_key? 'change'
-        message[message['change']]['time']
-      else
-        Time.now
+        messages.select { |m| m['time'] && m['time'] > since }
       end
     end
 
     def add_to_lastlog(message)
       if message
-        if message.has_key? 'display'
-          message[message['display']]['time'] = Time.now.utc
-        elsif message.has_key? 'change'
-          message[message['change']]['time'] = Time.now.utc
-        end
-        JsChat::Storage.driver.log message
+        message['time'] = Time.now.utc
+        JsChat::Storage.driver.log message, name
       end
     end
 
@@ -256,14 +247,16 @@ module JsChat
   end
 
   # {"identify":"alex"}
-  def identify(name, ip, options = {})
+  def identify(name, ip, session_length, options = {})
     if @user and @user.identified
       Error.new :already_identified, 'You have already identified'
     elsif name_taken? name
       Error.new :name_taken, 'Name already taken'
     else
       @user.name = name
-      @user.ip   = ip
+      @user.ip = ip
+      @user.session_length = session_length
+      @user.update_session_expiration
       register_stateless_user if @stateless
       { 'display' => 'identified', 'identified' => @user }
     end
@@ -291,9 +284,18 @@ module JsChat
     end
   end
 
+  def times(message, options = {})
+    times = {}
+    @user.rooms.each do |room|
+      times[room.name] = room.last_update_time
+    end
+    times
+  end
+
   def ping(message, options = {})
     if @user and @user.last_poll and Time.now.utc > @user.last_poll
       time = Time.now.utc
+      @user.update_session_expiration
       { 'pong' => time }
     else
       # TODO: HANDLE PING OUTS
@@ -310,7 +312,7 @@ module JsChat
   def room_message(message, options)
     room = Room.find options['to']
     if room and room.users.include? @user
-      room.send_message({ 'message' => message, 'user' => @user.name, 'time' => Time.now.utc })
+      room.send_message({ 'message' => message, 'user' => @user.name })
     else
       send_response Error.new(:not_in_room, "Please join this room first")
     end
@@ -321,8 +323,8 @@ module JsChat
     if user
       # Return the message to the user, and send it to the other person too
       now = Time.now.utc
-      user.private_message({ 'message' => message, 'user' => @user.name, 'time' => now })
-      @user.private_message({ 'message' => message, 'user' => @user.name, 'time' => now })
+      user.private_message({ 'message' => message, 'user' => @user.name })
+      @user.private_message({ 'message' => message, 'user' => @user.name })
     else
       Error.new(:not_online, 'User not online')
     end
@@ -401,7 +403,9 @@ module JsChat
 
   def disconnect_lagged_users
     @@stateless_cookies.delete_if do |cookie|
-      lagged?(cookie[:user].last_poll) ? disconnect_user(cookie[:user]) && true : false
+      if cookie[:user].session_expired?
+        lagged?(cookie[:user].last_poll) ? disconnect_user(cookie[:user]) && true : false
+      end
     end
   end
 
@@ -510,9 +514,9 @@ module JsChat
         end
       elsif input.has_key? 'identify'
         input['ip'] ||= get_remote_ip
-        response << send_response(identify(input['identify'], input['ip']))
+        response << send_response(identify(input['identify'], input['ip'], input['session_length']))
       else
-        %w{lastlog change send join names part since ping list quit}.each do |command|
+        %w{lastlog change send join names part since ping list quit times}.each do |command|
           if @user.name.nil?
             response << send_response(Error.new(:identity_required, 'Identify first'))
             return response
@@ -545,6 +549,7 @@ module JsChat
     puts "Data that raised exception: #{exception}"
     p data
     print_call_stack
+    raise
   end
 
   def print_call_stack(from = 0, to = 10)

data/lib/jschat/server_options.rb

@@ -17,6 +17,8 @@ ServerConfigDefaults = {
   'db_name' => 'jschat',
   'db_host' => 'localhost',
   'db_port' => 27017
+  # Register your instance of JsChat here: http://twitter.com/apps/create
+  # 'twitter' => { 'key' => '', 'secret' => '' }
 }
 
 # Command line options will overrides these

data/lib/jschat/storage/mongo.rb

@@ -9,25 +9,29 @@ module JsChat::Storage
       @db = Mongo::Connection.new(ServerConfig['db_host'], ServerConfig['db_port']).db(ServerConfig['db_name'])
     end
 
-    def self.log(message)
-      message['time_index'] = Time.now.to_i
+    def self.log(message, room)
+      message['room'] = room
       @db['events'].insert(message)
     end
 
-    def self.lastlog(number)
-      @db['events'].find({}, { :limit => number, :sort => ['time_index', Mongo::ASCENDING] }).to_a
+    def self.lastlog(number, room)
+      @db['events'].find({ :room => room }, { :limit => number, :sort => ['time', Mongo::ASCENDING] }).to_a
     end
 
     # TODO: use twitter oauth for the key
-    def self.find_user(name)
-      @db['users'].find_one('name' => name)
+    def self.find_user(options)
+      @db['users'].find_one(options)
+    end
+
+    def self.save_user(user)
+      @db['users'].save user
     end
 
     def self.set_rooms(name, rooms)
-      user = find_user name
+      user = find_user({ 'name' => name })
       user ||= { 'name' => name }
       user['rooms'] = rooms
-      @db['users'].save user
+      save_user user
     end
 
     def self.available?

data/lib/jschat/storage/null.rb

@@ -1,17 +1,23 @@
 module JsChat::Storage
+  MEMORY_MESSAGE_LIMIT = 100
+
   module NullDriver
-    def self.log(message)
+    def self.log(message, room)
       @messages ||= []
+      message['room'] = room
       @messages.push message
-      @messages = @messages[-100..-1] if @messages.size > 100
+      @messages = @messages[-MEMORY_MESSAGE_LIMIT..-1] if @messages.size > MEMORY_MESSAGE_LIMIT
     end
 
-    def self.lastlog(number)
+    def self.lastlog(number, room)
       @messages ||= []
-      @messages[0..number]
+      @messages.select { |m| m['room'] == room }.reverse[0..number].reverse
+    end
+
+    def self.find_user(options)
     end
 
-    def self.find_user(name)
+    def self.save_user(user)
     end
 
     def self.set_rooms(name, rooms)

data/test/test_helper.rb

@@ -2,10 +2,11 @@ require 'test/unit'
 require 'rubygems'
 require 'eventmachine'
 require 'json'
-require File.join(File.dirname(__FILE__), '../', 'jschat.rb')
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require File.join(File.dirname(__FILE__), '..', 'lib', 'jschat', 'server.rb')
 
 ServerConfig = {
-  :max_message_length => 500
+  'max_message_length' => 500
 }
 
 class JsChat::Room
@@ -59,3 +60,7 @@ class JsChatMock
     room.users << user
   end
 end
+
+JsChat::Storage.enabled = false
+JsChat::Storage.driver = JsChat::Storage::NullDriver
+

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 5
-  version: 0.1.5
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Alex R. Young
@@ -106,6 +106,7 @@ files:
 - lib/jschat/flood_protection.rb
 - lib/jschat/http/config/sprockets.yml
 - lib/jschat/http/config.ru
+- lib/jschat/http/helpers/url_for.rb
 - lib/jschat/http/jschat.rb
 - lib/jschat/http/public/favicon.ico
 - lib/jschat/http/public/images/emoticons/angry.gif
@@ -179,10 +180,13 @@ files:
 - lib/jschat/http/public/stylesheets/screen.css
 - lib/jschat/http/script/sprockets.rb
 - lib/jschat/http/tmp/restart.txt
+- lib/jschat/http/views/form.erb
 - lib/jschat/http/views/index.erb
 - lib/jschat/http/views/iphone.erb
 - lib/jschat/http/views/layout.erb
 - lib/jschat/http/views/message_form.erb
+- lib/jschat/http/views/twitter.erb
+- lib/jschat/init.rb
 - lib/jschat/server.rb
 - lib/jschat/server_options.rb
 - lib/jschat/storage/init.rb