weaver · April 6, 2011 23:10 · Apr 7, 2011 · Apr 6, 2011 · Apr 6, 2011
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/app.js b/app.js
@@ -1,14 +1,14 @@
 var Express = require('express'),
-    MultiParser = require('./multiparser'),
+    Form = require('connect-form'),
+    Upload = require('./upload'),
     app = Express.createServer();
 
-app.use(MultiParser());
 app.use(Express.logger());
 app.use(Express.bodyParser());
+app.use(Form());
 app.use(Express.static(__dirname));
 
-app.post('/upload', function(req, res) {
-  console.log('uploaded', req.body);
+app.post('/upload', Upload.wait, function(req, res) {
   res.send(req.body, 200);
 });
 

diff --git a/multiparser.js b/multiparser.js
@@ -1,58 +0,0 @@
-// Example middleware for handling multipart forms. It should be
-// "used" by an app sometime before the bodyDecoder.
-//
-// var Express = require('express');
-// var MultiParser = require('./multiparser');
-//
-// var app = Express.createServer();
-// app.use(MultiParser());
-// app.use(Express.bodyDecoder());
-
-var Formidable = require('formidable');
-
-exports = module.exports = function bodyParser(opt) {
-  return function bodyParser(req, res, next) {
-    var parser = exports.parse[mime(req)];
-    if (parser && !req.body) {
-      parser(opt, req, res, next);
-    }
-    else {
-      next();
-    }
-  };
-};
-
-// Grab the general mime type from a request.
-function mime(req) {
-  var str = req.headers['content-type'] || '';
-  return str.split(';')[0];
-}
-
-function parseMultipart(opt, req, res, next) {
-  var form = new Formidable.IncomingForm();
-  form.parse(req, function(err, fields, files) {
-    if (err)
-      next(err);
-    else {
-      req.body = extend(fields, files);
-      next();
-    }
-  });
-}
-
-function extend(target) {
-  var key, obj;
-
-  for (var i = 1, l = arguments.length; i < l; i++) {
-    if ((obj = arguments[i])) {
-      for (key in obj)
-        target[key] = obj[key];
-    }
-  }
-
-  return target;
-}
-
-exports.parse = {
-  'multipart/form-data': parseMultipart
-};

diff --git a/package.json b/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "express-form-example",
+  "main": "./app.js",
+  "dependencies": {
+    "express": ">=1.0.0",
+    "connect-form": ">=0.2.1"
+  }
+}
diff --git a/upload.js b/upload.js
@@ -0,0 +1,30 @@
+exports.wait = wait;
+
+function wait(req, res, next) {
+  if (!req.form)
+    next();
+  else
+    req.form.complete(function(err, fields, files) {
+      if (err)
+        next(err);
+      else {
+        req.fields = fields;
+        req.files = files;
+        req.body = extend({}, fields, files);
+        next();
+      }
+    });
+}
+
+function extend(target) {
+  var key, obj;
+
+  for (var i = 1, l = arguments.length; i < l; i++) {
+    if ((obj = arguments[i])) {
+      for (key in obj)
+        target[key] = obj[key];
+    }
+  }
+
+  return target;
+}
diff --git a/app.js b/app.js
@@ -0,0 +1,16 @@
+var Express = require('express'),
+    MultiParser = require('./multiparser'),
+    app = Express.createServer();
+
+app.use(MultiParser());
+app.use(Express.logger());
+app.use(Express.bodyParser());
+app.use(Express.static(__dirname));
+
+app.post('/upload', function(req, res) {
+  console.log('uploaded', req.body);
+  res.send(req.body, 200);
+});
+
+app.listen(4000);
+console.log('http://localhost:4000/index.html');
diff --git a/index.html b/index.html
@@ -0,0 +1,5 @@
+<form method="post" action="/upload" enctype="multipart/form-data">
+  <p>Title: <input type="text" name="title" /></p>
+  <p>File: <input type="file" name="upload" /></p>
+  <p><input type="submit" value="Upload" /></p>
+</form>
diff --git a/multiparser.js b/multiparser.js
@@ -0,0 +1,58 @@
+// Example middleware for handling multipart forms. It should be
+// "used" by an app sometime before the bodyDecoder.
+//
+// var Express = require('express');
+// var MultiParser = require('./multiparser');
+//
+// var app = Express.createServer();
+// app.use(MultiParser());
+// app.use(Express.bodyDecoder());
+
+var Formidable = require('formidable');
+
+exports = module.exports = function bodyParser(opt) {
+  return function bodyParser(req, res, next) {
+    var parser = exports.parse[mime(req)];
+    if (parser && !req.body) {
+      parser(opt, req, res, next);
+    }
+    else {
+      next();
+    }
+  };
+};
+
+// Grab the general mime type from a request.
+function mime(req) {
+  var str = req.headers['content-type'] || '';
+  return str.split(';')[0];
+}
+
+function parseMultipart(opt, req, res, next) {
+  var form = new Formidable.IncomingForm();
+  form.parse(req, function(err, fields, files) {
+    if (err)
+      next(err);
+    else {
+      req.body = extend(fields, files);
+      next();
+    }
+  });
+}
+
+function extend(target) {
+  var key, obj;
+
+  for (var i = 1, l = arguments.length; i < l; i++) {
+    if ((obj = arguments[i])) {
+      for (key in obj)
+        target[key] = obj[key];
+    }
+  }
+
+  return target;
+}
+
+exports.parse = {
+  'multipart/form-data': parseMultipart
+};