Got initial test to pass

felixge · felixge · commit 9a59d08c0244 · 2011-05-28T17:25:07.000+02:00
Submitting a form with a string, buffer and file stream
diff --git a/Readme.md b/Readme.md
@@ -37,7 +37,7 @@ var request = http.request({
   method: 'post',
   host: 'example.org',
   path: '/upload',
-  headers: {'Content-Type': 'multipart/form-data'}
+  headers: form.getHeaders()
 });
 
 form.pipe(request);
diff --git a/lib/form_data.js b/lib/form_data.js
@@ -1,105 +1,79 @@
-var http = require('http');
-var oop = require('oop');
-var Stream = require('stream').Stream;
+var CombinedStream = require('combined-stream');
+var util = require('util');
+var path = require('path');
+var mime = require('mime');
 
 module.exports = FormData;
-oop.extend(FormData, Stream);
-var formData = FormData.prototype;
-
 function FormData() {
-  Stream.call(this);
-
-  this.readable = true;
-  this.paused = true;
-
-  this._parts = [];
-  this._streamPart = null;
-
-  this._boundary = null;
-  this._partBegin = null;
+  CombinedStream.call(this);
 }
+util.inherits(FormData, CombinedStream);
 
-formData._init = function() {
-  // This generates a 50 character boundary similar to those used by Firefox.
-  // They are optimized for boyer-moore parsing.
-  var boundary = '--------------------------';
-  for (var i = 0; i < 24; i++) {
-    boundary += Math.floor(Math.random() * 10).toString(16);
-  }
+FormData.prototype.append = function(field, value) {
+  var parentAppend = CombinedStream.prototype.append;
 
-  this._partBegin = new Buffer('--' + boundary + '\r\n');
-  this._boundary = boundary;
+  parentAppend.call(this, this._multiPartHeader.bind(this, field, value));
+  parentAppend.call(this, value);
+  parentAppend.call(this, this._multiPartFooter.bind(this, field, value));
 };
 
-formData.getBoundary = function() {
-  if (!this._boundary) {
-    this._init();
+FormData.prototype._multiPartHeader = function(field, value, next) {
+  var boundary = this.getBoundary();
+
+  var header =
+    '--' + boundary
+    + '\r\n'
+    + 'Content-Disposition: form-data; name="' + field + '"';
+
+  if (value.path) {
+    header +=
+      '; filename="' + path.basename(value.path) + '"\r\n'
+      + 'Content-Type: ' + mime.lookup(value.path);
   }
 
-  return this._boundary;
-};
+  header += '\r\n\r\n';
 
-formData.append = function(name, value) {
-  this._parts.push({
-    name: name,
-    value: value,
-  });
+  next(header);
 };
 
-formData.pipe = function(destination) {
-  var r = Stream.prototype.pipe.call(this, destination);
-  this.resume();
-  return r;
-};
+FormData.prototype._multiPartFooter = function(field, value, next) {
+  var footer = '\r\n';
 
-formData.resume = function() {
-  if (!this._boundary) {
-    this._init();
+  var lastPart = (this._streams.length === 0);
+  if (lastPart) {
+    footer += '--' + this.getBoundary() + '--';
   }
 
-  this.paused = false;
-  process.nextTick(this._emitData.bind(this));
+  next(footer);
 };
 
-formData.pause = function() {
-  this.paused = true;
-  //if (this._streamPart) {
-    //this._streamPart.pause();
-  //}
-};
+FormData.prototype.getHeaders = function(userHeaders) {
+  var formHeaders = {
+    'content-type': 'multipart/form-data; boundary=' + this.getBoundary(),
+  };
 
-formData._emitData = function() {
-  if (this.paused) {
-    return;
+  for (var header in userHeaders) {
+    formHeaders[header.toLowerCase()] = userHeaders[header];
   }
 
-  var part = this._parts.shift();
-  if (!part) {
-    return;
-  }
+  return formHeaders;
+}
 
-  if (part.value instanceof Stream) {
-    this._emitStreamPart(part);
-  } else {
-    this._emitRegularPart(part);
+FormData.prototype.getBoundary = function() {
+  if (!this._boundary) {
+    this._generateBoundary();
   }
-};
-
-formData._emitRegularPart = function(part) {
-  var header = 'Content-Disposition: form-data; name="' + part.name + '"';
-  header += '\r\n\r\n';
 
-  this.emit('data', this._partBegin);
-  this.emit('data', new Buffer(header + part.value + '\r\n', 'utf8'));
+  return this._boundary;
+};
 
-  if (this._parts.length === 0) {
-    this._emitEndBoundary();
-    this.readable = false;
-  } else {
-    this._emitData();
+FormData.prototype._generateBoundary = function() {
+  // This generates a 50 character boundary similar to those used by Firefox.
+  // They are optimized for boyer-moore parsing.
+  var boundary = '--------------------------';
+  for (var i = 0; i < 24; i++) {
+    boundary += Math.floor(Math.random() * 10).toString(16);
   }
-};
 
-formData._emitEndBoundary = function() {
-  this.emit('data', new Buffer('--' + this._boundary + '--\r\n'));
+  this._boundary = boundary;
 };
diff --git a/test/fixture/unicycle.jpg b/test/fixture/unicycle.jpg
diff --git a/test/integration/test-pipe.js b/test/integration/test-pipe.js
@@ -1,23 +1,34 @@
 var common = require('../common');
 var assert = common.assert;
 var http = require('http');
+var path = require('path');
+var mime = require('mime');
+var fs = require('fs');
 var FormData = require(common.dir.lib + '/form_data');
 var IncomingForm = require('formidable').IncomingForm;
 
 var FIELDS = [
   {name: 'my_field', value: 'my_value'},
   {name: 'my_buffer', value: new Buffer([1, 2, 3])},
+  {name: 'my_file', value: fs.createReadStream(common.dir.fixture + '/unicycle.jpg')},
 ];
 
 var server = http.createServer(function(req, res) {
   var form = new IncomingForm();
+  form.uploadDir = common.dir.tmp;
   form.parse(req);
   form
     .on('field', function(name, value) {
       var field = FIELDS.shift();
       assert.strictEqual(name, field.name);
       assert.strictEqual(value, field.value+'');
     })
+    .on('file', function(name, file) {
+      var field = FIELDS.shift();
+      assert.strictEqual(name, field.name);
+      assert.strictEqual(file.name, path.basename(field.value.path));
+      assert.strictEqual(file.type, mime.lookup(file.name));
+    })
     .on('end', function() {
       res.writeHead(200);
       res.end('done');
@@ -36,18 +47,16 @@ server.listen(common.port, function() {
     method: 'post',
     port: common.port,
     path: '/upload',
-    headers: {
-      'Content-Type': 'multipart/form-data; boundary=' + form.getBoundary(),
-    }
+    headers: form.getHeaders()
   });
 
   form.pipe(request);
-  form.on('data', function(chunk) {
-    //process.stderr.write(chunk+'');
-  });
 
   request.on('response', function(res) {
     server.close();
   });
 });
 
+process.on('exit', function() {
+  assert.strictEqual(FIELDS.length, 0);
+});
