vines 0.3.2 → 0.4.0

data/test/storage/null_test.rb

@@ -0,0 +1,30 @@
+# encoding: UTF-8
+
+require 'vines'
+require 'minitest/autorun'
+
+class NullStorageTest < MiniTest::Unit::TestCase
+  def setup
+    @storage = Vines::Storage::Null.new
+    @user = Vines::User.new(jid: 'alice@wonderland.lit')
+  end
+
+  def test_find_user_returns_nil
+    assert_nil @storage.find_user(@user.jid)
+    @storage.save_user(@user)
+    assert_nil @storage.find_user(@user.jid)
+  end
+
+  def test_find_vcard_returns_nil
+    assert_nil @storage.find_vcard(@user.jid)
+    @storage.save_vcard(@user.jid, 'card')
+    assert_nil @storage.find_vcard(@user.jid)
+  end
+
+  def test_find_fragment_returns_nil
+    assert_nil @storage.find_fragment(@user.jid, 'node')
+    @storage.save_fragment(@user.jid, 'node')
+    assert_nil @storage.find_fragment(@user.jid, 'node')
+    nil
+  end
+end

data/test/storage/redis_test.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 
+require 'mock_redis'
 require 'storage_tests'
 require 'vines'
 require 'minitest/autorun'
@@ -7,41 +8,7 @@ require 'minitest/autorun'
 class RedisTest < MiniTest::Unit::TestCase
   include StorageTests
 
-  MOCK_REDIS = Class.new do
-    def initialize
-      @db = {}
-    end
-    def del(key)
-      @db.delete(key)
-      EM.next_tick { yield if block_given? }
-    end
-    def get(key)
-      EM.next_tick { yield @db[key] }
-    end
-    def set(key, value)
-      @db[key] = value
-      EM.next_tick { yield if block_given? }
-    end
-    def hget(key, field)
-      EM.next_tick { yield @db[key][field] rescue nil }
-    end
-    def hgetall(key)
-      EM.next_tick { yield @db[key] || {} }
-    end
-    def hset(key, field, value)
-      @db[key] ||= {}
-      @db[key][field] = value
-      EM.next_tick { yield if block_given? }
-    end
-    def hmset(key, *args)
-      @db[key] = Hash[*args]
-      EM.next_tick { yield if block_given? }
-    end
-    def flushdb
-      @db.clear
-      EM.next_tick { yield if block_given? }
-    end
-  end.new
+  MOCK_REDIS = MockRedis.new
 
   def setup
     EMLoop.new do
@@ -54,7 +21,7 @@ class RedisTest < MiniTest::Unit::TestCase
         'password' => BCrypt::Password.create('secret'),
         'name' => 'Tester'
       }.to_json)
-      db.hmset('roster:full@wonderland.lit', 
+      db.hmset('roster:full@wonderland.lit',
         'contact1@wonderland.lit',
         {'name' => 'Contact1', 'groups' => %w[Group1 Group2]}.to_json,
         'contact2@wonderland.lit',

data/test/stream/component/handshake_test.rb

@@ -29,12 +29,16 @@ class HandshakeTest < MiniTest::Unit::TestCase
   end
 
   def test_valid_secret
+    router = MiniTest::Mock.new
+    router.expect(:<<, nil, [@stream])
+    @stream.expect(:router, router)
     @stream.expect(:secret, 'secr3t')
     @stream.expect(:write, nil, ['<handshake/>'])
     @stream.expect(:advance, nil, [Vines::Stream::Component::Ready.new(@stream)])
     node = node('<handshake>secr3t</handshake>')
     @state.node(node)
     assert @stream.verify
+    assert router.verify
   end
 
   private

data/test/stream/component/ready_test.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 
+require 'tmpdir'
 require 'vines'
 require 'ext/nokogiri'
 require 'minitest/autorun'
@@ -10,7 +11,7 @@ class ComponentReadyTest < MiniTest::Unit::TestCase
     @state  = Vines::Stream::Component::Ready.new(@stream, nil)
     @config = Vines::Config.new do
       host 'wonderland.lit' do
-        storage(:fs) { dir '.' }
+        storage(:fs) { dir Dir.tmpdir }
       end
     end
   end

data/test/stream/server/ready_test.rb

@@ -23,13 +23,19 @@ class ServerReadyTest < MiniTest::Unit::TestCase
   end
 
   def test_good_node_processes
+    config = MiniTest::Mock.new
+    config.expect(:local_jid?, true, [Vines::JID.new('romeo@verona.lit')])
+
+    @stream.expect(:config, config)
     @stream.expect(:remote_domain, 'wonderland.lit')
     @stream.expect(:domain, 'verona.lit')
-    @stream.expect(:user=, nil, [Vines::User.new(:jid => 'alice@wonderland.lit')])
+    @stream.expect(:user=, nil, [Vines::User.new(jid: 'alice@wonderland.lit')])
+
     node = node(%Q{<message from="alice@wonderland.lit" to="romeo@verona.lit"/>})
     @state.node(node)
     assert_equal 1, STANZAS.size
     assert @stream.verify
+    assert config.verify
   end
 
   def test_unsupported_stanza_type

data/web/404.html

@@ -8,8 +8,10 @@
   <link rel="stylesheet" href="/lib/stylesheets/base.css"/>
   <style type="text/css">
     body {
-      background: -moz-radial-gradient(#1a3762, #0c1a2d);
-      background: -webkit-gradient(radial, 50% 50%, 0, 50% 50%, 500, from(#1a3762), to(#0c1a2d));
+      background: -moz-radial-gradient(rgba(26, 55, 98, 0.8), rgba(12, 26, 45, 0.8)), url(/lib/images/dark-gray.png);
+      background: -ms-radial-gradient(center, 500px 500px, rgba(26, 55, 98, 0.8), rgba(12, 26, 45, 0.8)), url(/lib/images/dark-gray.png);
+      background: -o-radial-gradient(rgba(26, 55, 98, 0.8), rgba(12, 26, 45, 0.8)), url(/lib/images/dark-gray.png);
+      background: -webkit-radial-gradient(center, 500px 500px, rgba(26, 55, 98, 0.8), rgba(12, 26, 45, 0.8)), url(/lib/images/dark-gray.png);
       display: table;
       text-align: center;
       width: 100%;
@@ -22,7 +24,7 @@
     h1 {
       background: url(/lib/images/logo-large.png) no-repeat center;
       color: transparent;
-      height: 64px;
+      height: 82px;
       text-shadow: none;
       width: 100%;
     }

data/web/chat/coffeescripts/chat.coffee

@@ -6,6 +6,7 @@ class ChatPage
     @session.onPresence (p) => this.presence(p)
     @chats = {}
     @currentContact = null
+    @layout = null
 
   datef: (millis) ->
     d = new Date(millis)
@@ -47,6 +48,7 @@ class ChatPage
         node.click (event) => this.selectContact(event)
 
   message: (message) ->
+    return unless message.type == 'chat' && message.text
     this.queueMessage message
     me   = message.from == @session.jid()
     from = message.from.split('/')[0]
@@ -193,6 +195,7 @@ class ChatPage
         from: @session.jid()
         text: text
         to: jid
+        type: 'chat'
         received: new Date()
       @session.sendMessage jid, text
     input.val ''
@@ -241,8 +244,9 @@ class ChatPage
       fn() if fn
       form.fadeIn 100
     else
-      form.fadeOut 100, ->
+      form.fadeOut 100, =>
         form[0].reset()
+        @layout.resize()
         fn() if fn
 
   draw: ->
@@ -333,11 +337,11 @@ class ChatPage
     $('#edit-contact-form').submit   => this.updateContact()
 
     $('#container').fadeIn 200
-    layout = this.resize()
+    @layout = this.resize()
 
-    fn = ->
-      layout.resize()
-      layout.resize() # not sure why two are needed
+    fn = =>
+      @layout.resize()
+      @layout.resize() # not sure why two are needed
 
     new Filter
       list: '#roster'

data/web/chat/javascripts/app.js

@@ -1 +1 @@
-var ChatPage,__bind=function(a,b){return function(){return a.apply(b,arguments)}};ChatPage=function(){function a(a){this.session=a,this.session.onRoster(__bind(function(){return this.roster()},this)),this.session.onCard(__bind(function(a){return this.card(a)},this)),this.session.onMessage(__bind(function(a){return this.message(a)},this)),this.session.onPresence(__bind(function(a){return this.presence(a)},this)),this.chats={},this.currentContact=null}return a.prototype.datef=function(a){var b,c,d,e;return b=new Date(a),d=b.getHours()<12?" am":" pm",c=b.getHours()>12?b.getHours()-12:b.getHours(),c===0&&(c=12),e=b.getMinutes()+"",e.length===1&&(e="0"+e),c+":"+e+d},a.prototype.card=function(a){return this.eachContact(a.jid,__bind(function(b){return $(".vcard-img",b).attr("src",this.session.avatar(a.jid))},this))},a.prototype.roster=function(){var a,b,c,d,e,f,g,h;e=$("#roster"),$("li",e).each(__bind(function(a,b){var c;c=$(b).attr("data-jid");if(!this.session.roster[c])return $(b).remove()},this)),f=function(a,b){return $(".text",a).text(b.name||b.jid),a.attr("data-name",b.name||"")},g=this.session.roster,h=[];for(c in g)a=g[c],b=$("#roster li[data-jid='"+c+"']"),f(b,a),h.push(b.length===0?(d=$('<li data-jid="'+c+'" data-name="" class="offline">\n  <span class="text"></span>\n  <span class="status-msg">Offline</span>\n  <span class="unread" style="display:none;"></span>\n  <img class="vcard-img" alt="'+c+'" src="'+this.session.avatar(c)+'"/>\n</li>').appendTo(e),f(d,a),d.click(__bind(function(a){return this.selectContact(a)},this))):void 0);return h},a.prototype.message=function(a){var b,c,d,e;this.queueMessage(a),e=a.from===this.session.jid(),d=a.from.split("/")[0];if(!e&&d!==this.currentContact)return c=this.chat(a.from),c.unread++,this.eachContact(d,function(a){return $(".unread",a).text(c.unread).show()});b=this.atBottom(),this.appendMessage(a);if(b)return this.scroll()},a.prototype.eachContact=function(a,b){var c,d,e,f,g;f=$("#roster li[data-jid='"+a+"']").get(),g=[];for(d=0,e=f.length;d<e;d++)c=f[d],g.push(b($(c)));return g},a.prototype.appendMessage=function(a){var b,c,d,e;return c=a.from.split("/")[0],b=this.session.roster[c],d=b?b.name||c:c,a.from===this.session.jid()&&(d="Me"),e=$('<li data-jid="'+c+'" style="display:none;">\n  <p></p>\n  <img alt="'+c+'" src="'+this.session.avatar(c)+'"/>\n  <footer>\n    <span class="author"></span>\n    <span class="time">'+this.datef(a.received)+"</span>\n  </footer>\n</li>").appendTo("#messages"),$("p",e).text(a.text),$(".author",e).text(d),e.fadeIn(200)},a.prototype.queueMessage=function(a){var b,c,d;return d=a.from===this.session.jid(),c=a[d?"to":"from"],b=this.chat(c),b.jid=c,b.messages.push(a)},a.prototype.chat=function(a){var b,c;return b=a.split("/")[0],c=this.chats[b],c||(c={jid:a,messages:[],unread:0},this.chats[b]=c),c},a.prototype.presence=function(a){var b,c,d;c=a.from.split("/")[0];if(c===this.session.bareJid())return;if(!a.type||a.offline)b=this.session.roster[c],this.eachContact(c,function(a){return $(".status-msg",a).text(b.status()),b.offline()?a.addClass("offline"):a.removeClass("offline")});a.offline&&(this.chat(c).jid=c);if(a.type==="subscribe")return d=$('<li data-jid="'+a.from+'" style="display:none;">\n  <form class="inset">\n    <h2>Buddy Approval</h2>\n    <p>'+a.from+' wants to add you as a buddy.</p>\n    <fieldset class="buttons">\n      <input type="button" value="Decline"/>\n      <input type="submit" value="Accept"/>\n    </fieldset>\n  </form>\n</li>').appendTo("#notifications"),d.fadeIn(200),$("form",d).submit(__bind(function(){return this.acceptContact(d,a.from)},this)),$('input[type="button"]',d).click(__bind(function(){return this.rejectContact(d,a.from)},this))},a.prototype.acceptContact=function(a,b){return a.fadeOut(200,function(){return a.remove()}),this.session.sendSubscribed(b),this.session.sendSubscribe(b),!1},a.prototype.rejectContact=function(a,b){return a.fadeOut(200,function(){return a.remove()}),this.session.sendUnsubscribed(b)},a.prototype.selectContact=function(a){var b,c,d,e,f,g,h;d=$(a.currentTarget).attr("data-jid"),c=this.session.roster[d];if(this.currentContact===d)return;this.currentContact=d,$("#roster li").removeClass("selected"),$(a.currentTarget).addClass("selected"),$("#chat-title").text("Chat with "+(c.name||c.jid)),$("#messages").empty(),b=this.chats[d],e=[],b&&(e=b.messages,b.unread=0,this.eachContact(d,function(a){return $(".unread",a).text("").hide()}));for(g=0,h=e.length;g<h;g++)f=e[g],this.appendMessage(f);return this.scroll(),$("#remove-contact-msg").html("Are you sure you want to remove "+("<strong>"+this.currentContact+"</strong> from your buddy list?")),$("#remove-contact-form .buttons").fadeIn(200),$("#edit-contact-jid").text(this.currentContact),$("#edit-contact-name").val(this.session.roster[this.currentContact].name),$("#edit-contact-form input").fadeIn(200),$("#edit-contact-form .buttons").fadeIn(200)},a.prototype.scroll=function(){var a;return a=$("#messages"),a.animate({scrollTop:a.prop("scrollHeight")},400)},a.prototype.atBottom=function(){var a,b;return b=$("#messages"),a=b.prop("scrollHeight")-b.outerHeight(),b.scrollTop()>=a},a.prototype.send=function(){var a,b,c,d;return this.currentContact?(b=$("#message"),d=b.val().trim(),d&&(a=this.chats[this.currentContact],c=a?a.jid:this.currentContact,this.message({from:this.session.jid(),text:d,to:c,received:new Date}),this.session.sendMessage(c,d)),b.val(""),!1):!1},a.prototype.addContact=function(){var a;return this.toggleForm("#add-contact-form"),a={jid:$("#add-contact-jid").val(),name:$("#add-contact-name").val(),groups:["Buddies"]},a.jid&&this.session.updateContact(a,!0),!1},a.prototype.removeContact=function(){return this.toggleForm("#remove-contact-form"),this.session.removeContact(this.currentContact),this.currentContact=null,$("#chat-title").text("Select a buddy to chat"),$("#messages").empty(),$("#remove-contact-msg").html("Select a buddy in the list above to remove."),$("#remove-contact-form .buttons").hide(),$("#edit-contact-jid").text("Select a buddy in the list above to update."),$("#edit-contact-name").val(""),$("#edit-contact-form input").hide(),$("#edit-contact-form .buttons").hide(),!1},a.prototype.updateContact=function(){var a;return this.toggleForm("#edit-contact-form"),a={jid:this.currentContact,name:$("#edit-contact-name").val(),groups:this.session.roster[this.currentContact].groups},this.session.updateContact(a),!1},a.prototype.toggleForm=function(a,b){return a=$(a),$("form.overlay").each(function(){if(this.id!==a.attr("id"))return $(this).hide()}),a.is(":hidden")?(b&&b(),a.fadeIn(100)):a.fadeOut(100,function(){a[0].reset();if(b)return b()})},a.prototype.draw=function(){var a,b;if(!this.session.connected()){window.location.hash="";return}return $("body").attr("id","chat-page"),$("#container").hide().empty(),$('<div id="alpha" class="sidebar column y-fill">\n  <h2>Buddies <div id="search-roster-icon"></div></h2>\n  <div id="search-roster-form"></div>\n  <ul id="roster" class="selectable scroll y-fill"></ul>\n  <div id="alpha-controls" class="controls">\n    <div id="add-contact"></div>\n    <div id="remove-contact"></div>\n    <div id="edit-contact"></div>\n  </div>\n  <form id="add-contact-form" class="overlay" style="display:none;">\n    <h2>Add Buddy</h2>\n    <input id="add-contact-jid" type="email" maxlength="1024" placeholder="Account name"/>\n    <input id="add-contact-name" type="text" maxlength="1024" placeholder="Real name"/>\n    <fieldset class="buttons">\n      <input id="add-contact-cancel" type="button" value="Cancel"/>\n      <input id="add-contact-ok" type="submit" value="Add"/>\n    </fieldset>\n  </form>\n  <form id="remove-contact-form" class="overlay" style="display:none;">\n    <h2>Remove Buddy</h2>\n    <p id="remove-contact-msg">Select a buddy in the list above to remove.</p>\n    <fieldset class="buttons" style="display:none;">\n      <input id="remove-contact-cancel" type="button" value="Cancel"/>\n      <input id="remove-contact-ok" type="submit" value="Remove"/>\n    </fieldset>\n  </form>\n  <form id="edit-contact-form" class="overlay" style="display:none;">\n    <h2>Update Profile</h2>\n    <p id="edit-contact-jid">Select a buddy in the list above to update.</p>\n    <input id="edit-contact-name" type="text" maxlength="1024" placeholder="Real name" style="display:none;"/>\n    <fieldset class="buttons" style="display:none;">\n      <input id="edit-contact-cancel" type="button" value="Cancel"/>\n      <input id="edit-contact-ok" type="submit" value="Save"/>\n    </fieldset>\n  </form>\n</div>\n<div id="beta" class="primary column x-fill y-fill">\n  <h2 id="chat-title">Select a buddy to chat</h2>\n  <ul id="messages" class="scroll y-fill"></ul>\n  <form id="message-form">\n    <input id="message" name="message" type="text" maxlength="1024" placeholder="Type a message and press enter to send"/>\n  </form>\n</div>\n<div id="charlie" class="sidebar column y-fill">\n  <h2>Notifications</h2>\n  <ul id="notifications" class="scroll y-fill"></ul>\n  <div id="charlie-controls" class="controls">\n    <div id="clear-notices"></div>\n  </div>\n</div>').appendTo("#container"),this.roster(),new Button("#clear-notices",ICONS.no),new Button("#add-contact",ICONS.plus),new Button("#remove-contact",ICONS.minus),new Button("#edit-contact",ICONS.user),$("#message").focus(function(){return $("form.overlay").fadeOut()}),$("#message-form").submit(__bind(function(){return this.send()},this)),$("#clear-notices").click(function(){return $("#notifications li").fadeOut(200)}),$("#add-contact").click(__bind(function(){return this.toggleForm("#add-contact-form")},this)),$("#remove-contact").click(__bind(function(){return this.toggleForm("#remove-contact-form")},this)),$("#edit-contact").click(__bind(function(){return this.toggleForm("#edit-contact-form",__bind(function(){if(this.currentContact)return $("#edit-contact-jid").text(this.currentContact),$("#edit-contact-name").val(this.session.roster[this.currentContact].name)},this))},this)),$("#add-contact-cancel").click(__bind(function(){return this.toggleForm("#add-contact-form")},this)),$("#remove-contact-cancel").click(__bind(function(){return this.toggleForm("#remove-contact-form")},this)),$("#edit-contact-cancel").click(__bind(function(){return this.toggleForm("#edit-contact-form")},this)),$("#add-contact-form").submit(__bind(function(){return this.addContact()},this)),$("#remove-contact-form").submit(__bind(function(){return this.removeContact()},this)),$("#edit-contact-form").submit(__bind(function(){return this.updateContact()},this)),$("#container").fadeIn(200),b=this.resize(),a=function(){return b.resize(),b.resize()},new Filter({list:"#roster",icon:"#search-roster-icon",form:"#search-roster-form",attrs:["data-jid","data-name"],open:a,close:a})},a.prototype.resize=function(){var a,b,c,d,e;return a=$("#alpha"),b=$("#beta"),c=$("#charlie"),e=$("#message"),d=$("#message-form"),new Layout(function(){return c.css("left",a.width()+b.width()),e.width(d.width()-32)})},a}(),$(function(){var a,b,c,d,e,f;f=new Session,d=new NavBar(f),d.draw(),a={Messages:ICONS.chat,Logout:ICONS.power};for(c in a)b=a[c],d.addButton(c,b);return e={"/messages":new ChatPage(f),"/logout":new LogoutPage(f),"default":new LoginPage(f,"/messages/")},(new Router(e)).draw(),d.select($("#nav-link-messages").parent())})
+var ChatPage,__bind=function(a,b){return function(){return a.apply(b,arguments)}};ChatPage=function(){function a(a){this.session=a,this.session.onRoster(__bind(function(){return this.roster()},this)),this.session.onCard(__bind(function(a){return this.card(a)},this)),this.session.onMessage(__bind(function(a){return this.message(a)},this)),this.session.onPresence(__bind(function(a){return this.presence(a)},this)),this.chats={},this.currentContact=null,this.layout=null}return a.prototype.datef=function(a){var b,c,d,e;return b=new Date(a),d=b.getHours()<12?" am":" pm",c=b.getHours()>12?b.getHours()-12:b.getHours(),c===0&&(c=12),e=b.getMinutes()+"",e.length===1&&(e="0"+e),c+":"+e+d},a.prototype.card=function(a){return this.eachContact(a.jid,__bind(function(b){return $(".vcard-img",b).attr("src",this.session.avatar(a.jid))},this))},a.prototype.roster=function(){var a,b,c,d,e,f,g,h;e=$("#roster"),$("li",e).each(__bind(function(a,b){var c;c=$(b).attr("data-jid");if(!this.session.roster[c])return $(b).remove()},this)),f=function(a,b){return $(".text",a).text(b.name||b.jid),a.attr("data-name",b.name||"")},g=this.session.roster,h=[];for(c in g)a=g[c],b=$("#roster li[data-jid='"+c+"']"),f(b,a),h.push(b.length===0?(d=$('<li data-jid="'+c+'" data-name="" class="offline">\n  <span class="text"></span>\n  <span class="status-msg">Offline</span>\n  <span class="unread" style="display:none;"></span>\n  <img class="vcard-img" alt="'+c+'" src="'+this.session.avatar(c)+'"/>\n</li>').appendTo(e),f(d,a),d.click(__bind(function(a){return this.selectContact(a)},this))):void 0);return h},a.prototype.message=function(a){var b,c,d,e;if(a.type!=="chat"||!a.text)return;this.queueMessage(a),e=a.from===this.session.jid(),d=a.from.split("/")[0];if(!e&&d!==this.currentContact)return c=this.chat(a.from),c.unread++,this.eachContact(d,function(a){return $(".unread",a).text(c.unread).show()});b=this.atBottom(),this.appendMessage(a);if(b)return this.scroll()},a.prototype.eachContact=function(a,b){var c,d,e,f,g;f=$("#roster li[data-jid='"+a+"']").get(),g=[];for(d=0,e=f.length;d<e;d++)c=f[d],g.push(b($(c)));return g},a.prototype.appendMessage=function(a){var b,c,d,e;return c=a.from.split("/")[0],b=this.session.roster[c],d=b?b.name||c:c,a.from===this.session.jid()&&(d="Me"),e=$('<li data-jid="'+c+'" style="display:none;">\n  <p></p>\n  <img alt="'+c+'" src="'+this.session.avatar(c)+'"/>\n  <footer>\n    <span class="author"></span>\n    <span class="time">'+this.datef(a.received)+"</span>\n  </footer>\n</li>").appendTo("#messages"),$("p",e).text(a.text),$(".author",e).text(d),e.fadeIn(200)},a.prototype.queueMessage=function(a){var b,c,d;return d=a.from===this.session.jid(),c=a[d?"to":"from"],b=this.chat(c),b.jid=c,b.messages.push(a)},a.prototype.chat=function(a){var b,c;return b=a.split("/")[0],c=this.chats[b],c||(c={jid:a,messages:[],unread:0},this.chats[b]=c),c},a.prototype.presence=function(a){var b,c,d;c=a.from.split("/")[0];if(c===this.session.bareJid())return;if(!a.type||a.offline)b=this.session.roster[c],this.eachContact(c,function(a){return $(".status-msg",a).text(b.status()),b.offline()?a.addClass("offline"):a.removeClass("offline")});a.offline&&(this.chat(c).jid=c);if(a.type==="subscribe")return d=$('<li data-jid="'+a.from+'" style="display:none;">\n  <form class="inset">\n    <h2>Buddy Approval</h2>\n    <p>'+a.from+' wants to add you as a buddy.</p>\n    <fieldset class="buttons">\n      <input type="button" value="Decline"/>\n      <input type="submit" value="Accept"/>\n    </fieldset>\n  </form>\n</li>').appendTo("#notifications"),d.fadeIn(200),$("form",d).submit(__bind(function(){return this.acceptContact(d,a.from)},this)),$('input[type="button"]',d).click(__bind(function(){return this.rejectContact(d,a.from)},this))},a.prototype.acceptContact=function(a,b){return a.fadeOut(200,function(){return a.remove()}),this.session.sendSubscribed(b),this.session.sendSubscribe(b),!1},a.prototype.rejectContact=function(a,b){return a.fadeOut(200,function(){return a.remove()}),this.session.sendUnsubscribed(b)},a.prototype.selectContact=function(a){var b,c,d,e,f,g,h;d=$(a.currentTarget).attr("data-jid"),c=this.session.roster[d];if(this.currentContact===d)return;this.currentContact=d,$("#roster li").removeClass("selected"),$(a.currentTarget).addClass("selected"),$("#chat-title").text("Chat with "+(c.name||c.jid)),$("#messages").empty(),b=this.chats[d],e=[],b&&(e=b.messages,b.unread=0,this.eachContact(d,function(a){return $(".unread",a).text("").hide()}));for(g=0,h=e.length;g<h;g++)f=e[g],this.appendMessage(f);return this.scroll(),$("#remove-contact-msg").html("Are you sure you want to remove "+("<strong>"+this.currentContact+"</strong> from your buddy list?")),$("#remove-contact-form .buttons").fadeIn(200),$("#edit-contact-jid").text(this.currentContact),$("#edit-contact-name").val(this.session.roster[this.currentContact].name),$("#edit-contact-form input").fadeIn(200),$("#edit-contact-form .buttons").fadeIn(200)},a.prototype.scroll=function(){var a;return a=$("#messages"),a.animate({scrollTop:a.prop("scrollHeight")},400)},a.prototype.atBottom=function(){var a,b;return b=$("#messages"),a=b.prop("scrollHeight")-b.outerHeight(),b.scrollTop()>=a},a.prototype.send=function(){var a,b,c,d;return this.currentContact?(b=$("#message"),d=b.val().trim(),d&&(a=this.chats[this.currentContact],c=a?a.jid:this.currentContact,this.message({from:this.session.jid(),text:d,to:c,type:"chat",received:new Date}),this.session.sendMessage(c,d)),b.val(""),!1):!1},a.prototype.addContact=function(){var a;return this.toggleForm("#add-contact-form"),a={jid:$("#add-contact-jid").val(),name:$("#add-contact-name").val(),groups:["Buddies"]},a.jid&&this.session.updateContact(a,!0),!1},a.prototype.removeContact=function(){return this.toggleForm("#remove-contact-form"),this.session.removeContact(this.currentContact),this.currentContact=null,$("#chat-title").text("Select a buddy to chat"),$("#messages").empty(),$("#remove-contact-msg").html("Select a buddy in the list above to remove."),$("#remove-contact-form .buttons").hide(),$("#edit-contact-jid").text("Select a buddy in the list above to update."),$("#edit-contact-name").val(""),$("#edit-contact-form input").hide(),$("#edit-contact-form .buttons").hide(),!1},a.prototype.updateContact=function(){var a;return this.toggleForm("#edit-contact-form"),a={jid:this.currentContact,name:$("#edit-contact-name").val(),groups:this.session.roster[this.currentContact].groups},this.session.updateContact(a),!1},a.prototype.toggleForm=function(a,b){return a=$(a),$("form.overlay").each(function(){if(this.id!==a.attr("id"))return $(this).hide()}),a.is(":hidden")?(b&&b(),a.fadeIn(100)):a.fadeOut(100,__bind(function(){a[0].reset(),this.layout.resize();if(b)return b()},this))},a.prototype.draw=function(){var a;if(!this.session.connected()){window.location.hash="";return}return $("body").attr("id","chat-page"),$("#container").hide().empty(),$('<div id="alpha" class="sidebar column y-fill">\n  <h2>Buddies <div id="search-roster-icon"></div></h2>\n  <div id="search-roster-form"></div>\n  <ul id="roster" class="selectable scroll y-fill"></ul>\n  <div id="alpha-controls" class="controls">\n    <div id="add-contact"></div>\n    <div id="remove-contact"></div>\n    <div id="edit-contact"></div>\n  </div>\n  <form id="add-contact-form" class="overlay" style="display:none;">\n    <h2>Add Buddy</h2>\n    <input id="add-contact-jid" type="email" maxlength="1024" placeholder="Account name"/>\n    <input id="add-contact-name" type="text" maxlength="1024" placeholder="Real name"/>\n    <fieldset class="buttons">\n      <input id="add-contact-cancel" type="button" value="Cancel"/>\n      <input id="add-contact-ok" type="submit" value="Add"/>\n    </fieldset>\n  </form>\n  <form id="remove-contact-form" class="overlay" style="display:none;">\n    <h2>Remove Buddy</h2>\n    <p id="remove-contact-msg">Select a buddy in the list above to remove.</p>\n    <fieldset class="buttons" style="display:none;">\n      <input id="remove-contact-cancel" type="button" value="Cancel"/>\n      <input id="remove-contact-ok" type="submit" value="Remove"/>\n    </fieldset>\n  </form>\n  <form id="edit-contact-form" class="overlay" style="display:none;">\n    <h2>Update Profile</h2>\n    <p id="edit-contact-jid">Select a buddy in the list above to update.</p>\n    <input id="edit-contact-name" type="text" maxlength="1024" placeholder="Real name" style="display:none;"/>\n    <fieldset class="buttons" style="display:none;">\n      <input id="edit-contact-cancel" type="button" value="Cancel"/>\n      <input id="edit-contact-ok" type="submit" value="Save"/>\n    </fieldset>\n  </form>\n</div>\n<div id="beta" class="primary column x-fill y-fill">\n  <h2 id="chat-title">Select a buddy to chat</h2>\n  <ul id="messages" class="scroll y-fill"></ul>\n  <form id="message-form">\n    <input id="message" name="message" type="text" maxlength="1024" placeholder="Type a message and press enter to send"/>\n  </form>\n</div>\n<div id="charlie" class="sidebar column y-fill">\n  <h2>Notifications</h2>\n  <ul id="notifications" class="scroll y-fill"></ul>\n  <div id="charlie-controls" class="controls">\n    <div id="clear-notices"></div>\n  </div>\n</div>').appendTo("#container"),this.roster(),new Button("#clear-notices",ICONS.no),new Button("#add-contact",ICONS.plus),new Button("#remove-contact",ICONS.minus),new Button("#edit-contact",ICONS.user),$("#message").focus(function(){return $("form.overlay").fadeOut()}),$("#message-form").submit(__bind(function(){return this.send()},this)),$("#clear-notices").click(function(){return $("#notifications li").fadeOut(200)}),$("#add-contact").click(__bind(function(){return this.toggleForm("#add-contact-form")},this)),$("#remove-contact").click(__bind(function(){return this.toggleForm("#remove-contact-form")},this)),$("#edit-contact").click(__bind(function(){return this.toggleForm("#edit-contact-form",__bind(function(){if(this.currentContact)return $("#edit-contact-jid").text(this.currentContact),$("#edit-contact-name").val(this.session.roster[this.currentContact].name)},this))},this)),$("#add-contact-cancel").click(__bind(function(){return this.toggleForm("#add-contact-form")},this)),$("#remove-contact-cancel").click(__bind(function(){return this.toggleForm("#remove-contact-form")},this)),$("#edit-contact-cancel").click(__bind(function(){return this.toggleForm("#edit-contact-form")},this)),$("#add-contact-form").submit(__bind(function(){return this.addContact()},this)),$("#remove-contact-form").submit(__bind(function(){return this.removeContact()},this)),$("#edit-contact-form").submit(__bind(function(){return this.updateContact()},this)),$("#container").fadeIn(200),this.layout=this.resize(),a=__bind(function(){return this.layout.resize(),this.layout.resize()},this),new Filter({list:"#roster",icon:"#search-roster-icon",form:"#search-roster-form",attrs:["data-jid","data-name"],open:a,close:a})},a.prototype.resize=function(){var a,b,c,d,e;return a=$("#alpha"),b=$("#beta"),c=$("#charlie"),e=$("#message"),d=$("#message-form"),new Layout(function(){return c.css("left",a.width()+b.width()),e.width(d.width()-32)})},a}(),$(function(){var a,b,c,d,e,f;f=new Session,d=new NavBar(f),d.draw(),a={Messages:ICONS.chat,Logout:ICONS.power};for(c in a)b=a[c],d.addButton(c,b);return e={"/messages":new ChatPage(f),"/logout":new LogoutPage(f),"default":new LoginPage(f,"/messages/")},(new Router(e)).draw(),d.select($("#nav-link-messages").parent())})

data/web/chat/javascripts/chat.js

@@ -17,6 +17,7 @@ ChatPage = (function() {
     }, this));
     this.chats = {};
     this.currentContact = null;
+    this.layout = null;
   }
   ChatPage.prototype.datef = function(millis) {
     var d, hour, meridian, minutes;
@@ -65,6 +66,9 @@ ChatPage = (function() {
   };
   ChatPage.prototype.message = function(message) {
     var bottom, chat, from, me;
+    if (!(message.type === 'chat' && message.text)) {
+      return;
+    }
     this.queueMessage(message);
     me = message.from === this.session.jid();
     from = message.from.split('/')[0];
@@ -232,6 +236,7 @@ ChatPage = (function() {
         from: this.session.jid(),
         text: text,
         to: jid,
+        type: 'chat',
         received: new Date()
       });
       this.session.sendMessage(jid, text);
@@ -290,16 +295,17 @@ ChatPage = (function() {
       }
       return form.fadeIn(100);
     } else {
-      return form.fadeOut(100, function() {
+      return form.fadeOut(100, __bind(function() {
         form[0].reset();
+        this.layout.resize();
         if (fn) {
           return fn();
         }
-      });
+      }, this));
     }
   };
   ChatPage.prototype.draw = function() {
-    var fn, layout;
+    var fn;
     if (!this.session.connected()) {
       window.location.hash = '';
       return;
@@ -354,11 +360,11 @@ ChatPage = (function() {
       return this.updateContact();
     }, this));
     $('#container').fadeIn(200);
-    layout = this.resize();
-    fn = function() {
-      layout.resize();
-      return layout.resize();
-    };
+    this.layout = this.resize();
+    fn = __bind(function() {
+      this.layout.resize();
+      return this.layout.resize();
+    }, this);
     return new Filter({
       list: '#roster',
       icon: '#search-roster-icon',

data/web/chat/stylesheets/chat.css

@@ -47,7 +47,10 @@
   content: '\2014 ';
 }
 #chat-page #message-form {
-  background: #f8f8f8;
+  background: #f8f8f8 -moz-linear-gradient(rgba(255, 255, 255, 0.1), rgba(0, 0, 0, 0.05));
+  background: #f8f8f8 -ms-linear-gradient(rgba(255, 255, 255, 0.1), rgba(0, 0, 0, 0.05));
+  background: #f8f8f8 -o-linear-gradient(rgba(255, 255, 255, 0.1), rgba(0, 0, 0, 0.05));
+  background: #f8f8f8 -webkit-linear-gradient(rgba(255, 255, 255, 0.1), rgba(0, 0, 0, 0.05));
   border-top: 1px solid #dfdfdf;
   height: 50px;
   position: absolute;

data/web/lib/coffeescripts/button.coffee

@@ -3,19 +3,23 @@ class Button
     @node = $ node
     @path = path
     @options = options || {}
+    @options.animate = true unless @options.animate?
     this.draw()
 
   draw: ->
     paper = Raphael @node.get(0)
 
+    transform = "s#{@options.scale || 0.85}"
+    transform += ",t#{@options.translation}" if @options.translation
+
     icon = paper.path(@path).attr
       fill: @options.fill || '#000'
       stroke: @options.stroke || '#fff'
       'stroke-width': @options['stroke-width'] || 0.3
       opacity: @options.opacity || 0.6
-      scale: @options.scale || 0.85
-      translation: @options.translation || ''
+      transform: transform
 
-    @node.hover(
-      -> icon.animate(opacity: 1.0, 200),
-      -> icon.animate(opacity: 0.6, 200))
+    if @options.animate
+      @node.hover(
+        -> icon.animate(opacity: 1.0, 200),
+        -> icon.animate(opacity: 0.6, 200))

data/web/lib/coffeescripts/filter.coffee

@@ -16,7 +16,7 @@ class Filter
     if @icon
       new Button @icon, ICONS.search,
         scale: 0.5
-        translation: '-8 -8'
+        translation: '-16,-16'
 
     form.submit -> false
     text.keyup  => this.filter(text)

data/web/lib/coffeescripts/login.coffee

@@ -32,7 +32,8 @@ class LoginPage
     $('#container').hide().empty()
     $("""
       <form id="login-form">
-        <h1>vines&gt;</h1>
+        <div id="icon"></div>
+        <h1>vines</h1>
         <fieldset id="login-form-controls">
           <input id="jid" name="jid" type="email" maxlength="1024" value="#{jid}" placeholder="Your user name"/>
           <input id="password" name="password" type="password" maxlength="1024" placeholder="Your password"/>
@@ -46,6 +47,18 @@ class LoginPage
     $('#jid').keydown      -> $('#error').fadeOut()
     $('#password').keydown -> $('#error').fadeOut()
     this.resize()
+    this.icon()
+
+  icon: ->
+    opts =
+      fill: '90-#ccc-#fff'
+      stroke: '#fff'
+      'stroke-width': 1.1
+      opacity: 0.95
+      scale: 3.0
+      translation: '10,8'
+      animate: false
+    new Button('#icon', ICONS.chat, opts)
 
   resize: ->
     win  = $ window

data/web/lib/coffeescripts/session.coffee

@@ -191,17 +191,14 @@ class Session
     type   = node.attr 'type'
     thread = node.find('thread').first()
     body   = node.find('body').first()
-    html   = node.find('span').first()
-    if type == 'chat' && body.size() > 0
-      this.notify 'message',
-        to:   to
-        from: from
-        type: type
-        thread: thread.text()
-        text: body.text()
-        html: html.text()
-        received: new Date()
-        node: node
+    this.notify 'message',
+      to:   to
+      from: from
+      type: type
+      thread: thread.text()
+      text: body.text()
+      received: new Date()
+      node: node
     true # keep handler alive
 
   handlePresence: (node) ->