busboy
Advanced tools
Comparing version 0.0.7 to 0.0.8
@@ -8,3 +8,3 @@ // TODO: | ||
var ReadableStream = require('readable-stream'), | ||
var ReadableStream = require('stream').Readable || require('readable-stream'), | ||
Dicer = require('dicer'), | ||
@@ -41,5 +41,4 @@ inherits = require('util').inherits, | ||
var nfiles = 0, nfields = 0, nparts = 0, self = this; | ||
var nfiles = 0, nfields = 0, nparts = 0; | ||
this._finished = false; | ||
this._boy = boy; | ||
@@ -56,3 +55,3 @@ | ||
} | ||
part.once('header', function(header) { | ||
part.on('header', function(header) { | ||
var contype, fieldname, parsed, charset, encoding, filename, nsize = 0; | ||
@@ -93,3 +92,3 @@ | ||
if (contype === 'application/octet-stream' || filename !== undefined) { | ||
// file field | ||
// file/binary field | ||
if (nfiles === filesLimit) | ||
@@ -138,11 +137,10 @@ return; | ||
} | ||
boy.emit('field', fieldname, buffer, truncated); | ||
boy.emit('field', fieldname, buffer, truncated, false); | ||
}; | ||
} | ||
part.on('data', onData); | ||
part.once('end', onEnd); | ||
part.on('end', onEnd); | ||
}); | ||
}); | ||
this.parser.once('end', function() { | ||
self._finished = true; | ||
this.parser.on('end', function() { | ||
boy.emit('end'); | ||
@@ -156,9 +154,3 @@ }); | ||
Multipart.prototype.end = function() { | ||
this.parser.reset(); | ||
if (!this._finished) { | ||
this._finished = true; | ||
this._boy.emit('end'); | ||
} | ||
}; | ||
Multipart.prototype.end = function() {}; | ||
@@ -165,0 +157,0 @@ function FileStream() { |
{ "name": "busboy", | ||
"version": "0.0.7", | ||
"version": "0.0.8", | ||
"author": "Brian White <mscdex@mscdex.net>", | ||
@@ -4,0 +4,0 @@ "description": "A streaming parser for HTML form data for node.js", |
@@ -1,2 +0,1 @@ | ||
Description | ||
@@ -15,3 +14,3 @@ =========== | ||
Install | ||
============ | ||
======= | ||
@@ -40,3 +39,3 @@ npm install busboy | ||
}); | ||
file.once('end', function() { | ||
file.on('end', function() { | ||
console.log('File [' + fieldname +'] Finished'); | ||
@@ -48,3 +47,3 @@ }); | ||
}); | ||
busboy.once('end', function() { | ||
busboy.on('end', function() { | ||
console.log('Done parsing form!'); | ||
@@ -101,3 +100,3 @@ res.writeHead(303, { Connection: 'close', Location: '/' }); | ||
}); | ||
busboy.once('end', function() { | ||
busboy.on('end', function() { | ||
console.log('Done parsing form!'); | ||
@@ -115,6 +114,6 @@ done = true; | ||
var fstream = fs.createWriteStream(path.join(os.tmpDir(), path.basename(filename))); | ||
file.once('end', function() { | ||
file.on('end', function() { | ||
console.log(fieldname + '(' + filename + ') EOF'); | ||
}); | ||
fstream.once('close', function() { | ||
fstream.on('close', function() { | ||
console.log(fieldname + '(' + filename + ') written to disk'); | ||
@@ -144,3 +143,3 @@ next(); | ||
}); | ||
file.once('end', function() { | ||
file.on('end', function() { | ||
console.log('File [' + fieldname +'] Finished'); | ||
@@ -152,3 +151,3 @@ }); | ||
}); | ||
busboy.once('end', function() { | ||
busboy.on('end', function() { | ||
console.log('Done parsing form!'); | ||
@@ -192,3 +191,3 @@ res.writeHead(303, { Connection: 'close', Location: '/' }); | ||
_Busboy_ is a _WritableStream_ | ||
_Busboy_ is a _Writable_ stream | ||
@@ -195,0 +194,0 @@ Busboy (special) events |
var UrlEncoded = require('../lib/types/urlencoded'), | ||
parseParams = require('../lib/utils').parseParams; | ||
var EventEmitter = require('events').EventEmitter, | ||
var path = require('path'), | ||
EventEmitter = require('events').EventEmitter, | ||
inspect = require('util').inspect, | ||
assert = require('assert'); | ||
var group = path.basename(__filename, '.js') + '/'; | ||
var parsedConType; | ||
@@ -155,3 +158,3 @@ parsedConType = parseParams('application/x-www-form-urlencoded; charset=utf-8'); | ||
function makeMsg(what, msg) { | ||
return '[' + what + ']: ' + msg; | ||
return '[' + group + what + ']: ' + msg; | ||
} |
var Decoder = require('../lib/utils').Decoder; | ||
var assert = require('assert'); | ||
var path = require('path'), | ||
assert = require('assert'); | ||
var group = path.basename(__filename, '.js') + '/'; | ||
[ | ||
@@ -50,4 +55,4 @@ { source: ['Hello world'], | ||
}); | ||
var msg = '[' + v.what + ']: decoded string mismatch'; | ||
var msg = '[' + group + v.what + ']: decoded string mismatch'; | ||
assert.deepEqual(result, v.expected, msg); | ||
}); |
var parseParams = require('../lib/utils').parseParams; | ||
var assert = require('assert'); | ||
var path = require('path'), | ||
assert = require('assert'); | ||
var group = path.basename(__filename, '.js') + '/'; | ||
[ | ||
@@ -23,4 +27,4 @@ { source: 'text/plain; encoding=utf8', | ||
var result = parseParams(v.source), | ||
msg = '[' + v.what + ']: parsed parameters mismatch'; | ||
msg = '[' + group + v.what + ']: parsed parameters mismatch'; | ||
assert.deepEqual(result, v.expected, msg); | ||
}); |
655085
14
5038
221