jschat 0.3.3 → 0.3.5

data/bin/jschat-server

@@ -4,4 +4,14 @@ require 'logger'
 require 'jschat/server'
 require 'jschat/server_options'
 
+def reload!
+  puts 'Reloading Files'
+  Gem.clear_paths
+  spec = Gem.searcher.find('jschat/server')
+  load File.join(spec.full_gem_path, 'lib', 'jschat', 'server.rb')
+  load File.join(spec.full_gem_path, 'lib', 'jschat', 'server_options.rb')
+end
+
+trap 'SIGHUP', lambda { reload! }
+
 JsChat::Server.run!

data/lib/jschat/client.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'eventmachine'
+gem 'json', '>= 1.1.9'
 require 'json'
 require 'ncurses'
 require 'optparse'

data/lib/jschat/http/jschat.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'sinatra'
 require 'sha1'
+gem 'json', '>= 1.1.9'
 require 'json'
 require 'sprockets'
 require 'jschat/init'
@@ -59,6 +60,10 @@ before do
 
     if twitter_user?
       load_twitter_user_and_set_bridge_id
+
+      unless valid_twitter_client_id?
+        clear_cookies
+      end
     end
   end
 end
@@ -177,11 +182,25 @@ helpers do
   end
 
   def detected_layout
-    iphone_user_agent? ? :iphone : :layout
+    if iphone_user_agent?
+      :iphone
+    elsif ipad_user_agent?
+      :ipad
+    else
+      :layout
+    end
+  end
+
+  def detected_message_form
+    iphone_user_agent? ? :iphone_message_form : :message_form
   end
 
   def iphone_user_agent?
-    request.env["HTTP_USER_AGENT"] && request.env["HTTP_USER_AGENT"][/(Mobile\/.+Safari)/]
+    request.env["HTTP_USER_AGENT"] && request.env["HTTP_USER_AGENT"][/(\(iPhone)/]
+  end
+  
+  def ipad_user_agent?
+    request.env["HTTP_USER_AGENT"] && request.env["HTTP_USER_AGENT"][/(\(iPad)/]
   end
 
   def load_bridge
@@ -238,7 +257,8 @@ helpers do
     options = load_twitter_user.merge(options).merge({
       'twitter_name' => session[:twitter_name],
       'access_token' => session[:access_token],
-      'secret_token' => session[:secret_token]
+      'secret_token' => session[:secret_token],
+      'client_id'    => session[:client_id]
     })
     JsChat::Storage.driver.save_user(options)
   end
@@ -258,6 +278,10 @@ helpers do
     JsChat::Storage.driver.find_user({ 'twitter_name' => session[:twitter_name] }) || {}
   end
 
+  def valid_twitter_client_id?
+    session[:client_id] == load_twitter_user['client_id']
+  end
+
   def load_twitter_user_and_set_bridge_id
     user = load_twitter_user
     if user['jschat_id'] and user['jschat_id'].size > 0
@@ -268,6 +292,11 @@ helpers do
   def nickname
     request.cookies['jschat-name']
   end
+
+  def unique_token
+    chars = ("a".."z").to_a + ("1".."9").to_a 
+    Array.new(8, '').collect { chars[rand(chars.size)] }.join
+  end
 end
 
 # Identify
@@ -311,8 +340,10 @@ get '/messages' do
   else
     if @bridge.last_error and @bridge.last_error['error']['code'] == 107
       error 500, [@bridge.last_error].to_json 
-    else
+    elsif @bridge.last_error
       [@bridge.last_error].to_json
+    else
+      error 500, 'Unknown error'
     end
   end
 end
@@ -367,7 +398,7 @@ end
 get '/chat/' do
   load_bridge
   if @bridge and @bridge.active?
-    erb :message_form, :layout => detected_layout
+    erb detected_message_form, :layout => detected_layout
   else
     erb :index, :layout => detected_layout
   end
@@ -375,7 +406,7 @@ end
 
 post '/message' do
   load_bridge
-  save_last_room params['room']
+  save_last_room params['to']
   @bridge.send_message params['message'], params['to']
   'OK'
 end
@@ -424,6 +455,7 @@ get '/twitter_auth' do
     )
   rescue OAuth::Unauthorized => exception
     puts exception
+    halt "Unable to login with Twitter: #{exception.class}"
   end
   
   if @twitter.authorized?
@@ -441,6 +473,7 @@ get '/twitter_auth' do
     end
 
     session[:jschat_id] = user['jschat_id'] if user['jschat_id'] and !user['jschat_id'].empty?
+    session[:client_id] = unique_token
     save_nickname name
     save_twitter_user('twitter_name' => @twitter.info['screen_name'],
                       'jschat_id' => session[:jschat_id],
@@ -475,6 +508,15 @@ get '/twitter_auth' do
   end
 end
 
+# TODO: This doesn't seem to work with twitter oauth right now
+post '/tweet' do
+  if twitter_user? and @twitter.authorized?
+    @twitter.update(params['tweet'])
+  else
+    error 500, 'You are not signed in with Twitter'
+  end
+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

@@ -99,6 +99,8 @@ JsChat.ChatController = Class.create({
       var message = $('message').value;
       $('message').value = '';
 
+      this.tabCompletion.history.add(message);
+
       if (message.length > 0) {
         var command_posted = $H(UserCommands).find(function(command) {
           var name = command[0];
@@ -110,14 +112,12 @@ JsChat.ChatController = Class.create({
         }.bind(this));
 
         if (!command_posted) {
-          if (message.match(/^\//)) {
+          if (message.match(/^\/\s?\//)) {
+            this.postMessage(message.replace(/\//, '').strip());
+          } else if (message.match(/^\//)) {
             Display.add_message('Error: Command not found.  Use /help display commands.', 'error');
           } else {
-            Display.message({ 'message': message.escapeHTML(), 'user': JsChat.user.name }, new Date());
-            new Ajax.Request('/message', {
-              method: 'post',
-              parameters: { 'message': message, 'to': PageHelper.currentRoom() }
-            });
+            this.postMessage(message);
           }
         }
       }
@@ -129,6 +129,21 @@ JsChat.ChatController = Class.create({
     return false;
   },
 
+  postMessage: function(message) {
+    Display.message({ 'message': message.escapeHTML(), 'user': JsChat.user.name }, new Date());
+    new Ajax.Request('/message', {
+      method: 'post',
+      parameters: { 'message': message, 'to': PageHelper.currentRoom() }
+    });
+  },
+
+  sendTweet: function(message) {
+    new Ajax.Request('/tweet', {
+      method: 'post',
+      parameters: { 'tweet': message }
+    });
+  },
+
   initDisplay: function() {
     Display.unread = 0;
     Display.show_unread = false;
@@ -293,7 +308,7 @@ JsChat.ChatController = Class.create({
   },
 
   updateNames: function() {
-    UserCommands['/names'].apply(this);
+    JsChat.Request.get('/names', function(t) { this.displayMessages(t.responseText); }.bind(this));
   },
 
   showMessagesResponse: function(transport) {

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

@@ -15,6 +15,15 @@ var LinkHelper = {
     return '<a href="\#{url}" target="_blank"><img class="inline-image" src="\#{image}" /></a>'.interpolate({ url: url, image: url })
   },
 
+  twitpic_url: function(url) {
+    return url.match(/\bhttp:\/\/twitpic.com\/(show|[^\s]*)\b/i);
+  },
+
+  twitpic: function(url) {
+    var twitpic_id = url.split('/').last();
+    return '<a href="\#{url}" target="_blank"><img class="inline-image" src="http://twitpic.com/show/mini/\#{twitpic_id}" /></a>'.interpolate({ twitpic_id: twitpic_id, url: url })
+  },
+
   youtube_url: function(url) {
     return url.match(/youtube\.com/) && url.match(/watch\?v/);
   },

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

@@ -78,6 +78,8 @@ var TextHelper = {
             result += link.replace(link, LinkHelper.vimeo(link));
           } else if (LinkHelper.image_url(link)  && !JsChat.user.hideImages) {
             result += link.replace(link, LinkHelper.image(link));
+          } else if (LinkHelper.twitpic_url(link)  && !JsChat.user.hideImages) {
+            result += link.replace(link, LinkHelper.twitpic(link));
           } else if (LinkHelper.url(link)) {
             result += link.replace(link, LinkHelper.link(link));
           } else {

data/lib/jschat/http/public/javascripts/app/models/user.js

@@ -6,7 +6,6 @@ User = function() {
 User.prototype.setName = function(name) {
   Cookie.create('jschat-name', name, 28, '/');
   this.name = name;
-  $('name').innerHTML = name;
 };
 
 User.prototype.setHideImages = function(hideImages) {

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

@@ -58,6 +58,7 @@ var UserCommands = {
       onSuccess: function(response) {
         this.displayMessages(response.responseText);
         JsChat.user.setName(name);
+        this.updateNames();
       }.bind(this),
       onFailure: function() {
         Display.add_message("Server error: couldn't access: #{url}".interpolate({ url: url }), 'server');
@@ -66,7 +67,7 @@ var UserCommands = {
   },
 
   '/names': function() {
-    JsChat.Request.get('/names', function(t) { this.displayMessages(t.responseText); }.bind(this));
+    this.updateNames();
   },
 
   '/toggle images': function() {
@@ -88,6 +89,11 @@ var UserCommands = {
     this.partRoom(room);
   },
 
+  '/tweet\\s+(.*)': function() {
+    var message = arguments[0][1];
+    this.sendTweet(message);
+  },
+
   '/quit': function() {
     window.location = '/quit';
   }

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

@@ -1,3 +1,42 @@
+var History = Class.create({
+  initialize: function() {
+    this.messages = [];
+    this.index = 0;
+    this.limit = 100;
+  },
+
+  prev: function() {
+    this.index = this.index <= 0 ? this.messages.length - 1 : this.index - 1;
+  },
+
+  next: function() {
+    this.index = this.index >= this.messages.length - 1 ? 0 : this.index + 1;
+  },
+
+  reset: function() {
+    this.index = this.messages.length;
+  },
+
+  value: function() {
+    if (this.messages.length == 0) return '';
+    return this.messages[this.index];
+  },
+
+  add: function(value) {
+    if (!value || value.length == 0) return;
+
+    this.messages.push(value);
+    if (this.messages.length > this.limit) {
+      this.messages = this.messages.slice(-this.limit);
+    }
+    this.index = this.messages.length;
+  },
+
+  atTop: function() {
+    return this.index === this.messages.length;
+  }
+});
+
 var TabCompletion = Class.create({
   initialize: function(element) {
     this.element = $(element);
@@ -5,6 +44,7 @@ var TabCompletion = Class.create({
     this.match_offset = 0;
     this.cycling = false;
     this.has_focus = true;
+    this.history = new History();
 
     document.observe('keydown', this.keyboardEvents.bindAsEventListener(this));
     this.element.observe('focus', this.onFocus.bindAsEventListener(this));
@@ -23,7 +63,7 @@ var TabCompletion = Class.create({
   },
 
   tabSearch: function(input) {
-    var names = $$('#names li').collect(function(element) { return element.innerHTML });
+    var names = $$('#names li').collect(function(element) { return element.innerHTML }).sort();
     return names.findAll(function(name) { return name.toLowerCase().match(input.toLowerCase()) });
   },
 
@@ -106,6 +146,26 @@ var TabCompletion = Class.create({
           return false;
         break;
 
+        case Event.KEY_UP:
+          if (this.history.atTop()) {
+            this.history.add(this.element.value);
+          }
+
+          this.history.prev();
+          this.element.value = this.history.value();
+          FormHelpers.setCaretPosition(this.element, this.element.value.length + 1);
+          Event.stop(e);
+          return false;
+        break;
+
+        case Event.KEY_DOWN:
+          this.history.next();
+          this.element.value = this.history.value();
+          FormHelpers.setCaretPosition(this.element, this.element.value.length + 1);
+          Event.stop(e);
+          return false;
+        break;
+
         default:
           this.reset();
         break;

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

@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>JsChat iPad</title>
+  <link rel="icon" href="/favicon.ico" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta name="apple-mobile-web-app-capable" content="yes" />
+  <script src="http://ajax.googleapis.com/ajax/libs/prototype/1.6.0.3/prototype.js" type="text/javascript"></script>
+  <script src="/javascripts/all.js?<%= Time.now.to_i %>" type="text/javascript"></script>
+  <link href="/stylesheets/screen.css?<%= Time.now.to_i %>" media="screen" rel="stylesheet" type="text/css" />
+</head>
+<body class="ipad">
+  <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>
+      <li id="help-nav" style="display: none"><a href="#" id="help-link">Help</a>
+      <li id="quit-nav" style="display: none"><a href="/quit">Quit</a>
+    </ul>
+  </div>
+  <div class="header-shadow"></div>
+  <div class="page">
+    <%= yield %>
+  </div>
+</body>
+</html>

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

@@ -5,12 +5,13 @@
   <title>JsChat iPhone</title>
   <link rel="icon" href="/favicon.ico" />
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta name="apple-mobile-web-app-capable" content="yes" />
   <script src="http://ajax.googleapis.com/ajax/libs/prototype/1.6.0.3/prototype.js" type="text/javascript"></script>
   <script src="/javascripts/all.js?<%= Time.now.to_i %>" type="text/javascript"></script>
   <link href="/stylesheets/screen.css?<%= Time.now.to_i %>" media="screen" rel="stylesheet" type="text/css" />
   <link href="/stylesheets/iphone.css?<%= Time.now.to_i %>" media="screen" rel="stylesheet" type="text/css" />
 </head>
-<body class="iphone">
+<body class="iphone" onload="setTimeout(function() { window.scrollTo(0, 1); }, 100);">
   <div id="loading" style="display: none">Loading...</div>
   <div class="header">
     <h1><a href="/"><img src="/images/jschat.gif" alt="JsChat" /></a></h1>

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

@@ -0,0 +1,15 @@
+<ul id="messages">
+</ul>
+<div id="info">
+  <h2 id="room-name">Loading...</h2>
+  <div id="name" style="display: none"><%= nickname %></div>
+  <ul id="names"> 
+  </ul>
+</div>
+<div id="input">
+  <form method="post" action="/message" id="post_message">
+    <input name="message" id="message" value="" type="text" autocomplete="off" autocapitalize="off" />
+    <input name="submit" type="submit" id="send_button" value="Send" />
+  </form>
+</div>
+

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

@@ -2,7 +2,6 @@
 </ul>
 <div id="info">
   <h2 id="room-name">Loading...</h2>
-  <div id="name" style="display: none"><%= nickname %></div>
   <ul id="names"> 
   </ul>
 </div>

data/lib/jschat/server.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'eventmachine'
+gem 'json', '>= 1.1.9'
 require 'json'
 require 'time'
 require 'socket'

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 require 'test/unit'
 require 'rubygems'
 require 'eventmachine'
+gem 'json', '>= 1.1.9'
 require 'json'
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require File.join(File.dirname(__FILE__), '..', 'lib', 'jschat', 'server.rb')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Alex R. Young
@@ -183,7 +183,9 @@ files:
 - lib/jschat/http/tmp/restart.txt
 - lib/jschat/http/views/form.erb
 - lib/jschat/http/views/index.erb
+- lib/jschat/http/views/ipad.erb
 - lib/jschat/http/views/iphone.erb
+- lib/jschat/http/views/iphone_message_form.erb
 - lib/jschat/http/views/layout.erb
 - lib/jschat/http/views/message_form.erb
 - lib/jschat/http/views/twitter.erb
@@ -198,7 +200,7 @@ files:
 - test/test_helper.rb
 - README.textile
 - MIT-LICENSE
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/alexyoung/jschat
 licenses: []