vulcan 0.1.6 → 0.2.0

data/server/node_modules/express/lib/express.js

@@ -28,7 +28,7 @@ var exports = module.exports = connect.middleware;
  * Framework version.
  */
 
-exports.version = '2.4.7';
+exports.version = '2.5.6';
 
 /**
  * Shortcut for `new Server(...)`.

data/server/node_modules/express/lib/request.js

@@ -292,16 +292,18 @@ req.flash = function(type, msg){
 req.is = function(type){
   var fn = this.app.is(type);
   if (fn) return fn(this);
-  var contentType = this.headers['content-type'];
-  if (!contentType) return;
+  var ct = this.headers['content-type'];
+  if (!ct) return false;
+  ct = ct.split(';')[0];
   if (!~type.indexOf('/')) type = mime.lookup(type);
   if (~type.indexOf('*')) {
-    type = type.split('/')
-    contentType = contentType.split('/');
-    if ('*' == type[0] && type[1] == contentType[1]) return true;
-    if ('*' == type[1] && type[0] == contentType[0]) return true;
+    type = type.split('/');
+    ct = ct.split('/');
+    if ('*' == type[0] && type[1] == ct[1]) return true;
+    if ('*' == type[1] && type[0] == ct[0]) return true;
+    return false;
   }
-  return !! ~contentType.indexOf(type);
+  return !! ~ct.indexOf(type);
 };
 
 // Callback for isXMLHttpRequest / xhr

data/server/node_modules/express/lib/view.js

@@ -47,7 +47,10 @@ exports.register = View.register;
  */
 
 exports.compile = function(view, cache, cid, options){
-  if (cache && cid && cache[cid]) return cache[cid];
+  if (cache && cid && cache[cid]){
+    options.filename = cache[cid].path;
+    return cache[cid];
+  }
 
   // lookup
   view = exports.lookup(view, options);
@@ -58,13 +61,13 @@ exports.compile = function(view, cache, cid, options){
     var err = new Error('failed to locate view "' + view.original.view + '"');
     err.view = view.original;
     throw err;
-  }    
+  }
 
   // compile
   options.filename = view.path;
   view.fn = view.templateEngine.compile(view.contents, options);
   cache[cid] = view;
-  
+
   return view;
 };
 
@@ -81,11 +84,11 @@ exports.compile = function(view, cache, cid, options){
  *
  * Lookup:
  *
- *   - partial `_<name>` 
- *   - any `<name>/index` 
- *   - non-layout `../<name>/index` 
- *   - any `<root>/<name>` 
- *   - partial `<root>/_<name>` 
+ *   - partial `_<name>`
+ *   - any `<name>/index`
+ *   - non-layout `../<name>/index`
+ *   - any `<root>/<name>`
+ *   - partial `<root>/_<name>`
  *
  * @param {String} view
  * @param {Object} options
@@ -161,7 +164,7 @@ function renderPartial(res, view, options, parentLocals, parent){
 
   // Inherit locals from parent
   union(options, parentLocals);
-  
+
   // Merge locals
   if (locals) merge(options, locals);
 
@@ -202,7 +205,7 @@ function renderPartial(res, view, options, parentLocals, parent){
         options.lastInCollection = i == len - 1;
         object = val;
         buf += render();
-      }      
+      }
     } else {
       keys = Object.keys(collection);
       len = keys.length;
@@ -227,20 +230,20 @@ function renderPartial(res, view, options, parentLocals, parent){
 };
 
 /**
- * Render `view` partial with the given `options`. Optionally a 
+ * Render `view` partial with the given `options`. Optionally a
  * callback `fn(err, str)` may be passed instead of writing to
  * the socket.
  *
  * Options:
  *
- *   - `object` Single object with name derived from the view (unless `as` is present) 
+ *   - `object` Single object with name derived from the view (unless `as` is present)
  *
  *   - `as` Variable name for each `collection` value, defaults to the view name.
  *     * as: 'something' will add the `something` local variable
  *     * as: this will use the collection value as the template context
  *     * as: global will merge the collection value's properties with `locals`
  *
- *   - `collection` Array of objects, the name is derived from the view name itself. 
+ *   - `collection` Array of objects, the name is derived from the view name itself.
  *     For example _video.html_ will have a object _video_ available to it.
  *
  * @param  {String} view
@@ -294,7 +297,7 @@ res.partial = function(view, options, fn){
  * automatically, however otherwise a response of _200_ and _text/html_ is given.
  *
  * Options:
- *  
+ *
  *  - `scope`     Template evaluation context (the value of `this`)
  *  - `debug`     Output debugging information
  *  - `status`    Response status code
@@ -430,7 +433,7 @@ res._render = function(view, opts, fn, parent, sub){
   // partial return
   } else if (partial) {
     return str;
-  // render complete, and 
+  // render complete, and
   // callback given
   } else if (fn) {
     fn(null, str);
@@ -454,4 +457,4 @@ function hintAtViewPaths(view, options) {
     console.error('  - %s', path);
   });
   console.error();
-}
+}

data/server/node_modules/express/node_modules/connect/lib/connect.js

@@ -26,7 +26,7 @@ exports = module.exports = createServer;
  * Framework version.
  */
 
-exports.version = '1.7.1';
+exports.version = '1.8.5';
 
 /**
  * Initialize a new `connect.HTTPServer` with the middleware

data/server/node_modules/express/node_modules/connect/lib/http.js

@@ -163,10 +163,12 @@ Server.prototype.handle = function(req, res, out) {
 
         res.statusCode = 500;
         res.setHeader('Content-Type', 'text/plain');
+        if ('HEAD' == req.method) return res.end();
         res.end(msg);
       } else {
         res.statusCode = 404;
         res.setHeader('Content-Type', 'text/plain');
+        if ('HEAD' == req.method) return res.end();
         res.end('Cannot ' + req.method + ' ' + req.url);
       }
       return;

data/server/node_modules/express/node_modules/connect/lib/middleware/bodyParser.js

@@ -10,7 +10,8 @@
  * Module dependencies.
  */
 
-var qs = require('qs');
+var qs = require('qs')
+  , formidable = require('formidable');
 
 /**
  * Extract the mime type from the given request's
@@ -29,10 +30,9 @@ function mime(req) {
 /**
  * Parse request bodies.
  *
- * By default _application/json_ and _application/x-www-form-urlencoded_
- * are supported, however you may map `connect.bodyParser.parse[contentType]`
- * to a function of your choice to replace existing parsers, or implement
- * one for other content-types.
+ * By default _application/json_, _application/x-www-form-urlencoded_,
+ * and _multipart/form-data_ are supported, however you may map `connect.bodyParser.parse[contentType]`
+ * to a function receiving `(req, options, callback)`.
  *
  * Examples:
  *
@@ -43,36 +43,52 @@ function mime(req) {
  *        }
  *      );
  *
- * Since both _json_ and _x-www-form-urlencoded_ are supported by
- * default, either of the following requests would result in the response
- * of "viewing user tj".
- *
  *      $ curl -d 'user[name]=tj' http://localhost/
  *      $ curl -d '{"user":{"name":"tj"}}' -H "Content-Type: application/json" http://localhost/
  *
+ * Multipart req.files:
+ *
+ *   As a security measure files are stored in a separate object, stored
+ *   as `req.files`. This prevents attacks that may potentially alter
+ *   filenames, and depending on the application gain access to restricted files.
+ *
+ * Multipart configuration:
+ *
+ *  The `options` passed are provided to each parser function.
+ *  The _multipart/form-data_ parser merges these with formidable's
+ *  IncomingForm object, allowing you to tweak the upload directory,
+ *  size limits, etc. For example you may wish to retain the file extension
+ *  and change the upload directory:
+ *
+ *      server.use(bodyParser({ uploadDir: '/www/mysite.com/uploads' }));
+ *
+ *  View [node-formidable](https://github.com/felixge/node-formidable) for more information.
+ *
+ *  If you wish to use formidable directly within your app, and do not
+ *  desire this behaviour for multipart requests simply remove the
+ *  parser: 
+ *
+ *     delete connect.bodyParser.parse['multipart/form-data'];
+ *
+ *  Or
+ *
+ *     delete express.bodyParser.parse['multipart/form-data'];
+ *
+ * @param {Object} options
  * @return {Function}
  * @api public
  */
 
-exports = module.exports = function bodyParser(){
+exports = module.exports = function bodyParser(options){
+  options = options || {};
   return function bodyParser(req, res, next) {
+    if (req.body) return next();
+    req.body = {};
+
     if ('GET' == req.method || 'HEAD' == req.method) return next();
     var parser = exports.parse[mime(req)];
-    if (parser && !req.body) {
-      var data = '';
-      req.setEncoding('utf8');
-      req.on('data', function(chunk) { data += chunk; });
-      req.on('end', function(){
-        req.rawBody = data;
-        try {
-          req.body = data
-            ? parser(data)
-            : {};
-        } catch (err) {
-          return next(err);
-        }
-        next();
-      });
+    if (parser) {
+      parser(req, options, next);
     } else {
       next();
     }
@@ -80,13 +96,101 @@ exports = module.exports = function bodyParser(){
 };
 
 /**
- * Supported decoders.
+ * Parsers.
+ */
+
+exports.parse = {};
+
+/**
+ * Parse application/x-www-form-urlencoded.
+ */
+
+exports.parse['application/x-www-form-urlencoded'] = function(req, options, fn){
+  var buf = '';
+  req.setEncoding('utf8');
+  req.on('data', function(chunk){ buf += chunk });
+  req.on('end', function(){
+    try {
+      req.body = buf.length
+        ? qs.parse(buf)
+        : {};
+      fn();
+    } catch (err){
+      fn(err);
+    }
+  });
+};
+
+/**
+ * Parse application/json.
+ */
+
+exports.parse['application/json'] = function(req, options, fn){
+  var buf = '';
+  req.setEncoding('utf8');
+  req.on('data', function(chunk){ buf += chunk });
+  req.on('end', function(){
+    try {
+      req.body = buf.length
+        ? JSON.parse(buf)
+        : {};
+      fn();
+    } catch (err){
+      fn(err);
+    }
+  });
+};
+
+/**
+ * Parse multipart/form-data.
  *
- *  - application/x-www-form-urlencoded
- *  - application/json
+ * TODO: make multiple support optional
+ * TODO: revisit "error" flag if it's a formidable bug
  */
 
-exports.parse = {
-    'application/x-www-form-urlencoded': qs.parse
-  , 'application/json': JSON.parse
+exports.parse['multipart/form-data'] = function(req, options, fn){
+  var form = new formidable.IncomingForm
+    , data = {}
+    , files = {}
+    , done;
+
+  Object.keys(options).forEach(function(key){
+    form[key] = options[key];
+  });
+
+  function ondata(name, val, data){
+    if (Array.isArray(data[name])) {
+      data[name].push(val);
+    } else if (data[name]) {
+      data[name] = [data[name], val];
+    } else {
+      data[name] = val;
+    }
+  }
+
+  form.on('field', function(name, val){
+    ondata(name, val, data);
+  });
+
+  form.on('file', function(name, val){
+    ondata(name, val, files);
+  });
+
+  form.on('error', function(err){
+    fn(err);
+    done = true;
+  });
+
+  form.on('end', function(){
+    if (done) return;
+    try {
+      req.body = qs.parse(data);
+      req.files = qs.parse(files);
+      fn();
+    } catch (err) {
+      fn(err);
+    }
+  });
+
+  form.parse(req);
 };

data/server/node_modules/express/node_modules/connect/lib/middleware/limit.js

@@ -43,7 +43,11 @@ module.exports = function limit(bytes){
     req._limit = true;
 
     // limit by content-length
-    if (len && len > bytes) deny();
+    if (len && len > bytes) {
+      res.statusCode = 413;
+      res.end('Request Entity Too Large');
+      return;
+    }
 
     // limit
     req.on('data', function(chunk){

data/server/node_modules/express/node_modules/connect/lib/middleware/session.js

@@ -55,10 +55,10 @@ function defaultFingerprint(req) {
 };
 
 /**
- * Paths to ignore, defaulting to `/favicon.ico`.
+ * Paths to ignore.
  */
 
-exports.ignore = ['/favicon.ico'];
+exports.ignore = [];
 
 /**
  * Setup session store with the given `options`.

data/server/node_modules/express/node_modules/connect/lib/middleware/static.js

@@ -39,6 +39,7 @@ var fs = require('fs')
  *
  *    - `maxAge`   Browser cache maxAge in milliseconds. defaults to 0
  *    - `hidden`   Allow transfer of hidden files. defaults to false
+ *    - `redirect`   Redirect to trailing "/" when the pathname is a dir
  *
  * @param {String} root
  * @param {Object} options
@@ -101,6 +102,7 @@ var send = exports.send = function(req, res, next, options){
     , head = 'HEAD' == req.method
     , get = 'GET' == req.method
     , root = options.root ? normalize(options.root) : null
+    , redirect = false === options.redirect ? false : true
     , getOnly = options.getOnly
     , fn = options.callback
     , hidden = options.hidden
@@ -132,7 +134,7 @@ var send = exports.send = function(req, res, next, options){
     : utils.forbidden(res);
 
   // index.html support
-  if ('/' == path[path.length - 1]) path += 'index.html';
+  if (normalize('/') == path[path.length - 1]) path += 'index.html';
 
   // "hidden" file
   if (!hidden && '.' == basename(path)[0]) return next();
@@ -149,13 +151,34 @@ var send = exports.send = function(req, res, next, options){
         : next(err);
     // redirect directory in case index.html is present
     } else if (stat.isDirectory()) {
+      if (!redirect) return next();
       res.statusCode = 301;
       res.setHeader('Location', url.pathname + '/');
       res.end('Redirecting to ' + url.pathname + '/');
       return;
     }
 
+    // header fields
+    if (!res.getHeader('Date')) res.setHeader('Date', new Date().toUTCString());
+    if (!res.getHeader('Cache-Control')) res.setHeader('Cache-Control', 'public, max-age=' + (maxAge / 1000));
+    if (!res.getHeader('Last-Modified')) res.setHeader('Last-Modified', stat.mtime.toUTCString());
+    if (!res.getHeader('ETag')) res.setHeader('ETag', utils.etag(stat));
+    if (!res.getHeader('content-type')) {
+      var charset = mime.charsets.lookup(type);
+      res.setHeader('Content-Type', type + (charset ? '; charset=' + charset : ''));
+    }
+    res.setHeader('Accept-Ranges', 'bytes');
+
+    // conditional GET support
+    if (utils.conditionalGET(req)) {
+      if (!utils.modified(req, res)) {
+        req.emit('static');
+        return utils.notModified(res);
+      }
+    }
+
     var opts = {};
+    var chunkSize = stat.size;
 
     // we have a Range request
     if (ranges) {
@@ -166,6 +189,7 @@ var send = exports.send = function(req, res, next, options){
         // TODO: multiple support
         opts.start = ranges[0].start;
         opts.end = ranges[0].end;
+        chunkSize = opts.end - opts.start + 1;
         res.statusCode = 206;
         res.setHeader('Content-Range', 'bytes '
           + opts.start
@@ -179,27 +203,9 @@ var send = exports.send = function(req, res, next, options){
           ? fn(new Error('Requested Range Not Satisfiable'))
           : invalidRange(res);
       }
-    // stream the entire file
-    } else {
-      res.setHeader('Content-Length', stat.size);
-      if (!res.getHeader('Cache-Control')) res.setHeader('Cache-Control', 'public, max-age=' + (maxAge / 1000));
-      if (!res.getHeader('Last-Modified')) res.setHeader('Last-Modified', stat.mtime.toUTCString());
-      if (!res.getHeader('ETag')) res.setHeader('ETag', utils.etag(stat));
-
-      // conditional GET support
-      if (utils.conditionalGET(req)) {
-        if (!utils.modified(req, res)) {
-          return utils.notModified(res);
-        }
-      }
     }
 
-    // header fields
-    if (!res.getHeader('content-type')) {
-      var charset = mime.charsets.lookup(type);
-      res.setHeader('Content-Type', type + (charset ? '; charset=' + charset : ''));
-    }
-    res.setHeader('Accept-Ranges', 'bytes');
+    res.setHeader('Content-Length', chunkSize);
 
     // transfer
     if (head) return res.end();
@@ -213,7 +219,6 @@ var send = exports.send = function(req, res, next, options){
     if (fn) {
       function callback(err) { done || fn(err); done = true }
       req.on('close', callback);
-      req.socket.on('error', callback);
       stream.on('end', callback);
     }
   });