jschat 0.1.2 → 0.1.5

data/README.textile

@@ -43,7 +43,7 @@ The web app must be run alongside the server.  The web app must be started in pr
 
 The web app currently has no database dependencies, it's a wrapper that links cookies to JsChat server proxies.  You can run it on port 80 by configuring Rack or an Apache proxy.  I have Apache set up this way on "jschat.org":http://jschat.org.
 
-h3. Configuration files
+h3. Configuration Files
 
 These are the default locations of the configuration files.  You can override them with <code>--config=PATH</code>:
 
@@ -58,6 +58,16 @@ The file format is JSON, like this:
 { "port": 3001 }
 </pre>
 
+h3. Server Configuration Options
+
+<pre>
+{
+  "port": integer,
+  "ip": "string: IP address to bind to",
+  "tmp_files": "string: path to tmp files (including PID file)"
+}
+</pre>
+
 h3. Client Commands
 
 * Change name or identify: <code>/nick name</code>

data/bin/jschat-server

@@ -2,8 +2,6 @@
 
 require 'logger'
 require 'jschat/server'
-require 'jschat/server-options'
+require 'jschat/server_options'
 
-EM.run do
-  EM.start_server ServerConfig['ip'], ServerConfig['port'], JsChat
-end
+JsChat::Server.run!

data/lib/jschat/http/jschat.rb

@@ -3,7 +3,7 @@ require 'sinatra'
 require 'sha1'
 require 'json'
 require 'sprockets'
-require 'jschat/server-options'
+require 'jschat/server_options'
 
 set :public, File.join(File.dirname(__FILE__), 'public')
 set :views, File.join(File.dirname(__FILE__), 'views')
@@ -39,6 +39,10 @@ class JsChat::Bridge
     end
   end
 
+  def rooms
+    send_json({ :list => 'rooms' })
+  end
+
   def lastlog(room)
     response = send_json({ :lastlog => room })
     response['messages']
@@ -52,6 +56,10 @@ class JsChat::Bridge
     send_json({ :join => room }, false)
   end
 
+  def part(room)
+    send_json({ :part => room })
+  end
+
   def send_message(message, to)
     send_json({ :send => message, :to => to }, false)
   end
@@ -212,7 +220,18 @@ post '/join' do
   load_bridge
   @bridge.join params['room']
   save_last_room params['room']
-  "Request OK"
+  'OK'
+end
+
+get '/part' do
+  load_bridge
+  @bridge.part params['room']
+
+  if @bridge.last_error
+    error 500, [@bridge.last_error].to_json 
+  else
+    'OK'
+  end
 end
 
 get '/chat/' do
@@ -249,6 +268,11 @@ get '/quit' do
   redirect '/'
 end
 
+get '/rooms' do
+  load_bridge
+  @bridge.rooms.to_json
+end
+
 # This serves the JavaScript concat'd by Sprockets
 # run script/sprocket.rb to cache this
 get '/javascripts/all.js' do

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

@@ -12,6 +12,24 @@ JsChat.ChatController = Class.create({
 
     $('post_message').observe('submit', this.postMessageFormEvent.bindAsEventListener(this));
     $('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));
+  },
+
+  joinRoomClicked: function(e) {
+    this.addRoomPrompt(e);
+    Event.stop(e);
+    return false;
+  },
+
+  roomTabClick: function(e) {
+    var element = Event.element(e);
+
+    if (element.tagName == 'A' && element.up('#rooms') && !element.up('li').hasClassName('join')) {
+      this.switchRoom(element.innerHTML);
+      Event.stop(e);
+      return false;
+    }
   },
 
   messagesScrolled: function() {
@@ -80,8 +98,7 @@ JsChat.ChatController = Class.create({
     Display.show_unread = false;
     Display.ignore_notices = false;
 
-    $('room-name').innerHTML = TextHelper.truncateRoomName(PageHelper.currentRoom());
-    $('room-name').title = PageHelper.currentRoom();
+    PageHelper.setCurrentRoomName(window.location.hash);
     $('message').activate();
     $$('.header .navigation li').invoke('hide');
     $('quit-nav').show();
@@ -95,13 +112,26 @@ JsChat.ChatController = Class.create({
     });
 
     this.createPollers();
-    this.joinRoom();
+    this.joinRoom(PageHelper.currentRoom());
+    this.getRoomList(this.addRoomToNav);
+  },
+
+  getRoomList: function(callback) {
+    new Ajax.Request('/rooms', {
+      method: 'get',
+      parameters: { time: new Date().getTime() },
+      onComplete: function(response) {
+        response.responseText.evalJSON().each(function(roomName) {
+          callback(roomName);
+        }.bind(this));
+      }.bind(this)
+    }); 
   },
 
-  joinRoom: function() {
+  joinRoom: function(roomName) {
     new Ajax.Request('/join', {
       method: 'post',
-      parameters: { time: new Date().getTime(), room: PageHelper.currentRoom() },
+      parameters: { time: new Date().getTime(), room: roomName },
       onFailure: function() {
         Display.add_message("Error: Couldn't join channel", 'server');
         $('loading').hide();
@@ -112,10 +142,109 @@ JsChat.ChatController = Class.create({
         document.title = PageHelper.title();
         UserCommands['/lastlog'].apply(this);
         $('loading').hide();
+        $('rooms').show();
+        this.addRoomToNav(roomName, true);
       }.bind(this)
     });
   },
 
+  isValidRoom: function(roomName) {
+    if (PageHelper.allRoomNames().include(roomName)) {
+      return false;
+    }
+    return true;
+  },
+
+  validateAndJoinRoom: function(roomName) {
+    if (roomName === null || roomName.length == 0) {
+      return;
+    }
+
+    if (!roomName.match(/^#/)) {
+      roomName = '#' + roomName;
+    }
+
+    if (this.isValidRoom(roomName)) {
+      this.joinRoomInTab(roomName);
+    }
+  },
+
+  addRoomPrompt: function() {
+    var roomName = prompt('Enter a room name:');
+    this.validateAndJoinRoom(roomName);
+  },
+
+  addRoomToNav: function(roomName, selected) {
+    if (PageHelper.allRoomNames().include(roomName)) return;
+
+    var classAttribute = selected ? ' class="selected"' : '';
+    $('rooms').insert({ bottom: '<li#{classAttribute}><a href="#{roomName}">#{roomName}</a></li>'.interpolate({ classAttribute: classAttribute, roomName: roomName }) });
+  },
+
+  removeSelectedTab: function() {
+    $$('#rooms .selected').invoke('removeClassName', 'selected');
+  },
+
+  selectRoomTab: function(roomName) {
+    $$('#rooms a').each(function(a) {
+      if (a.innerHTML == roomName) {
+        a.up('li').addClassName('selected');
+      }
+    });
+  },
+
+  joinRoomInTab: function(roomName) {
+    this.removeSelectedTab();
+    PageHelper.setCurrentRoomName(roomName);
+    this.joinRoom(roomName);
+  },
+
+  switchRoom: function(roomName) {
+    if (PageHelper.currentRoom() == roomName) {
+      return;
+    }
+
+    this.removeSelectedTab();
+    this.selectRoomTab(roomName);
+    PageHelper.setCurrentRoomName(roomName);
+    UserCommands['/lastlog'].apply(this);
+  },
+
+  rooms: function() {
+    return $$('#rooms li a').slice(1).collect(function(element) {
+      return element.innerHTML;
+    });
+  },
+
+  partRoom: function(roomName) {
+    if (this.rooms().length == 1) {
+      return UserCommands['/quit']();
+    }
+
+    new Ajax.Request('/part', {
+      method: 'get',
+      parameters: { room: roomName },
+      onSuccess: function(request) {
+        this.removeTab(roomName);
+      }.bind(this),
+      onFailure: function(request) {
+        Display.add_message('Error: ' + request.responseText, 'server');
+      }
+    });
+  },
+
+  removeTab: function(roomName) {
+    $$('#rooms li').each(function(element) {
+      if (element.down('a').innerHTML == roomName) {
+        element.remove();
+
+        if (roomName == PageHelper.currentRoom()) {
+          this.switchRoom($$('#rooms li a')[1].innerHTML);
+        }
+      }
+    }.bind(this));
+  },
+
   updateNames: function() {
     UserCommands['/names'].apply(this);
   },

data/lib/jschat/http/public/javascripts/app/helpers/page_helper.js

@@ -3,6 +3,19 @@ var PageHelper = {
     return window.location.hash;
   },
 
+  setCurrentRoomName: function(roomName) {
+    window.location.hash = roomName;
+    $('room-name').innerHTML = TextHelper.truncateRoomName(PageHelper.currentRoom());
+    $('room-name').title = PageHelper.currentRoom();
+    document.title = PageHelper.title();    
+  },
+
+  allRoomNames: function() {
+    return $$('#rooms li a').collect(function(link) {
+      return link.innerHTML;
+    });
+  },
+
   nickname: function() {
     return Cookie.find('jschat-name');
   },

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

@@ -9,9 +9,12 @@ var UserCommands = {
     var help = [];
     Display.add_message('<strong>JsChat Help</strong> &mdash; Type the following commands into the message field:', 'help')
     help.push(['/clear', 'Clears messages']);
+    help.push(['/join #room_name', 'Joins a room']);
+    help.push(['/part #room_name', 'Leaves a room.  Leave room_name blank for the current room']);
     help.push(['/lastlog', 'Shows recent activity']);
     help.push(['/names', 'Refreshes the names list']);
     help.push(['/name new_name', 'Changes your name']);
+    help.push(['/quit', 'Quit']);
     help.push(['/emotes', 'Shows available emotes']);
     $A(help).each(function(options) {
       var help_text = '<span class="command">#{command}</span><span class="command_help">#{text}</span>'.interpolate({ command: options[0], text: options[1]});
@@ -51,5 +54,23 @@ var UserCommands = {
 
   '/names': function() {
     JsChat.Request.get('/names', function(t) { this.displayMessages(t.responseText); }.bind(this));
+  },
+
+  '/(join)\\s+(.*)': function() {
+    var room = arguments[0][2];
+    this.validateAndJoinRoom(room);
+  },
+
+  '/(part|leave)': function() {
+    this.partRoom(PageHelper.currentRoom());
+  },
+
+  '/(part|leave)\\s+(.*)': function() {
+    var room = arguments[0][2];
+    this.partRoom(room);
+  },
+
+  '/quit': function() {
+    window.location = '/quit';
   }
 };

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

@@ -1,3 +1,5 @@
 body { font-size: 200% }
 input { font-size: 150% }
 #info { display: none }
+.header .rooms { top: 6px; } 
+.header .rooms li { padding-bottom: 4px; height: 1.25em; font-size: 120% }

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

@@ -16,6 +16,13 @@ h1 { text-align: left; margin-left: 20px }
 .header .navigation li#quit-nav a:hover { color: #990000; background-color: #fff }
 .header-shadow { width: 100%; height: 6px; position: absolute; top: 59px; left: 0; background-image: url('/images/shadow.png'); background-repeat: repeat-x }
 
+.header .rooms { position: absolute; left: 200px; top: 35px; list-style-type: none; margin: 0; padding: 0 }
+.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:hover { color: #000 }
+.header .rooms li.selected a { color: #444 }
+
 .page { margin-top: 60px }
 
 #messages { width: 500px; height: 300px; margin: 0 20px 10px 20px; padding: 0; overflow: auto; background-color: #fff; float: left; text-align: left; display: inline; }

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

@@ -14,6 +14,9 @@
   <div id="loading" style="display: none">Loading...</div>
   <div class="header">
     <h1><a href="/"><img src="/images/jschat.gif" alt="JsChat" /></a></h1>
+    <ul id="rooms" class="rooms" style="display: none">
+      <li class="join"><a href="#">+</a></li>
+    </ul>    
     <ul class="navigation">
       <li><a href="/">Home</a></li>
       <li><a href="http://github.com/alexyoung/jschat">Download</a>

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

@@ -13,6 +13,9 @@
   <div id="loading" style="display: none">Loading...</div>
   <div class="header">
     <h1><a href="/"><img src="/images/jschat.gif" alt="JsChat" /></a></h1>
+    <ul id="rooms" class="rooms" style="display: none">
+      <li class="join"><a href="#">+</a></li>
+    </ul>
     <ul class="navigation">
       <li><a href="/">Home</a></li>
       <li><a href="http://github.com/alexyoung/jschat">Download</a>

data/lib/jschat/server.rb

@@ -7,10 +7,53 @@ require 'socket'
 # JsChat libraries
 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')
+    end
+
+    def self.write_pid_file
+      return unless ServerConfig['use_tmp_files']
+      File.open(pid_file_name, 'w') { |f| f << Process.pid }
+    end
+
+    def self.rm_pid_file
+      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
+
+      at_exit do
+        stop
+      end
+
+      EM.run do
+        EM.start_server ServerConfig['ip'], ServerConfig['port'], JsChat
+      end
+    end
+  end
+
   class User
     include JsChat::FloodProtection
 
@@ -105,10 +148,11 @@ module JsChat
     end
 
     def messages_since(since)
+      messages = JsChat::Storage.driver.lastlog(100)
       if since.nil?
-        @messages
+        messages
       else
-        @messages.select { |m| message_time(m) > since }
+        messages.select { |m| message_time(m) > since }
       end
     end
 
@@ -117,19 +161,19 @@ module JsChat
         message[message['display']]['time']
       elsif message.has_key? 'change'
         message[message['change']]['time']
+      else
+        Time.now
       end
     end
 
     def add_to_lastlog(message)
-      @messages ||= []
       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
-        @messages.push message
-        @messages = @messages[-100..-1] if @messages.size > 100
+        JsChat::Storage.driver.log message
       end
     end
 
@@ -401,12 +445,21 @@ module JsChat
       field, value = @user.send :change, options[change]
       { 'display' => 'notice', 'notice' => "Your #{field} has been changed to: #{value}" }
     else
-      Error.new(:invalid_request, "Invalid change request")
+      Error.new(:invalid_request, 'Invalid change request')
     end
   rescue JsChat::Errors::InvalidName => exception
     exception
   end
 
+  def list(list, options = {})
+    case list
+      when 'rooms'
+        @user.rooms.collect { |room| room.name }
+    else
+      Error.new(:invalid_request, 'Invalid list command')
+    end
+  end
+
   def send_response(data)
     response = ''
     case data
@@ -459,9 +512,9 @@ module JsChat
         input['ip'] ||= get_remote_ip
         response << send_response(identify(input['identify'], input['ip']))
       else
-        ['lastlog', 'change', 'send', 'join', 'names', 'part', 'since', 'ping', 'quit'].each do |command|
+        %w{lastlog change send join names part since ping list quit}.each do |command|
           if @user.name.nil?
-            response << send_response(Error.new(:identity_required, "Identify first"))
+            response << send_response(Error.new(:identity_required, 'Identify first'))
             return response
           end
 
@@ -494,7 +547,7 @@ module JsChat
     print_call_stack
   end
 
-  def print_call_stack(from = 2, to = 5)
+  def print_call_stack(from = 0, to = 10)
     puts "Stack:"
     (from..to).each do |index|
       puts "\t#{caller[index]}"

data/lib/jschat/{server-options.rb → server_options.rb}

@@ -1,4 +1,5 @@
 require 'optparse'
+require 'tmpdir'
 
 logger = nil
 
@@ -11,7 +12,11 @@ ServerConfigDefaults = {
   'port' => 6789,
   'ip' => '0.0.0.0',
   'logger' => logger,
-  'max_message_length' => 500
+  'max_message_length' => 500,
+  'tmp_files' => File.join(Dir::tmpdir, 'jschat'),
+  'db_name' => 'jschat',
+  'db_host' => 'localhost',
+  'db_port' => 27017
 }
 
 # Command line options will overrides these
@@ -24,6 +29,17 @@ def load_options(path)
   end
 end
 
+def make_tmp_files
+  ServerConfig['use_tmp_files'] = false
+  if File.exists? ServerConfig['tmp_files']
+    ServerConfig['use_tmp_files'] = true
+  else
+    if Dir.mkdir ServerConfig['tmp_files']
+      ServerConfig['use_tmp_files'] = true
+    end
+  end
+end
+
 options = {}
 default_config_file = '/etc/jschat/config.json'
 
@@ -34,7 +50,8 @@ ARGV.clone.options do |opts|
   opts.separator ""
 
   opts.on("-c", "--config=PATH", String, "Configuration file location (#{default_config_file}") { |o| options['config'] = o }
-  opts.on("-p", "--port=port", String, "Port number") { |o| options['port'] = o }
+  opts.on("-p", "--port=PORT", String, "Port number") { |o| options['port'] = o }
+  opts.on("-t", "--tmp_files=PATH", String, "Temporary files location (including pid file)") { |o| options['tmp_files'] = o }
   opts.on("--help", "-H", "This text") { puts opts; exit 0 }
 
   opts.parse!
@@ -43,3 +60,4 @@ end
 options = load_options(options['config'] || default_config_file).merge options
 
 ServerConfig = ServerConfigDefaults.merge options
+make_tmp_files

data/lib/jschat/storage/init.rb

@@ -0,0 +1,19 @@
+require File.join(File.dirname(__FILE__), 'mongo')
+require File.join(File.dirname(__FILE__), 'null')
+
+module JsChat::Storage
+  def self.driver=(driver)
+    @driver = driver
+  end
+
+  def self.driver ; @driver ; end
+
+  def self.enabled=(enabled)
+    @enabled = enabled
+  end
+
+  def self.enabled?
+    @enabled
+  end
+end
+

data/lib/jschat/storage/mongo.rb

@@ -0,0 +1,41 @@
+begin
+  require 'mongo'
+rescue LoadError
+end
+
+module JsChat::Storage
+  module MongoDriver
+    def self.connect!
+      @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
+      @db['events'].insert(message)
+    end
+
+    def self.lastlog(number)
+      @db['events'].find({}, { :limit => number, :sort => ['time_index', Mongo::ASCENDING] }).to_a
+    end
+
+    # TODO: use twitter oauth for the key
+    def self.find_user(name)
+      @db['users'].find_one('name' => name)
+    end
+
+    def self.set_rooms(name, rooms)
+      user = find_user name
+      user ||= { 'name' => name }
+      user['rooms'] = rooms
+      @db['users'].save user
+    end
+
+    def self.available?
+      return unless Object.const_defined?(:Mongo)
+      connect!
+    rescue
+      puts 'Failed to connect to mongo'
+      false
+    end
+  end
+end

data/lib/jschat/storage/null.rb

@@ -0,0 +1,21 @@
+module JsChat::Storage
+  module NullDriver
+    def self.log(message)
+      @messages ||= []
+      @messages.push message
+      @messages = @messages[-100..-1] if @messages.size > 100
+    end
+
+    def self.lastlog(number)
+      @messages ||= []
+      @messages[0..number]
+    end
+
+    def self.find_user(name)
+    end
+
+    def self.set_rooms(name, rooms)
+    end
+  end
+end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Alex R. Young
@@ -183,8 +183,11 @@ files:
 - lib/jschat/http/views/iphone.erb
 - lib/jschat/http/views/layout.erb
 - lib/jschat/http/views/message_form.erb
-- lib/jschat/server-options.rb
 - lib/jschat/server.rb
+- lib/jschat/server_options.rb
+- lib/jschat/storage/init.rb
+- lib/jschat/storage/mongo.rb
+- lib/jschat/storage/null.rb
 - test/server_test.rb
 - test/stateless_test.rb
 - test/test_helper.rb