vulcan 0.2.5 → 0.3.0

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

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

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

@@ -12,7 +12,6 @@
 var http = require('http')
   , req = http.IncomingMessage.prototype
   , utils = require('./utils')
-  , parse = require('url').parse
   , mime = require('mime');
 
 /**
@@ -88,17 +87,6 @@ req.get = function(field, param){
   return RegExp.$1 || RegExp.$2;
 };
 
-/**
- * Short-hand for `require('url').parse(req.url).pathname`.
- *
- * @return {String}
- * @api public
- */
-
-req.__defineGetter__('path', function(){
-  return parse(this.url).pathname;
-});
-
 /**
  * Check if the _Accept_ header is present, and includes the given `type`.
  *
@@ -229,10 +217,10 @@ req.flash = function(type, msg){
       , args = arguments
       , formatters = this.app.flashFormatters || {};
     formatters.__proto__ = flashFormatters;
-    msg = utils.miniMarkdown(msg);
+    msg = utils.miniMarkdown(utils.escape(msg));
     msg = msg.replace(/%([a-zA-Z])/g, function(_, format){
       var formatter = formatters[format];
-      if (formatter) return formatter(utils.escape(args[i++]));
+      if (formatter) return formatter(args[i++]);
     });
     return (msgs[type] = msgs[type] || []).push(msg);
   } else if (type) {
@@ -292,18 +280,16 @@ req.flash = function(type, msg){
 req.is = function(type){
   var fn = this.app.is(type);
   if (fn) return fn(this);
-  var ct = this.headers['content-type'];
-  if (!ct) return false;
-  ct = ct.split(';')[0];
+  var contentType = this.headers['content-type'];
+  if (!contentType) return;
   if (!~type.indexOf('/')) type = mime.lookup(type);
   if (~type.indexOf('*')) {
-    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;
+    type = type.split('/')
+    contentType = contentType.split('/');
+    if ('*' == type[0] && type[1] == contentType[1]) return true;
+    if ('*' == type[1] && type[0] == contentType[0]) return true;
   }
-  return !! ~ct.indexOf(type);
+  return !! ~contentType.indexOf(type);
 };
 
 // Callback for isXMLHttpRequest / xhr

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

@@ -105,7 +105,7 @@ res.send = function(body, headers, status){
 
   // respond
   this.statusCode = status;
-  this.end('HEAD' == this.req.method ? null : body);
+  this.end('HEAD' == this.req.method ? undefined : body);
   return this;
 };
 
@@ -376,7 +376,6 @@ res.redirect = function(url, status){
     , req = this.req
     , base = app.set('basepath') || app.route
     , status = status || 302
-    , head = 'HEAD' == req.method
     , body;
 
   // Setup redirect map
@@ -419,7 +418,7 @@ res.redirect = function(url, status){
   // Respond
   this.statusCode = status;
   this.header('Location', url);
-  this.end(head ? null : body);
+  this.end(body);
 };
 
 /**

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

@@ -5,19 +5,6 @@
  * MIT Licensed
  */
 
-/**
- * Check if `path` looks absolute.
- *
- * @param {String} path
- * @return {Boolean}
- * @api private
- */
-
-exports.isAbsolute = function(path){
-  if ('/' == path[0]) return true;
-  if (':' == path[1] && '\\' == path[2]) return true;
-};
-
 /**
  * Merge object `b` with `a` giving precedence to
  * values in object `a`.

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

@@ -47,10 +47,7 @@ exports.register = View.register;
  */
 
 exports.compile = function(view, cache, cid, options){
-  if (cache && cid && cache[cid]){
-    options.filename = cache[cid].path;
-    return cache[cid];
-  }
+  if (cache && cid && cache[cid]) return cache[cid];
 
   // lookup
   view = exports.lookup(view, options);
@@ -61,13 +58,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;
 };
 
@@ -84,11 +81,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
@@ -164,7 +161,7 @@ function renderPartial(res, view, options, parentLocals, parent){
 
   // Inherit locals from parent
   union(options, parentLocals);
-
+  
   // Merge locals
   if (locals) merge(options, locals);
 
@@ -205,7 +202,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;
@@ -230,20 +227,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
@@ -297,7 +294,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
@@ -433,7 +430,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);
@@ -457,4 +454,4 @@ function hintAtViewPaths(view, options) {
     console.error('  - %s', path);
   });
   console.error();
-}
+}

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

@@ -10,7 +10,6 @@
  */
 
 var path = require('path')
-  , utils = require('../utils')
   , extname = path.extname
   , dirname = path.dirname
   , basename = path.basename
@@ -100,7 +99,7 @@ View.prototype.resolvePath = function(){
   // Implicit engine
   if (!~this.basename.indexOf('.')) path += this.extension;
   // Absolute
-  if (utils.isAbsolute(path)) return path;
+  if ('/' == path[0]) return path;
   // Relative to parent
   if (this.relative && this.parent) return this.parent.dirname + '/' + path;
   // Relative to root

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

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

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

@@ -163,12 +163,10 @@ 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,8 +10,7 @@
  * Module dependencies.
  */
 
-var qs = require('qs')
-  , formidable = require('formidable');
+var qs = require('qs');
 
 /**
  * Extract the mime type from the given request's
@@ -30,9 +29,10 @@ function mime(req) {
 /**
  * Parse request bodies.
  *
- * 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)`.
+ * 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.
  *
  * Examples:
  *
@@ -43,52 +43,36 @@ 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(options){
-  options = options || {};
+exports = module.exports = function bodyParser(){
   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) {
-      parser(req, options, next);
+    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();
+      });
     } else {
       next();
     }
@@ -96,101 +80,13 @@ exports = module.exports = function bodyParser(options){
 };
 
 /**
- * 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.
+ * Supported decoders.
  *
- * TODO: make multiple support optional
- * TODO: revisit "error" flag if it's a formidable bug
+ *  - application/x-www-form-urlencoded
+ *  - application/json
  */
 
-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);
+exports.parse = {
+    'application/x-www-form-urlencoded': qs.parse
+  , 'application/json': JSON.parse
 };