vines 0.2.1 → 0.3.0

data/test/stanza/presence/subscribe_test.rb

@@ -28,14 +28,11 @@ class SubscribeTest < MiniTest::Unit::TestCase
       @nodes << node
     end
 
-    router = MiniTest::Mock.new
-    router.expect(:interested_resources, [recipient], [alice])
-
     stream = MiniTest::Mock.new
     stream.expect(:domain, 'wonderland.lit')
     stream.expect(:storage, storage, ['wonderland.lit'])
     stream.expect(:user, user)
-    stream.expect(:router, router)
+    stream.expect(:interested_resources, [recipient], [alice])
     stream.expect(:update_user_streams, nil, [user])
     def stream.nodes; @nodes; end
     def stream.write(node)
@@ -53,7 +50,6 @@ class SubscribeTest < MiniTest::Unit::TestCase
     assert stream.verify
     assert user.verify
     assert storage.verify
-    assert router.verify
     assert_equal 1, stream.nodes.size
     assert_equal 1, recipient.nodes.size
 

data/test/stanza_test.rb

@@ -0,0 +1,77 @@
+# encoding: UTF-8
+
+require 'vines'
+require 'ext/nokogiri'
+require 'minitest/autorun'
+
+class StanzaTest < MiniTest::Unit::TestCase
+  def setup
+    @alice = Vines::JID.new('alice@wonderland.lit/tea')
+    @romeo = Vines::JID.new('romeo@verona.lit/balcony')
+    @stream = MiniTest::Mock.new
+    @config = Vines::Config.new do
+      host 'wonderland.lit' do
+        storage(:fs) { dir '.' }
+      end
+    end
+  end
+
+  def test_validate_missing_addresses
+    node = node(%Q{<message>hello!</message>})
+    stanza = Vines::Stanza::Message.new(node, @stream)
+    assert_nil stanza.validate_to
+    assert_nil stanza.validate_from
+    assert @stream.verify
+  end
+
+  def test_validate_valid_addresses
+    node = node(%Q{<message from="#{@alice}" to="#{@romeo}">hello!</message>})
+    stanza = Vines::Stanza::Message.new(node, @stream)
+    assert_equal @romeo, stanza.validate_to
+    assert_equal @alice, stanza.validate_from
+    assert @stream.verify
+  end
+
+  def test_validate_invalid_addresses
+    node = node(%Q{<message from="a lice@wonderland.lit" to="romeo@v erona.lit">hello!</message>})
+    stanza = Vines::Stanza::Message.new(node, @stream)
+    assert_raises(Vines::StanzaErrors::JidMalformed) { stanza.validate_to }
+    assert_raises(Vines::StanzaErrors::JidMalformed) { stanza.validate_from }
+    assert @stream.verify
+  end
+
+  def test_non_routable_stanza_is_local
+    stanza = Vines::Stanza.new(node('<auth/>'), @stream)
+    assert stanza.local?
+    assert @stream.verify
+  end
+
+  def test_stanza_missing_to_is_local
+    node = node(%Q{<message>hello!</message>})
+    stanza = Vines::Stanza::Message.new(node, @stream)
+    assert stanza.local?
+    assert @stream.verify
+  end
+
+  def test_stanza_with_local_jid_is_local
+    node = node(%Q{<message to="#{@alice}">hello!</message>})
+    @stream.expect(:config, @config)
+    stanza = Vines::Stanza::Message.new(node, @stream)
+    assert stanza.local?
+    assert @stream.verify
+  end
+
+  def test_stanza_with_remote_jid_is_not_local
+    node = node(%Q{<message to="#{@romeo}">hello!</message>})
+    @stream.expect(:config, @config)
+    stanza = Vines::Stanza::Message.new(node, @stream)
+    refute stanza.local?
+    assert @stream.verify
+  end
+
+  private
+
+  def node(xml)
+    Nokogiri::XML(xml).root
+  end
+end

data/test/stream/client/auth_test.rb

@@ -90,6 +90,7 @@ class ClientAuthTest < MiniTest::Unit::TestCase
 
   def test_plain_auth_valid_password
     user = Vines::User.new(:jid => 'alice@wonderland.lit')
+    @stream.expect(:reset, nil)
     @stream.expect(:storage, MockStorage.new)
     @stream.expect(:user, user)
     @stream.expect(:user=, nil, [user])

data/test/stream/client/ready_test.rb

@@ -15,6 +15,8 @@ class ClientReadyTest < MiniTest::Unit::TestCase
       else
         MiniTest::Mock.new.tap do |stanza|
           stanza.expect(:process, nil)
+          stanza.expect(:validate_to, nil)
+          stanza.expect(:validate_from, nil)
           ClientReadyTest::STANZAS << stanza
         end
       end

data/test/stream/client/session_test.rb

@@ -4,9 +4,14 @@ require 'vines'
 require 'minitest/autorun'
 
 class ClientSessionTest < MiniTest::Unit::TestCase
+  def setup
+    @stream = MiniTest::Mock.new
+    @stream.expect(:config, nil)
+  end
+
   def test_equality
-    one = Vines::Stream::Client::Session.new(nil)
-    two = Vines::Stream::Client::Session.new(nil)
+    one = Vines::Stream::Client::Session.new(@stream)
+    two = Vines::Stream::Client::Session.new(@stream)
 
     assert_nil one <=> 42
 

data/test/stream/component/ready_test.rb

@@ -5,94 +5,77 @@ require 'ext/nokogiri'
 require 'minitest/autorun'
 
 class ComponentReadyTest < MiniTest::Unit::TestCase
-  STANZAS = []
-
   def setup
     @stream = MiniTest::Mock.new
-    @state = Vines::Stream::Component::Ready.new(@stream, nil)
-    def @state.to_stanza(node)
-      if node.name == 'bogus'
-        nil
-      else
-        MiniTest::Mock.new.tap do |stanza|
-          if node['to'] == 'hatter@wonderland.lit'
-            stanza.expect(:local?, true)
-          else
-            stanza.expect(:local?, false)
-            stanza.expect(:route, nil)
-          end
-          ComponentReadyTest::STANZAS << stanza
-        end
+    @state  = Vines::Stream::Component::Ready.new(@stream, nil)
+    @config = Vines::Config.new do
+      host 'wonderland.lit' do
+        storage(:fs) { dir '.' }
       end
     end
   end
 
-  def teardown
-    STANZAS.clear
-  end
-
   def test_missing_to_and_from_addresses
     node = node('<message/>')
     assert_raises(Vines::StreamErrors::ImproperAddressing) { @state.node(node) }
-    assert_equal 1, STANZAS.size
     assert @stream.verify
   end
 
   def test_missing_from_address
-    @stream.expect(:remote_domain, 'tea.wonderland.lit')
     node = node(%q{<message to="hatter@wonderland.lit"/>})
     assert_raises(Vines::StreamErrors::ImproperAddressing) { @state.node(node) }
-    assert_equal 1, STANZAS.size
     assert @stream.verify
   end
 
   def test_missing_to_address
     node = node(%q{<message from="alice@tea.wonderland.lit"/>})
     assert_raises(Vines::StreamErrors::ImproperAddressing) { @state.node(node) }
-    assert_equal 1, STANZAS.size
     assert @stream.verify
   end
 
   def test_invalid_from_address
     @stream.expect(:remote_domain, 'tea.wonderland.lit')
     node = node(%q{<message from="alice@bogus.wonderland.lit" to="hatter@wonderland.lit"/>})
-    assert_raises(Vines::StreamErrors::ImproperAddressing) { @state.node(node) }
-    assert_equal 1, STANZAS.size
+    assert_raises(Vines::StreamErrors::InvalidFrom) { @state.node(node) }
     assert @stream.verify
   end
 
   def test_unsupported_stanza_type
     node = node('<bogus/>')
     assert_raises(Vines::StreamErrors::UnsupportedStanzaType) { @state.node(node) }
-    assert STANZAS.empty?
     assert @stream.verify
   end
 
   def test_remote_message_routes
-    @stream.expect(:remote_domain, 'tea.wonderland.lit')
     node = node(%q{<message from="alice@tea.wonderland.lit" to="romeo@verona.lit"/>})
+    @stream.expect(:remote_domain, 'tea.wonderland.lit')
+    @stream.expect(:config, @config)
+    @stream.expect(:user=, nil, [Vines::User.new(:jid => 'alice@tea.wonderland.lit')])
+
+    @router = MiniTest::Mock.new
+    @router.expect(:route, nil, [node])
+    @stream.expect(:router, @router)
+
     @state.node(node)
-    assert_equal 1, STANZAS.size
-    assert STANZAS.map {|s| s.verify }.all?
     assert @stream.verify
+    assert @router.verify
   end
 
   def test_local_message_processes
     node = node(%q{<message from="alice@tea.wonderland.lit" to="hatter@wonderland.lit"/>})
     @stream.expect(:remote_domain, 'tea.wonderland.lit')
+    @stream.expect(:config, @config)
+    @stream.expect(:user=, nil, [Vines::User.new(:jid => 'alice@tea.wonderland.lit')])
+    @stream.expect(:user, Vines::User.new(:jid => 'alice@tea.wonderland.lit'))
 
     @recipient = MiniTest::Mock.new
+    @recipient.expect(:user, Vines::User.new(:jid => 'hatter@wonderland.lit'))
     @recipient.expect(:write, nil, [node])
 
-    @router = MiniTest::Mock.new
-    @router.expect(:connected_resources, [@recipient], ['hatter@wonderland.lit'])
-    @stream.expect(:router, @router)
+    @stream.expect(:connected_resources, [@recipient], ['hatter@wonderland.lit'])
 
     @state.node(node)
-    assert_equal 1, STANZAS.size
-    assert STANZAS.map {|s| s.verify }.all?
     assert @stream.verify
-    assert @router.verify
     assert @recipient.verify
   end
 

data/test/stream/http/request_test.rb

@@ -13,7 +13,7 @@ class RequestTest < MiniTest::Unit::TestCase
 
     @stream = MiniTest::Mock.new
     @parser = MiniTest::Mock.new
-    @parser.expect(:headers, {'Content-Type' => 'text/html'})
+    @parser.expect(:headers, {'Content-Type' => 'text/html', 'Host' => 'wonderland.lit'})
     @parser.expect(:http_method, 'GET')
     @parser.expect(:request_path, '/blogs/12')
     @parser.expect(:request_url, '/blogs/12?ok=true')
@@ -27,7 +27,7 @@ class RequestTest < MiniTest::Unit::TestCase
 
   def test_copies_request_info_from_parser
     request = Vines::Stream::Http::Request.new(@stream, @parser, '<html></html>')
-    assert_equal request.headers, {'Content-Type' => 'text/html'}
+    assert_equal request.headers, {'Content-Type' => 'text/html', 'Host' => 'wonderland.lit'}
     assert_equal request.method, 'GET'
     assert_equal request.path, '/blogs/12'
     assert_equal request.url, '/blogs/12?ok=true'
@@ -64,6 +64,7 @@ class RequestTest < MiniTest::Unit::TestCase
 
   def test_reply_with_file_for_directory_serves_index_html
     @parser.expect(:request_path, '/')
+    @parser.expect(:request_url, '/?ok=true')
     request = Vines::Stream::Http::Request.new(@stream, @parser, '<html></html>')
 
     mtime = File.mtime(INDEX).utc.strftime('%a, %d %b %Y %H:%M:%S GMT')
@@ -83,4 +84,23 @@ class RequestTest < MiniTest::Unit::TestCase
     assert @stream.verify
     assert @parser.verify
   end
+
+  def test_reply_with_file_redirects_for_missing_slash
+    @parser.expect(:request_path, '/http')
+    @parser.expect(:request_url, '/http?ok=true')
+    request = Vines::Stream::Http::Request.new(@stream, @parser, '<html></html>')
+
+    headers = [
+      "HTTP/1.1 301 Moved Permanently",
+      "Connection: close",
+      "Location: http://wonderland.lit/http/?ok=true"
+    ].join("\r\n")
+
+    @stream.expect(:stream_write, nil, ["#{headers}\r\n\r\n"])
+    @stream.expect(:close_connection_after_writing, nil)
+    # so the /http url above will work
+    request.reply_with_file(File.expand_path('../../', __FILE__))
+    assert @stream.verify
+    assert @parser.verify
+  end
 end

data/test/stream/server/ready_test.rb

@@ -10,16 +10,10 @@ class ServerReadyTest < MiniTest::Unit::TestCase
     @stream = MiniTest::Mock.new
     @state = Vines::Stream::Server::Ready.new(@stream, nil)
     def @state.to_stanza(node)
-      if node.name == 'bogus'
-        nil
-      else
-        MiniTest::Mock.new.tap do |stanza|
-          stanza.expect(:process, nil)
-          stanza.class.send(:define_method, :[]) do |a|
-            node[a]
-          end
-          ServerReadyTest::STANZAS << stanza
-        end
+      Vines::Stanza.from_node(node, @stream).tap do |stanza|
+        def stanza.process
+          ServerReadyTest::STANZAS << self
+        end if stanza
       end
     end
   end
@@ -35,7 +29,6 @@ class ServerReadyTest < MiniTest::Unit::TestCase
     node = node(%Q{<message from="alice@wonderland.lit" to="romeo@verona.lit"/>})
     @state.node(node)
     assert_equal 1, STANZAS.size
-    assert STANZAS.map {|s| s.verify }.all?
     assert @stream.verify
   end
 
@@ -49,28 +42,28 @@ class ServerReadyTest < MiniTest::Unit::TestCase
   def test_improper_addressing_missing_to
     node = node(%Q{<message from="alice@wonderland.lit"/>})
     assert_raises(Vines::StreamErrors::ImproperAddressing) { @state.node(node) }
-    assert_equal 1, STANZAS.size
+    assert STANZAS.empty?
     assert @stream.verify
   end
 
-  def test_improper_addressing_empty_to
+  def test_improper_addressing_invalid_to
     node = node(%Q{<message from="alice@wonderland.lit" to=" "/>})
-    assert_raises(Vines::StreamErrors::ImproperAddressing) { @state.node(node) }
-    assert_equal 1, STANZAS.size
+    assert_raises(Vines::StanzaErrors::JidMalformed) { @state.node(node) }
+    assert STANZAS.empty?
     assert @stream.verify
   end
 
   def test_improper_addressing_missing_from
     node = node(%Q{<message to="romeo@verona.lit"/>})
     assert_raises(Vines::StreamErrors::ImproperAddressing) { @state.node(node) }
-    assert_equal 1, STANZAS.size
+    assert STANZAS.empty?
     assert @stream.verify
   end
 
-  def test_improper_addressing_empty_from
+  def test_improper_addressing_invalid_from
     node = node(%Q{<message from=" " to="romeo@verona.lit"/>})
-    assert_raises(Vines::StreamErrors::ImproperAddressing) { @state.node(node) }
-    assert_equal 1, STANZAS.size
+    assert_raises(Vines::StanzaErrors::JidMalformed) { @state.node(node) }
+    assert STANZAS.empty?
     assert @stream.verify
   end
 
@@ -78,7 +71,7 @@ class ServerReadyTest < MiniTest::Unit::TestCase
     @stream.expect(:remote_domain, 'wonderland.lit')
     node = node(%Q{<message from="alice@bogus.lit" to="romeo@verona.lit"/>})
     assert_raises(Vines::StreamErrors::InvalidFrom) { @state.node(node) }
-    assert_equal 1, STANZAS.size
+    assert STANZAS.empty?
     assert @stream.verify
   end
 
@@ -87,7 +80,7 @@ class ServerReadyTest < MiniTest::Unit::TestCase
     @stream.expect(:domain, 'verona.lit')
     node = node(%Q{<message from="alice@wonderland.lit" to="romeo@bogus.lit"/>})
     assert_raises(Vines::StreamErrors::HostUnknown) { @state.node(node) }
-    assert_equal 1, STANZAS.size
+    assert STANZAS.empty?
     assert @stream.verify
   end
 

data/web/404.html

@@ -27,17 +27,23 @@
       width: 100%;
     }
     p {
-      color: #fff;
+      color: rgba(255, 255, 255, 0.8);
       font-size: 11pt;
       margin: 20px auto;
-      text-shadow: 0 1px 1px #000;
+      width: 400px;
+    }
+    a {
+      color: inherit;
     }
   </style>
 </head>
 <body>
   <header>
     <h1>Page not found</h1>
-    <p>This is not the page you're looking for.</p>
+    <p>
+      This is not the page you're looking for. You probably wanted the
+      <a href="/chat/">chat</a> application.
+    </p>
   </header>
 </body>
 </html>

data/web/chat/index.html

@@ -8,9 +8,9 @@
 <link rel="shortcut icon" type="image/png" href="/favicon.png">
 <link rel="stylesheet" href="/lib/stylesheets/base.css">
 <link rel="stylesheet" href="/lib/stylesheets/login.css">
-<link rel="stylesheet" href="/chat/stylesheets/chat.css">
+<link rel="stylesheet" href="stylesheets/chat.css">
 <script type="text/javascript" src="/lib/javascripts/base.js"></script>
-<script type="text/javascript" src="/chat/javascripts/app.js"></script>
+<script type="text/javascript" src="javascripts/app.js"></script>
 </head>
 <body>
 </body>

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}a.prototype.datef=function(a){var b,c,d,e;b=new Date(a),d=b.getHours()>=12?" pm":" am",c=b.getHours()>12?b.getHours()-12:b.getHours(),c===0&&(c=12),e=b.getMinutes()+"",e.length===1&&(e="0"+e);return 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){$(".text",a).text(b.name||b.jid);return 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){c=this.chat(a.from),c.unread++;return 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;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);return e.fadeIn(200)},a.prototype.queueMessage=function(a){var b,c,d;d=a.from===this.session.jid(),c=a[d?"to":"from"],b=this.chat(c),b.jid=c;return b.messages.push(a)},a.prototype.chat=function(a){var b,c;b=a.split("/")[0],c=this.chats[b],c||(c={jid:a,messages:[],unread:0},this.chats[b]=c);return c},a.prototype.presence=function(a){var b,c,d;c=a.from.split("/")[0];if(c!==this.session.bareJid()){if(!a.type||a.offline)b=this.session.roster[c],this.eachContact(c,function(a){$(".status-msg",a).text(b.status());return b.offline()?a.addClass("offline"):a.removeClass("offline")});a.offline&&(this.chat(c).jid=c);if(a.type==="subscribe"){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));return $('input[type="button"]',d).click(__bind(function(){return this.rejectContact(d,a.from)},this))}}},a.prototype.acceptContact=function(a,b){a.fadeOut(200,function(){return a.remove()}),this.session.sendSubscribed(b),this.session.sendSubscribe(b);return!1},a.prototype.rejectContact=function(a,b){a.fadeOut(200,function(){return a.remove()});return 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){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);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);return $("#edit-contact-form .buttons").fadeIn(200)}},a.prototype.scroll=function(){var a;a=$("#messages");return a.animate({scrollTop:a.prop("scrollHeight")},400)},a.prototype.atBottom=function(){var a,b;b=$("#messages"),a=b.prop("scrollHeight")-b.height();return b.scrollTop()===a},a.prototype.send=function(){var a,b,c,d;if(!this.currentContact)return!1;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("");return!1},a.prototype.addContact=function(){var a;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);return!1},a.prototype.removeContact=function(){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();return!1},a.prototype.updateContact=function(){var a;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);return!1},a.prototype.toggleForm=function(a,b){a=$(a),$("form.overlay").each(function(){if(this.id!==a.attr("id"))return $(this).hide()});if(a.is(":hidden")){b&&b();return a.fadeIn(100)}return 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="";else{$("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){$("#edit-contact-jid").text(this.currentContact);return $("#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(){b.resize();return b.resize()};return 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;a=$("#alpha"),b=$("#beta"),c=$("#charlie"),e=$("#message"),d=$("#message-form");return new Layout(function(){c.css("left",a.width()+b.width());return e.width(d.width()-32)})};return a}();var LogoutPage;LogoutPage=function(){function a(a){this.session=a}a.prototype.draw=function(){window.location.hash="";return window.location.reload()};return 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);e={"/messages":new ChatPage(f),"/logout":new LogoutPage(f),"default":new LoginPage(f,"/messages/")},(new Router(e)).draw();return 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}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.height(),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())})

data/web/chat/stylesheets/chat.css

@@ -55,11 +55,6 @@
   bottom: 0;
   width: 100%;
 }
-#chat-page input[type="text"]:focus,
-#chat-page input[type="email"]:focus {
-  -webkit-box-shadow: inset 1px 1px 2px rgba(0, 0, 0, 0.6);
-  box-shadow: inset 1px 1px 2px rgba(0, 0, 0, 0.6);
-}
 #chat-page #message {
   display: block;
   position: relative;
@@ -111,10 +106,10 @@
   line-height: 11px;
 }
 #chat-page #roster .unread {
-  background: #4693FF;
-  background: -moz-linear-gradient(#4693FF, #015de6);
-  background: -o-linear-gradient(#4693FF, #015de6);
-  background: -webkit-gradient(linear, left top, left bottom, from(#4693FF), to(#015de6));
+  background: #319be7;
+  background: -moz-linear-gradient(#319be7, #1b78d9);
+  background: -o-linear-gradient(#319be7, #1b78d9);
+  background: -webkit-gradient(linear, left top, left bottom, from(#319be7), to(#1b78d9));
   border-radius: 30px;
   color: #fff;
   display: inline-block;