Merge pull request #27 from parshap/infer-string-fix

Correctly infer string encoding from empty string

index.js

@@ -42,8 +42,7 @@ ConcatStream.prototype._write = function(chunk, enc, next) {
 }
 
 ConcatStream.prototype.inferEncoding = function (buff) {
-  var firstBuffer = buff || this.body[0]
-  if (!firstBuffer) return 'buffer'
+  var firstBuffer = buff === undefined ? this.body[0] : buff;
   if (Buffer.isBuffer(firstBuffer)) return 'buffer'
   if (typeof Uint8Array !== 'undefined' && firstBuffer instanceof Uint8Array) return 'uint8array'
   if (Array.isArray(firstBuffer)) return 'array'

test/infer.js

@@ -8,7 +8,8 @@ test('type inference works as expected', function(t) {
   t.equal(stream.inferEncoding(undefined), 'buffer', 'buffer')
   t.equal(stream.inferEncoding(new Uint8Array(1)), 'uint8array', 'uint8array')
   t.equal(stream.inferEncoding('hello'), 'string', 'string')
+  t.equal(stream.inferEncoding(''), 'string', 'string')
   t.equal(stream.inferEncoding({hello: "world"}), 'object', 'object')
   t.equal(stream.inferEncoding(1), 'buffer', 'buffer')
   t.end()
-})
+})

test/string.js

@@ -62,3 +62,15 @@ test('string from buffers with multibyte characters', function (t) {
   }
   strings.end()
 })
+
+test('string infer encoding with empty string chunk', function (t) {
+  t.plan(2)
+  var strings = concat(function(out) {
+    t.equal(typeof out, 'string')
+    t.equal(out, 'nacho dogs')
+  })
+  strings.write("")
+  strings.write("nacho ")
+  strings.write("dogs")
+  strings.end()
+})