Merge pull request #30 from shinnn/readable-stream

Use readable-stream v2 instead of through2 v0.6

Author: VFK

Diff for: lib/common.js

@@ -56,13 +56,6 @@ module.exports = {
         return tasks;
     },
 
-    extend: function (source, dest) {
-        Object.keys(dest).forEach(function (key) {
-            source[key] = dest[key];
-        });
-        return source;
-    },
-
     regexMatchAll: function (string, regexp) {
         var matches = [];
         string.replace(regexp, function () {
@@ -71,4 +64,4 @@ module.exports = {
         });
         return matches;
     }
-};
+};

Diff for: lib/index.js

@@ -1,8 +1,9 @@
 'use strict';
 
-var Parser = require('./parser');
-var through = require('through2');
 var common = require('./common');
+var objectAssign = require('object-assign');
+var Parser = require('./parser');
+var Transform = require('readable-stream/transform');
 
 module.exports = function (options, userConfig) {
     var tasks = common.parseTasks(options);
@@ -16,35 +17,34 @@ module.exports = function (options, userConfig) {
     if (typeof userConfig === 'boolean') {
         config.keepUnassigned = userConfig;
     } else if (typeof userConfig === 'object') {
-        config = common.extend(config, userConfig);
+        objectAssign(config, userConfig);
     }
 
-    return through.obj(function (file, enc, callback) {
-        var parser = new Parser(tasks, config, file);
-
-        if (file.isBuffer()) {
-            parser.write(file.contents);
-            parser.end();
-
-            var contents = new Buffer(0);
-            parser.on('data', function (data) {
-                contents = Buffer.concat([contents, data]);
-            });
-            parser.once('end', function () {
-                file.contents = contents;
+    return new Transform({
+        objectMode: true,
+        transform: function (file, enc, callback) {
+            var parser = new Parser(tasks, config, file);
+
+            if (file.isBuffer()) {
+                parser.write(file.contents);
+                parser.end();
+
+                var contents = new Buffer(0);
+                parser.on('data', function (data) {
+                    contents = Buffer.concat([contents, data]);
+                });
+                parser.once('end', function () {
+                    file.contents = contents;
+                    callback(null, file);
+                });
+                return;
+            }
 
-                this.push(file);
-                return callback();
-            }.bind(this));
-        } else {
             if (file.isStream()) {
                 file.contents = file.contents.pipe(parser);
             }
 
-            this.push(file);
-            return callback();
+            callback(null, file);
         }
     });
 };
-
-

Diff for: lib/parser.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var util = require('util');
-var Transform = require('stream').Transform;
+var Transform = require('readable-stream/transform');
 var Block = require('./block');
 var common = require('./common');
 
@@ -35,9 +35,7 @@ Parser.prototype._transform = function (chunk, enc, done) {
         content = content.replace(block.replacement, block.compile(this.tasks));
     }.bind(this));
 
-    this.push(content);
-
-    done();
+    done(null, content);
 };
 
 module.exports = Parser;

Diff for: package.json

@@ -26,23 +26,26 @@
   ],
   "main": "./lib/index.js",
   "scripts": {
-    "test": "mocha --reporter spec",
-    "coverage": "istanbul cover node_modules/mocha/bin/_mocha -- -R dot",
-    "coveralls": "istanbul cover ./node_modules/mocha/bin/_mocha -- -R dot && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage"
+    "test": "mocha",
+    "coverage": "istanbul cover _mocha -- -R dot",
+    "coveralls": "istanbul cover _mocha && istanbul-coveralls"
   },
   "engines": {
     "node": ">= 0.9"
   },
   "dependencies": {
-    "slash": "^1.0.0",
-    "through2": "^0.6.5"
+    "object-assign": "^3.0.0",
+    "readable-stream": "^2.0.1",
+    "slash": "^1.0.0"
   },
   "devDependencies": {
-    "coveralls": "^2.11.2",
-    "event-stream": "^3.3.1",
+    "concat-stream": "^1.5.0",
+    "from2-string": "^1.0.2",
     "gulp-util": "^3.0.5",
     "istanbul": "^0.3.14",
-    "mocha": "^2.2.5"
+    "istanbul-coveralls": "^1.0.3",
+    "mocha": "^2.2.5",
+    "vinyl": "^0.5.0"
   },
   "license": "MIT"
 }

Diff for: test/buffer.js

@@ -1,32 +1,29 @@
 'use strict';
 
-var plugin = require('../lib/index');
+var plugin = require('..');
 var fs = require('fs');
 var path = require('path');
-var gutil = require('gulp-util');
+var File = require('vinyl');
 var assert = require('assert');
 
 function compare(fixture, expected, stream, done) {
-    var fakeFile = new gutil.File({
-        contents: fixture
-    });
-
-    fakeFile.base = path.join(fakeFile.cwd, 'pages');
-    fakeFile.path = path.join(fakeFile.cwd, path.join('pages', 'index.html'));
-
-    stream.write(fakeFile);
-
-    stream.once('data', function (file) {
+    stream
+    .once('data', function (file) {
         assert(file.isBuffer());
-        assert.equal(String(file.contents), String(expected));
+        assert.strictEqual(String(file.contents), expected);
         done();
-    });
+    })
+    .end(new File({
+        base: path.resolve('pages'),
+        path: path.join('pages', 'index.html'),
+        contents: fixture
+    }));
 }
 
 describe('Buffer mode', function () {
     it('should replace blocks', function (done) {
         var fixture = fs.readFileSync(path.join('test', 'fixture.html'));
-        var expected = fs.readFileSync(path.join('test', 'expected.html'));
+        var expected = fs.readFileSync(path.join('test', 'expected.html'), 'utf8');
 
         var stream = plugin({
             css: 'css/combined.css',
@@ -78,14 +75,14 @@ describe('Buffer mode', function () {
         var expected = '<!DOCTYPE html><head><link rel="stylesheet" href="css/combined.css"></head>';
 
         var stream = plugin({css: 'css/combined.css'});
-        compare(new Buffer(fixture), new Buffer(expected), stream, done);
+        compare(new Buffer(fixture), expected, stream, done);
     });
 
     it('should not fail if there are no build tags at all', function (done) {
         var fixture = '<!DOCTYPE html><head><link rel="stylesheet" href="_index.prefix.css"></head>';
 
         var stream = plugin({css: 'css/combined.css'});
-        compare(new Buffer(fixture), new Buffer(fixture), stream, done);
+        compare(new Buffer(fixture), fixture, stream, done);
     });
 
     describe('Options', function () {
@@ -96,15 +93,15 @@ describe('Buffer mode', function () {
                 var expected = '<html>\nSome text\n</html>';
 
                 var stream = plugin({}, {keepUnassigned: true});
-                compare(new Buffer(fixture), new Buffer(expected), stream, done);
+                compare(new Buffer(fixture), expected, stream, done);
             });
 
             it('Should remove empty blocks', function (done) {
                 var fixture = '<html>\n<!-- build:js -->\nSome text\n<!-- endbuild -->\n</html>';
                 var expected = '<html>\n</html>';
 
                 var stream = plugin();
-                compare(new Buffer(fixture), new Buffer(expected), stream, done);
+                compare(new Buffer(fixture), expected, stream, done);
             });
         });
 
@@ -114,31 +111,31 @@ describe('Buffer mode', function () {
                 var expected = '<html>\n<!-- build:js -->\n<!-- endbuild -->\n</html>';
 
                 var stream = plugin({}, {keepBlockTags: true});
-                compare(new Buffer(fixture), new Buffer(expected), stream, done);
+                compare(new Buffer(fixture), expected, stream, done);
             });
 
             it('Should keep placeholder tags with arguments', function (done) {
                 var fixture = '<html>\n<!-- build:lorem -->\nSome text\n<!-- endbuild -->\n</html>';
                 var expected = '<html>\n<!-- build:lorem -->\nipsum\n<!-- endbuild -->\n</html>';
 
                 var stream = plugin({lorem: 'ipsum'}, {keepBlockTags: true});
-                compare(new Buffer(fixture), new Buffer(expected), stream, done);
+                compare(new Buffer(fixture), expected, stream, done);
             });
 
             it('Should remove placeholder tags without arguments', function (done) {
                 var fixture = '<html>\n<!-- build:js -->\nSome text\n<!-- endbuild -->\n</html>';
                 var expected = '<html>\n</html>';
 
                 var stream = plugin();
-                compare(new Buffer(fixture), new Buffer(expected), stream, done);
+                compare(new Buffer(fixture), expected, stream, done);
             });
 
             it('Should remove placeholder tags with arguments', function (done) {
                 var fixture = '<html>\n<!-- build:lorem -->\nSome text\n<!-- endbuild -->\n</html>';
                 var expected = '<html>\nipsum\n</html>';
 
                 var stream = plugin({lorem: 'ipsum'});
-                compare(new Buffer(fixture), new Buffer(expected), stream, done);
+                compare(new Buffer(fixture), expected, stream, done);
             });
         });
 
@@ -148,7 +145,7 @@ describe('Buffer mode', function () {
                 var expected = '<html>\n<script src="../lib/script.js"></script>\n</html>';
 
                 var stream = plugin({js: 'lib/script.js'}, {resolvePaths: true});
-                compare(new Buffer(fixture), new Buffer(expected), stream, done);
+                compare(new Buffer(fixture), expected, stream, done);
             });
         });
     });
@@ -159,15 +156,15 @@ describe('Buffer mode', function () {
             var expected = '<html>\nThis should be removed if "keepUnassigned" is false\n</html>';
 
             var stream = plugin({}, true);
-            compare(new Buffer(fixture), new Buffer(expected), stream, done);
+            compare(new Buffer(fixture), expected, stream, done);
         });
 
         it('[version <1.2] should remove empty blocks (keepUnassigned = false)', function (done) {
             var fixture = '<html>\n<!-- build:js -->\nThis should be removed if "keepUnassigned" is false\n<!-- endbuild -->\n</html>';
             var expected = '<html>\n</html>';
 
             var stream = plugin();
-            compare(new Buffer(fixture), new Buffer(expected), stream, done);
+            compare(new Buffer(fixture), expected, stream, done);
         });
     });
 

Diff for: test/null.js

@@ -1,22 +1,16 @@
 'use strict';
 
-var plugin = require('../lib/index');
-var gutil = require('gulp-util');
+var plugin = require('..');
+var File = require('vinyl');
 var assert = require('assert');
 
 describe('null files', function () {
     it('should be passed through', function (done) {
-
-        var fakeFile = new gutil.File({
-            contents: null
-        });
-
-        var stream = plugin();
-        stream.write(fakeFile);
-
-        stream.once('data', function (file) {
+        plugin()
+        .once('data', function (file) {
             assert(file.isNull());
             done();
-        });
+        })
+        .end(new File({contents: null}));
     });
-});
+});