Merge pull request #11 from aju/master

Use map-stream to transform streams - code refactor

lib/forkStdout.js

@@ -5,6 +5,7 @@ var os = require("os");
 var util = require("util");
 var ForkStream = require("fork-stream");
 var Linerstream = require("linerstream");
+var mapStream = require('map-stream');
 
 var messageToNode = "message to node: ";
 
@@ -21,6 +22,9 @@ function forkStdout(stdout) {
     var phridgeEndpoint;
     var cleanStdoutEndpoint;
 
+    // We know that phantomjs messages to node are not binary
+    stdout.setEncoding("utf8");
+
     fork = new ForkStream({
         classifier: function (chunk, done) {
             chunk = chunk
@@ -34,50 +38,20 @@ function forkStdout(stdout) {
         .pipe(new Linerstream())
         .pipe(fork);
 
-    fork.a.pipe(phridgeEndpoint = new CropPhridgePrefix());
-    fork.b.pipe(cleanStdoutEndpoint = new RestoreLineBreaks());
+    // Removes the 'message to node: '-prefix from every chunk.
+    phridgeEndpoint = fork.a.pipe(mapStream(function(data, cb){
+        cb(null, data.slice(messageToNode.length));
+    }));
 
-    // We know that phantomjs messages to node are not binary
-    phridgeEndpoint.setEncoding("utf8");
+    // We need to restore EOL-character in stdout stream
+    cleanStdoutEndpoint = fork.b.pipe(mapStream(function(data, cb){
+        cb(null, data + os.EOL);
+    }));
 
     return {
         phridge: phridgeEndpoint,
         cleanStdout: cleanStdoutEndpoint
     };
 }
 
-/**
- * Appends an EOL-character to every chunk.
- *
- * @param options
- * @constructor
- * @private
- */
-function RestoreLineBreaks(options) {
-    Transform.call(this, options);
-}
-util.inherits(RestoreLineBreaks, Transform);
-
-RestoreLineBreaks.prototype._transform = function (chunk, enc, cb) {
-    this.push(chunk + os.EOL);
-    cb();
-};
-
-/**
- * Removes the 'message to node: '-prefix from every chunk.
- *
- * @param options
- * @constructor
- * @private
- */
-function CropPhridgePrefix(options) {
-    Transform.call(this, options);
-}
-util.inherits(CropPhridgePrefix, Transform);
-
-CropPhridgePrefix.prototype._transform = function (chunk, enc, cb) {
-    this.push(chunk.slice(messageToNode.length));
-    cb();
-};
-
 module.exports = forkStdout;

package.json

@@ -22,7 +22,8 @@
     "linerstream": "git://github.com/jhnns/linerstream.git#fix/on-windows",
     "phantomjs": "^1.9.7-15",
     "temp": "^0.8.0",
-    "when": "^3.4.2"
+    "when": "^3.4.2",
+    "map-stream": "^0.1.0"
   },
   "devDependencies": {
     "chai": "^1.9.1",