ensure stream api also conforms to reloadDelay and reloadDebounce

Author: shakyShane

gulpfile.js

@@ -1,21 +1,36 @@
 "use strict";
 
 var gulp = require("gulp");
-var contribs = require("gulp-contribs");
-var conventionalChangelog = require("gulp-conventional-changelog");
+var bs = require("./").create();
+var Rx = require("rx");
+// var contribs = require("gulp-contribs");
+// var conventionalChangelog = require("gulp-conventional-changelog");
+//
+// gulp.task("contribs", function () {
+//     gulp.src("README.md")
+//         .pipe(contribs())
+//         .pipe(gulp.dest(""));
+// });
+//
+// gulp.task("changelog", function () {
+//     return gulp.src("CHANGELOG.md", {
+//         buffer: false
+//     })
+//         .pipe(conventionalChangelog({
+//             preset: "angular"
+//         }))
+//         .pipe(gulp.dest("./"));
+// });
 
-gulp.task("contribs", function () {
-    gulp.src("README.md")
-        .pipe(contribs())
-        .pipe(gulp.dest(""));
-});
+gulp.task("dev", function() {
+
+    bs.init({
+        server: "test/fixtures",
+        open: false,
+        reloadDelay: 1000,
+        reloadDebounce: 1000
+    });
 
-gulp.task("changelog", function () {
-    return gulp.src("CHANGELOG.md", {
-        buffer: false
-    })
-        .pipe(conventionalChangelog({
-            preset: "angular"
-        }))
-        .pipe(gulp.dest("./"));
+    gulp.src("lib/**")
+        .pipe(bs.stream())
 });

lib/file-event-handler.js

@@ -21,13 +21,7 @@ module.exports = function (subject, options) {
         return subject;
     })();
 
-    var withOps = globalItems.reduce(function(subject, item) {
-        var value = options.get(item.option);
-        if (value > 0) {
-            return subject[item.fnName].call(subject, value, scheduler);
-        }
-        return subject;
-    }, initial);
+    var withOps = applyOperators(globalItems, initial, options, scheduler);
 
     return withOps
         .map(function(xs) {
@@ -48,6 +42,38 @@ module.exports = function (subject, options) {
         });
 };
 
+function applyReloadOperators (subject, options) {
+    var globalItems = [
+        {
+            option: "reloadDebounce",
+            fnName: "debounce"
+        },
+        {
+            option: "reloadThrottle",
+            fnName: "throttle"
+        },
+        {
+            option: "reloadDelay",
+            fnName: "delay"
+        }
+    ];
+
+    var scheduler = options.getIn(["debug", "scheduler"]);
+
+    return applyOperators(globalItems, subject, options, scheduler);
+}
+module.exports.applyReloadOperators = applyReloadOperators;
+
+function applyOperators (items, subject, options, scheduler) {
+    return items.reduce(function(subject, item) {
+        var value = options.get(item.option);
+        if (value > 0) {
+            return subject[item.fnName].call(subject, value, scheduler);
+        }
+        return subject;
+    }, subject);
+}
+
 function getDebouncedStream (subject, options, scheduler) {
     return subject
         .filter(function(x) { return options.get("watchEvents").indexOf(x.event) > -1 })

lib/internal-events.js

@@ -3,6 +3,7 @@
 var utils     = require("./utils");
 var fileUtils = require("./file-utils");
 var Rx        = require("rx");
+var fromEvent = Rx.Observable.fromEvent;
 var fileHandler = require("./file-event-handler");
 
 module.exports = function (bs) {
@@ -79,14 +80,12 @@ module.exports = function (bs) {
         bs.events.on(event, events[event]);
     });
 
-    var reloader = Rx.Observable
-        .fromEvent(bs.events, "_browser:reload")
-        .delay(bs.options.get("reloadDelay") || 0, bs.options.getIn(["debug", "scheduler"]))
+    var reloader = fileHandler.applyReloadOperators(fromEvent(bs.events, "_browser:reload"), bs.options)
         .subscribe(function() {
             bs.events.emit("browser:reload");
         });
 
-    var handler = fileHandler(Rx.Observable.fromEvent(bs.events, "file:changed"), bs.options)
+    var handler = fileHandler(fromEvent(bs.events, "file:changed"), bs.options)
         .subscribe(function (x) {
             if (x.type === "reload") {
                 bs.events.emit("browser:reload");

test/specs/api/init.reload.js

@@ -98,7 +98,7 @@ describe("API: .reload()", function () {
         stream.write(new File({path: "styles2.css"}));
         stream.write(new File({path: "styles3.css"}));
         stream.end();
-        sinon.assert.calledOnce(emitterStub);
         sinon.assert.calledWithExactly(emitterStub, "_browser:reload");
+        sinon.assert.calledWithExactly(emitterStub, "browser:reload");
     });
 });

test/specs/api/init.reload.stream.js

@@ -74,17 +74,17 @@ describe("API: .stream()", function () {
         stream.write(new File({path: "styles2.css"}));
         stream.write(new File({path: "styles3.css"}));
         stream.end();
-        sinon.assert.calledOnce(emitterStub);
         sinon.assert.calledWithExactly(emitterStub, "_browser:reload");
+        sinon.assert.calledWithExactly(emitterStub, "browser:reload");
     });
     it("does not log file info if (once: true)", function () {
         var stream = browserSync.stream({once: true});
         stream.write(new File({path: "styles.js"}));
         stream.write(new File({path: "styles2.js"}));
         stream.write(new File({path: "styles3.js"}));
         stream.end();
-        sinon.assert.calledOnce(emitterStub);
         sinon.assert.calledWithExactly(emitterStub, "_browser:reload");
+        sinon.assert.calledWithExactly(emitterStub, "browser:reload");
     });
     it("only emits file-changed event if filter matched", function () {
         var stream = browserSync.stream({match: "**/*.js"});