Merge pull request #1 from perrin4869/master

Support stream encoding

README.md

@@ -34,9 +34,9 @@ stream.end()
 var toString = require('stream-to-string')
 ```
 
-### toString(stream [, cb])
+### toString(stream[, enc][, cb])
 
-Collects stream data into a string. Executes optional callback with `err, string`. Returns a promise.
+Collects stream data into a string. Accepts an optional encoding argument used when converting the stream. Executes optional callback with `err, string`. Returns a promise.
 
 ## testing
 

index.js

@@ -1,12 +1,17 @@
 var Promise = require('promise-polyfill')
 
-module.exports = function (stream, cb) {
+module.exports = function (stream, enc, cb) {
+    if (typeof enc === 'function') {
+        cb = enc;
+        enc = null;
+    }
     cb = cb || function () {}
+
     var str = ''
 
     return new Promise (function (resolve, reject) {
         stream.on('data', function (data) {
-            str += data.toString()
+            str += (typeof enc === 'string') ? data.toString(enc) : data.toString()
         })
         stream.on('end', function () {
             resolve(str)

test/enc.js

@@ -0,0 +1,14 @@
+var test     = require('tape'),
+    through2 = require('through2'),
+    toString = require('..')
+
+test('enc', function (t) {
+    t.plan(1)
+
+    var stream = through2()
+    toString(stream, 'hex', function (err, str) {
+        t.equal(str, '68656c6c6f20776f726c64', 'should match expected value')
+    })
+
+    stream.end('hello world')
+})