vulcan 0.3.0 → 0.4.0

data/server/node_modules/express/node_modules/mkdirp/test/race.js

@@ -0,0 +1,41 @@
+var mkdirp = require('../').mkdirp;
+var path = require('path');
+var fs = require('fs');
+var test = require('tap').test;
+
+test('race', function (t) {
+    t.plan(4);
+    var ps = [ '', 'tmp' ];
+    
+    for (var i = 0; i < 25; i++) {
+        var dir = Math.floor(Math.random() * Math.pow(16,4)).toString(16);
+        ps.push(dir);
+    }
+    var file = ps.join('/');
+    
+    var res = 2;
+    mk(file, function () {
+        if (--res === 0) t.end();
+    });
+    
+    mk(file, function () {
+        if (--res === 0) t.end();
+    });
+    
+    function mk (file, cb) {
+        mkdirp(file, 0755, function (err) {
+            if (err) t.fail(err);
+            else path.exists(file, function (ex) {
+                if (!ex) t.fail('file not created')
+                else fs.stat(file, function (err, stat) {
+                    if (err) t.fail(err)
+                    else {
+                        t.equal(stat.mode & 0777, 0755);
+                        t.ok(stat.isDirectory(), 'target not a directory');
+                        if (cb) cb();
+                    }
+                })
+            })
+        });
+    }
+});

data/server/node_modules/express/node_modules/mkdirp/test/rel.js

@@ -0,0 +1,32 @@
+var mkdirp = require('../');
+var path = require('path');
+var fs = require('fs');
+var test = require('tap').test;
+
+test('rel', function (t) {
+    t.plan(2);
+    var x = Math.floor(Math.random() * Math.pow(16,4)).toString(16);
+    var y = Math.floor(Math.random() * Math.pow(16,4)).toString(16);
+    var z = Math.floor(Math.random() * Math.pow(16,4)).toString(16);
+    
+    var cwd = process.cwd();
+    process.chdir('/tmp');
+    
+    var file = [x,y,z].join('/');
+    
+    mkdirp(file, 0755, function (err) {
+        if (err) t.fail(err);
+        else path.exists(file, function (ex) {
+            if (!ex) t.fail('file not created')
+            else fs.stat(file, function (err, stat) {
+                if (err) t.fail(err)
+                else {
+                    process.chdir(cwd);
+                    t.equal(stat.mode & 0777, 0755);
+                    t.ok(stat.isDirectory(), 'target not a directory');
+                    t.end();
+                }
+            })
+        })
+    });
+});

data/server/node_modules/express/node_modules/qs/History.md

@@ -1,4 +1,15 @@
 
+0.4.0 / 2011-11-21 
+==================
+
+  * Allow parsing of an existing object (for `bodyParser()`) [jackyz]
+  * Replaced expresso with mocha
+
+0.3.2 / 2011-11-08 
+==================
+
+  * Fixed global variable leak
+
 0.3.1 / 2011-08-17 
 ==================
 

data/server/node_modules/express/node_modules/qs/Makefile

@@ -1,7 +1,5 @@
 
 test:
-	@./support/expresso/bin/expresso \
-		-I support \
-		-I lib
+	@./node_modules/.bin/mocha
 
 .PHONY: test

data/server/node_modules/express/node_modules/qs/Readme.md

@@ -6,7 +6,6 @@
 
     $ npm install qs
 
-
 ## Examples
 
     require('qs').parse('user[name][first]=tj&user[email]=tj');
@@ -14,10 +13,9 @@
 
 ## Testing
 
-Update git submodules:
+Install dev dependencies:
 
-    $ git submodule init
-    $ git submodule update
+    $ npm install -d
 
 and execute:
 

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

@@ -1,3 +1,4 @@
+
 /*!
  * querystring
  * Copyright(c) 2010 TJ Holowaychuk <tj@vision-media.ca>
@@ -8,7 +9,7 @@
  * Library version.
  */
 
-exports.version = '0.3.1';
+exports.version = '0.4.0';
 
 /**
  * Object#toString() ref for stringify().
@@ -22,29 +23,95 @@ var toString = Object.prototype.toString;
 
 var notint = /[^0-9]/;
 
+function promote(parent, key) {
+  if (parent[key].length == 0) return parent[key] = {};
+  var t = {};
+  for (var i in parent[key]) t[i] = parent[key][i];
+  parent[key] = t;
+  return t;
+}
+
+function parse(parts, parent, key, val) {
+  var part = parts.shift();
+  // end
+  if (!part) {
+    if (Array.isArray(parent[key])) {
+      parent[key].push(val);
+    } else if ('object' == typeof parent[key]) {
+      parent[key] = val;
+    } else if ('undefined' == typeof parent[key]) {
+      parent[key] = val;
+    } else {
+      parent[key] = [parent[key], val];
+    }
+    // array
+  } else {
+    var obj = parent[key] = parent[key] || [];
+    if (']' == part) {
+      if (Array.isArray(obj)) {
+        if ('' != val) obj.push(val);
+      } else if ('object' == typeof obj) {
+        obj[Object.keys(obj).length] = val;
+      } else {
+        obj = parent[key] = [parent[key], val];
+      }
+      // prop
+    } else if (~part.indexOf(']')) {
+      part = part.substr(0, part.length - 1);
+      if(notint.test(part) && Array.isArray(obj)) obj = promote(parent, key);
+      parse(parts, obj, part, val);
+      // key
+    } else {
+      if(notint.test(part) && Array.isArray(obj)) obj = promote(parent, key);
+      parse(parts, obj, part, val);
+    }
+  }
+}
+
 /**
- * Parse the given query `str`, returning an object.
- *
- * @param {String} str
- * @return {Object}
- * @api public
+ * Merge parent key/val pair.
  */
 
-exports.parse = function(str){
-  if (null == str || '' == str) return {};
-
-  function promote(parent, key) {
-    if (parent[key].length == 0) return parent[key] = {};
-    var t = {};
-    for (var i in parent[key]) t[i] = parent[key][i];
-    parent[key] = t;
-    return t;
+function merge(parent, key, val){
+  if (~key.indexOf(']')) {
+    var parts = key.split('[')
+      , len = parts.length
+      , last = len - 1;
+    parse(parts, parent, 'base', val);
+    // optimize
+  } else {
+    if (notint.test(key) && Array.isArray(parent.base)) {
+      var t = {};
+      for (var k in parent.base) t[k] = parent.base[k];
+      parent.base = t;
+    }
+    set(parent.base, key, val);
   }
 
+  return parent;
+}
+
+/**
+ * Parse the given obj.
+ */
+
+function parseObject(obj){
+  var ret = { base: {} };
+  Object.keys(obj).forEach(function(name){
+    merge(ret, name, obj[name]);
+  });
+  return ret.base;
+}
+
+/**
+ * Parse the given str.
+ */
+
+function parseString(str){
   return String(str)
     .split('&')
     .reduce(function(ret, pair){
-      try{ 
+      try{
         pair = decodeURIComponent(pair.replace(/\+/g, ' '));
       } catch(e) {
         // ignore
@@ -54,69 +121,28 @@ exports.parse = function(str){
         , brace = lastBraceInKey(pair)
         , key = pair.substr(0, brace || eql)
         , val = pair.substr(brace || eql, pair.length)
-        , val = val.substr(val.indexOf('=') + 1, val.length)
-        , parent = ret;
+        , val = val.substr(val.indexOf('=') + 1, val.length);
 
       // ?foo
       if ('' == key) key = pair, val = '';
 
-      // nested
-      if (~key.indexOf(']')) {
-        var parts = key.split('[')
-          , len = parts.length
-          , last = len - 1;
-
-        function parse(parts, parent, key) {
-          var part = parts.shift();
-
-          // end
-          if (!part) {
-            if (Array.isArray(parent[key])) {
-              parent[key].push(val);
-            } else if ('object' == typeof parent[key]) {
-              parent[key] = val;
-            } else if ('undefined' == typeof parent[key]) {
-              parent[key] = val;
-            } else {
-              parent[key] = [parent[key], val];
-            }
-          // array
-          } else {
-            obj = parent[key] = parent[key] || [];
-            if (']' == part) {
-              if (Array.isArray(obj)) {
-                if ('' != val) obj.push(val);
-              } else if ('object' == typeof obj) {
-                obj[Object.keys(obj).length] = val;
-              } else {
-                obj = parent[key] = [parent[key], val];
-              }
-            // prop
-            } else if (~part.indexOf(']')) {
-              part = part.substr(0, part.length - 1);
-              if(notint.test(part) && Array.isArray(obj)) obj = promote(parent, key);
-              parse(parts, obj, part);
-            // key
-            } else {
-              if(notint.test(part) && Array.isArray(obj)) obj = promote(parent, key);
-              parse(parts, obj, part);
-            }
-          }
-        }
-
-        parse(parts, parent, 'base');
-      // optimize
-      } else {
-        if (notint.test(key) && Array.isArray(parent.base)) {
-          var t = {};
-          for(var k in parent.base) t[k] = parent.base[k];
-          parent.base = t;
-        }
-        set(parent.base, key, val);
-      }
+      return merge(ret, key, val);
+    }, { base: {} }).base;
+}
 
-      return ret;
-    }, {base: {}}).base;
+/**
+ * Parse the given query `str` or `obj`, returning an object.
+ *
+ * @param {String} str | {Object} obj
+ * @return {Object}
+ * @api public
+ */
+
+exports.parse = function(str){
+  if (null == str || '' == str) return {};
+  return 'object' == typeof str
+    ? parseObject(str)
+    : parseString(str);
 };
 
 /**

data/server/node_modules/express/node_modules/qs/package.json

@@ -1,8 +1,15 @@
 {
   "name": "qs",
   "description": "querystring parser",
-  "version": "0.3.1",
-  "repository": {},
+  "version": "0.4.0",
+  "repository": {
+    "type" : "git",
+    "url" : "git://github.com/visionmedia/node-querystring.git"
+  },
+  "devDependencies": {
+      "mocha": "*"
+    , "should": "*"
+  },
   "author": "TJ Holowaychuk <tj@vision-media.ca> (http://tjholowaychuk.com)",
   "main": "index",
   "engines": { "node": "*" }

data/server/node_modules/express/node_modules/qs/test/mocha.opts

@@ -0,0 +1,2 @@
+--require should
+--ui exports

data/server/node_modules/express/node_modules/qs/test/{parse.test.js → parse.js}

@@ -3,8 +3,7 @@
  * Module dependencies.
  */
 
-var qs = require('../')
-  , should = require('should');
+var qs = require('../');
 
 module.exports = {
   'test basics': function(){

data/server/node_modules/express/package.json

@@ -1,7 +1,7 @@
 {
   "name": "express",
   "description": "Sinatra inspired web development framework",
-  "version": "2.4.6",
+  "version": "2.5.6",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "contributors": [ 
     { "name": "TJ Holowaychuk", "email": "tj@vision-media.ca" }, 
@@ -10,18 +10,19 @@
     { "name": "Guillermo Rauch", "email": "rauchg@gmail.com" }
   ],
   "dependencies": {
-    "connect": ">= 1.5.2 < 2.0.0",
+    "connect": "1.x",
     "mime": ">= 0.0.1",
-    "qs": ">= 0.3.1"
+    "qs": ">= 0.3.1",
+    "mkdirp": "0.0.7"
   },
   "devDependencies": {
     "connect-form": "0.2.1",
     "ejs": "0.4.2",
-    "expresso": "0.7.2",
-    "hamljs": "0.5.1",
-    "jade": "0.11.0",
+    "expresso": "0.9.2",
+    "hamljs": "0.6.x",
+    "jade": "0.16.2",
     "stylus": "0.13.0",
-    "should": "0.2.1",
+    "should": "0.3.2",
     "express-messages": "0.0.2",
     "node-markdown": ">= 0.0.1",
     "connect-redis": ">= 0.0.1"
@@ -34,5 +35,5 @@
     "test": "make test",
     "prepublish" : "npm prune"
   },
-  "engines": { "node": ">= 0.4.1 < 0.5.0" }
+  "engines": { "node": ">= 0.4.1 < 0.7.0" }
 }

data/server/node_modules/express/testing/foo/app.js

@@ -0,0 +1,35 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('express')
+  , routes = require('./routes')
+
+var app = module.exports = express.createServer();
+
+// Configuration
+
+app.configure(function(){
+  app.set('views', __dirname + '/views');
+  app.set('view engine', 'jade');
+  app.use(express.bodyParser());
+  app.use(express.methodOverride());
+  app.use(app.router);
+  app.use(express.static(__dirname + '/public'));
+});
+
+app.configure('development', function(){
+  app.use(express.errorHandler({ dumpExceptions: true, showStack: true })); 
+});
+
+app.configure('production', function(){
+  app.use(express.errorHandler()); 
+});
+
+// Routes
+
+app.get('/', routes.index);
+
+app.listen(3000);
+console.log("Express server listening on port %d in %s mode", app.address().port, app.settings.env);

data/server/node_modules/express/testing/foo/package.json

@@ -0,0 +1,9 @@
+{
+    "name": "application-name"
+  , "version": "0.0.1"
+  , "private": true
+  , "dependencies": {
+      "express": "2.5.0"
+    , "jade": ">= 0.0.1"
+  }
+}

data/server/node_modules/express/testing/foo/public/stylesheets/style.css

@@ -0,0 +1,8 @@
+body {
+  padding: 50px;
+  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
+}
+
+a {
+  color: #00B7FF;
+}

data/server/node_modules/express/testing/foo/routes/index.js

@@ -0,0 +1,10 @@
+
+/*
+ * GET home page.
+ */
+
+exports.index = function(req, res){
+  res.writeHead(200);
+  req.doesnotexist();
+  // res.render('index', { title: 'Express' })
+};

data/server/node_modules/express/testing/foo/views/index.jade

@@ -0,0 +1,2 @@
+h1= title
+p Welcome to #{title}

data/server/node_modules/express/testing/foo/views/layout.jade

@@ -0,0 +1,6 @@
+!!!
+html
+  head
+    title= title
+    link(rel='stylesheet', href='/stylesheets/style.css')
+  body!= body

data/server/node_modules/express/testing/index.js

@@ -0,0 +1,43 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('../')
+  , http = require('http')
+  , connect = require('connect');
+
+var app = express.createServer();
+
+app.get('/', function(req, res){
+  req.foo();
+  res.send('test');
+});
+
+// app.set('views', __dirname + '/views');
+// app.set('view engine', 'jade');
+// 
+// app.configure(function(){
+//   app.use(function(req, res, next){
+//     debugger
+//     res.write('first');
+//     console.error('first');
+//     next();
+//   });
+// 
+//   app.use(app.router);
+// 
+//   app.use(function(req, res, next){
+//     console.error('last');
+//     res.end('last');
+//   });
+// });
+// 
+// app.get('/', function(req, res, next){
+//   console.error('middle');
+//   res.write(' route ');
+//   next();
+// });
+
+app.listen(3000);
+console.log('listening on port 3000');