vines 0.2.1 → 0.3.0

data/web/lib/javascripts/transfer.js

@@ -16,10 +16,10 @@ Transfer = (function() {
     this.sent = 0;
   }
   Transfer.prototype.start = function() {
-    var callback, node;
+    var node;
     node = $("<iq id=\"" + (this.session.uniqueId()) + "\" to=\"" + this.to + "\" type=\"set\">\n  <si xmlns=\"http://jabber.org/protocol/si\" id=\"" + (this.session.uniqueId()) + "\" profile=\"http://jabber.org/protocol/si/profile/file-transfer\">\n    <file xmlns=\"http://jabber.org/protocol/si/profile/file-transfer\" name=\"\" size=\"" + this.file.size + "\"/>\n    <feature xmlns=\"http://jabber.org/protocol/feature-neg\">\n      <x xmlns=\"jabber:x:data\" type=\"form\">\n        <field var=\"stream-method\" type=\"list-single\">\n          <option><value>http://jabber.org/protocol/ibb</value></option>\n        </field>\n      </x>\n    </feature>\n  </si>\n</iq>");
     $('file', node).attr('name', this.file.name);
-    callback = __bind(function(result) {
+    return this.session.sendIQ(node.get(0), __bind(function(result) {
       var m, methods, ok;
       methods = $('si feature x field[var="stream-method"] value', result);
       ok = ((function() {
@@ -36,45 +36,42 @@ Transfer = (function() {
       if (ok) {
         return this.open();
       }
-    }, this);
-    return this.session.sendIQ(node.get(0), callback);
+    }, this));
   };
   Transfer.prototype.open = function() {
-    var callback, node;
+    var node;
     node = $("<iq id=\"" + (this.session.uniqueId()) + "\" to=\"" + this.to + "\" type=\"set\">\n  <open xmlns=\"http://jabber.org/protocol/ibb\" sid=\"" + this.sid + "\" block-size=\"4096\"/>\n</iq>");
-    callback = __bind(function(result) {
+    return this.session.sendIQ(node.get(0), __bind(function(result) {
       if (this.ok(result)) {
         this.opened = true;
-        return this.chunks.start(__bind(function() {
-          return this.sendChunk();
-        }, this));
+        return this.sendChunk();
       }
-    }, this);
-    return this.session.sendIQ(node.get(0), callback);
+    }, this));
   };
   Transfer.prototype.sendChunk = function() {
-    var callback, chunk, node;
     if (this.closed) {
       return;
     }
-    if (!(chunk = this.chunks.chunk())) {
-      this.close();
-      return;
-    }
-    node = $("<iq id=\"" + (this.session.uniqueId()) + "\" to=\"" + this.to + "\" type=\"set\">\n  <data xmlns=\"http://jabber.org/protocol/ibb\" sid=\"" + this.sid + "\" seq=\"" + (this.seq++) + "\">" + chunk + "</data>\n</iq>");
-    if (this.seq > 65535) {
-      this.seq = 0;
-    }
-    callback = __bind(function(result) {
-      var pct;
-      if (!this.ok(result)) {
+    return this.chunks.chunk(__bind(function(chunk) {
+      var node;
+      if (!chunk) {
+        this.close();
         return;
       }
-      pct = Math.ceil(++this.sent / this.chunks.total * 100);
-      this.progress(pct);
-      return this.sendChunk();
-    }, this);
-    return this.session.sendIQ(node.get(0), callback);
+      node = $("<iq id=\"" + (this.session.uniqueId()) + "\" to=\"" + this.to + "\" type=\"set\">\n  <data xmlns=\"http://jabber.org/protocol/ibb\" sid=\"" + this.sid + "\" seq=\"" + (this.seq++) + "\">" + chunk + "</data>\n</iq>");
+      if (this.seq > 65535) {
+        this.seq = 0;
+      }
+      return this.session.sendIQ(node.get(0), __bind(function(result) {
+        var pct;
+        if (!this.ok(result)) {
+          return;
+        }
+        pct = Math.ceil(++this.sent / this.chunks.total * 100);
+        this.progress(pct);
+        return this.sendChunk();
+      }, this));
+    }, this));
   };
   Transfer.prototype.close = function() {
     var node;
@@ -97,36 +94,29 @@ Transfer = (function() {
     return $(result).attr('type') === 'result';
   };
   Chunks = (function() {
+    var CHUNK_SIZE;
+    CHUNK_SIZE = 3 / 4 * 4096;
     function Chunks(file) {
       this.file = file;
-      this.chunks = [];
-      this.total = 0;
+      this.total = Math.ceil(this.file.size / CHUNK_SIZE);
+      this.slice = this.file.slice || this.file.webkitSlice || this.file.mozSlice;
+      this.pos = 0;
     }
-    Chunks.prototype.chunk = function() {
-      return this.chunks.shift();
-    };
-    Chunks.prototype.start = function(callback) {
-      var reader;
-      reader = new FileReader();
-      reader.onload = __bind(function(event) {
-        var chunk, data;
-        data = btoa(event.target.result);
-        this.chunks = (function() {
-          var _i, _len, _ref, _results;
-          _ref = data.split(/(.{1,4096})/);
-          _results = [];
-          for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-            chunk = _ref[_i];
-            if (chunk) {
-              _results.push(chunk);
-            }
-          }
-          return _results;
-        })();
-        this.total = this.chunks.length;
-        return callback();
-      }, this);
-      return reader.readAsBinaryString(this.file);
+    Chunks.prototype.chunk = function(callback) {
+      var chunk, end, reader, start;
+      start = this.pos;
+      end = this.pos + CHUNK_SIZE;
+      this.pos = end;
+      if (start > this.file.size) {
+        return callback(null);
+      } else {
+        chunk = this.slice.call(this.file, start, end);
+        reader = new FileReader();
+        reader.onload = function(event) {
+          return callback(btoa(event.target.result));
+        };
+        return reader.readAsBinaryString(chunk);
+      }
     };
     return Chunks;
   })();

data/web/lib/stylesheets/base.css

@@ -2,21 +2,24 @@
   margin: 0;
   padding: 0;
 }
+html, body {
+  height: 100%;
+  overflow: hidden;
+}
 html {
   background: #0c1a2d;
-  height: 100%;
 }
 body {
   background: #0c1a2d;
   color: #222;
   font-family: "Helvetica Neue", Helvetica, sans-serif;
   font-size: 10pt;
-  height: 100%;
   line-height: 20pt;
 }
 input[type="text"],
 input[type="email"],
-input[type="password"] {
+input[type="password"],
+textarea {
   border-radius: 2px;
   border: none;
   -webkit-box-shadow: inset 1px 1px 2px rgba(0, 0, 0, 0.2);
@@ -26,6 +29,13 @@ input[type="password"] {
   outline: none;
   padding: 6px;
 }
+input[type="text"]:focus,
+input[type="email"]:focus,
+input[type="password"]:focus,
+textarea: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);
+}
 input[type="button"],
 input[type="submit"] {
   background: -moz-linear-gradient(#ececec, #dcdcdc);
@@ -253,13 +263,24 @@ optgroup option {
   background: rgba(0, 0, 0, .2);
 }
 ul.selectable li.selected {
-  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));
-  border-bottom: 1px solid #fff;
+  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-top: 1px solid #148ddf;
+  border-bottom: 1px solid #095bba;
+  color: #fff;
+  text-shadow: -1px 1px 1px hsl(210, 51%, 45%), 0px -1px 1px hsl(210, 51%, 49%);
+}
+ul.selectable li.selected.secondary {
+  background: hsl(220, 29%, 80%);
+  background: -moz-linear-gradient(hsl(220, 29%, 80%), hsl(217, 25%, 69%));
+  background: -o-linear-gradient(hsl(220, 29%, 80%), hsl(217, 25%, 69%));
+  background: -webkit-gradient(linear, left top, left bottom, from(hsl(220, 29%, 80%)), to(hsl(217, 25%, 69%)));
+  border-top: 1px solid hsl(218, 23%, 79%);
+  border-bottom: 1px solid hsl(218, 20%, 65%);
   color: #fff;
-  text-shadow: 0 -1px 1px #1b3a65;
+  text-shadow: -1px 1px 1px #94a1b8;
 }
 .column {
   height: 100%;
@@ -339,9 +360,24 @@ form.inset .buttons {
   text-align: right;
 }
 form.overlay input[type="text"],
+form.overlay input[type="password"],
 form.overlay input[type="email"] {
   margin-bottom: 10px;
   width: 228px;
   position: relative;
   left: 10px;
 }
+.notification {
+  background: rgba(12, 26, 45, 0.75);
+  border-radius: 30px;
+  color: #fff;
+  font-size: 10pt;
+  font-weight: bold;
+  padding: 5px 100px;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  text-align: center;
+  text-shadow: 0 1px 1px #000;
+  z-index: 2;
+}

metadata

@@ -2,7 +2,7 @@
 name: vines
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - David Graham
@@ -11,8 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-22 00:00:00 -06:00
-default_executable: 
+date: 2011-09-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -22,7 +21,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "3.0"
+        version: 3.1.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -33,7 +32,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.1"
+        version: 3.0.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -44,7 +43,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.3"
+        version: 0.3.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -55,7 +54,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.3"
+        version: 0.3.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -66,7 +65,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.12"
+        version: 0.12.10
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -77,7 +76,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.5"
+        version: 0.5.2
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -88,7 +87,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.2"
+        version: 0.2.2
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -99,7 +98,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.5"
+        version: 1.4.7
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -164,12 +163,15 @@ files:
 - lib/vines/command/schema.rb
 - lib/vines/command/start.rb
 - lib/vines/command/stop.rb
+- lib/vines/config/host.rb
+- lib/vines/config/port.rb
 - lib/vines/config.rb
 - lib/vines/contact.rb
 - lib/vines/daemon.rb
 - lib/vines/error.rb
 - lib/vines/jid.rb
 - lib/vines/kit.rb
+- lib/vines/log.rb
 - lib/vines/router.rb
 - lib/vines/stanza/iq/auth.rb
 - lib/vines/stanza/iq/disco_info.rb
@@ -182,6 +184,7 @@ files:
 - lib/vines/stanza/iq/roster.rb
 - lib/vines/stanza/iq/session.rb
 - lib/vines/stanza/iq/vcard.rb
+- lib/vines/stanza/iq/version.rb
 - lib/vines/stanza/iq.rb
 - lib/vines/stanza/message.rb
 - lib/vines/stanza/presence/error.rb
@@ -253,12 +256,10 @@ files:
 - web/apple-touch-icon.png
 - web/chat/coffeescripts/chat.coffee
 - web/chat/coffeescripts/init.coffee
-- web/chat/coffeescripts/logout.coffee
 - web/chat/index.html
 - web/chat/javascripts/app.js
 - web/chat/javascripts/chat.js
 - web/chat/javascripts/init.js
-- web/chat/javascripts/logout.js
 - web/chat/stylesheets/chat.css
 - web/favicon.png
 - web/lib/coffeescripts/button.coffee
@@ -266,7 +267,9 @@ files:
 - web/lib/coffeescripts/filter.coffee
 - web/lib/coffeescripts/layout.coffee
 - web/lib/coffeescripts/login.coffee
+- web/lib/coffeescripts/logout.coffee
 - web/lib/coffeescripts/navbar.coffee
+- web/lib/coffeescripts/notification.coffee
 - web/lib/coffeescripts/router.coffee
 - web/lib/coffeescripts/session.coffee
 - web/lib/coffeescripts/transfer.coffee
@@ -282,7 +285,9 @@ files:
 - web/lib/javascripts/jquery.js
 - web/lib/javascripts/layout.js
 - web/lib/javascripts/login.js
+- web/lib/javascripts/logout.js
 - web/lib/javascripts/navbar.js
+- web/lib/javascripts/notification.js
 - web/lib/javascripts/raphael.js
 - web/lib/javascripts/router.js
 - web/lib/javascripts/session.js
@@ -290,6 +295,7 @@ files:
 - web/lib/javascripts/transfer.js
 - web/lib/stylesheets/base.css
 - web/lib/stylesheets/login.css
+- test/config/host_test.rb
 - test/config_test.rb
 - test/contact_test.rb
 - test/error_test.rb
@@ -298,13 +304,18 @@ files:
 - test/kit_test.rb
 - test/rake_test_loader.rb
 - test/router_test.rb
+- test/stanza/iq/disco_info_test.rb
+- test/stanza/iq/disco_items_test.rb
 - test/stanza/iq/private_storage_test.rb
 - test/stanza/iq/roster_test.rb
 - test/stanza/iq/session_test.rb
 - test/stanza/iq/vcard_test.rb
+- test/stanza/iq/version_test.rb
 - test/stanza/iq_test.rb
 - test/stanza/message_test.rb
+- test/stanza/presence/probe_test.rb
 - test/stanza/presence/subscribe_test.rb
+- test/stanza_test.rb
 - test/storage/couchdb_test.rb
 - test/storage/ldap_test.rb
 - test/storage/local_test.rb
@@ -328,7 +339,6 @@ files:
 - test/stream/server/ready_test.rb
 - test/token_bucket_test.rb
 - test/user_test.rb
-has_rdoc: true
 homepage: http://www.getvines.com
 licenses: []
 
@@ -352,11 +362,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Vines is an XMPP chat server that's easy to install and run.
 test_files: 
+- test/config/host_test.rb
 - test/config_test.rb
 - test/contact_test.rb
 - test/error_test.rb
@@ -365,13 +376,18 @@ test_files:
 - test/kit_test.rb
 - test/rake_test_loader.rb
 - test/router_test.rb
+- test/stanza/iq/disco_info_test.rb
+- test/stanza/iq/disco_items_test.rb
 - test/stanza/iq/private_storage_test.rb
 - test/stanza/iq/roster_test.rb
 - test/stanza/iq/session_test.rb
 - test/stanza/iq/vcard_test.rb
+- test/stanza/iq/version_test.rb
 - test/stanza/iq_test.rb
 - test/stanza/message_test.rb
+- test/stanza/presence/probe_test.rb
 - test/stanza/presence/subscribe_test.rb
+- test/stanza_test.rb
 - test/storage/couchdb_test.rb
 - test/storage/ldap_test.rb
 - test/storage/local_test.rb