#29 Added custom filename and content-type options to support identity-less streams.

alexindigo · alexindigo · commit adf8b4a41530 · 2013-04-20T21:27:26.000-07:00
diff --git a/lib/form_data.js b/lib/form_data.js
@@ -118,11 +118,12 @@ FormData.prototype._multiPartHeader = function(field, value, options) {
       'Content-Disposition: form-data; name="' + field + '"';
 
     // fs- and request- streams have path property
+    // or use custom filename and/or contentType
     // TODO: Use request's response mime-type
-    if (value.path) {
+    if (options.filename || value.path) {
       header +=
-        '; filename="' + path.basename(value.path) + '"' + FormData.LINE_BREAK +
-        'Content-Type: ' + mime.lookup(value.path);
+        '; filename="' + path.basename(options.filename || value.path) + '"' + FormData.LINE_BREAK +
+        'Content-Type: ' +  (options.contentType || mime.lookup(options.filename || value.path));
 
     // http response has not
     } else if (value.readable && value.hasOwnProperty('httpVersion')) {
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "author": "Felix Geisendörfer <felix@debuggable.com> (http://debuggable.com/)",
   "name": "form-data",
   "description": "A module to create readable `\"multipart/form-data\"` streams.  Can be used to submit forms and file uploads to other web applications.",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "repository": {
     "type": "git",
     "url": "git://github.com/felixge/node-form-data.git"
@@ -19,7 +19,7 @@
   "devDependencies": {
     "fake": "0.2.1",
     "far": "0.0.1",
-    "formidable": "1.0.2",
+    "formidable": "~1.0.13",
     "request": "~2.9.203"
   }
 }
diff --git a/test/integration/test-custom-filename.js b/test/integration/test-custom-filename.js
@@ -0,0 +1,53 @@
+/*
+test custom filename and content-type:
+re: https://github.com/felixge/node-form-data/issues/29
+*/
+
+var common       = require('../common');
+var assert       = common.assert;
+var http         = require('http');
+var fs           = require('fs');
+
+var FormData     = require(common.dir.lib + '/form_data');
+var IncomingForm = require('formidable').IncomingForm;
+
+var options = {
+  filename: 'test.png',
+  contentType: 'image/gif'
+};
+
+var server = http.createServer(function(req, res) {
+
+  var form = new IncomingForm();
+  form.uploadDir = common.dir.tmp;
+
+  form.parse(req);
+
+  form
+    .on('file', function(name, file) {
+      assert.strictEqual(name, 'my_file');
+      assert.strictEqual(file.name, options.filename);
+      assert.strictEqual(file.type, options.contentType);
+    })
+    .on('end', function() {
+      res.writeHead(200);
+      res.end('done');
+    });
+});
+
+
+server.listen(common.port, function() {
+  var form = new FormData();
+
+  form.append('my_file', fs.createReadStream(common.dir.fixture + '/unicycle.jpg'), options);
+
+  form.submit('http://localhost:' + common.port + '/', function(err, res) {
+    if (err) {
+      throw err;
+    }
+
+    assert.strictEqual(res.statusCode, 200);
+    server.close();
+  });
+
+});
diff --git a/test/tmp/.empty b/test/tmp/.empty
