feat(middleware): accept route/handler in plain objects

shakyShane · shakyShane · commit 8572f063187b · 2016-04-08T08:04:57.000+01:00
diff --git a/bin/browser-sync.js b/bin/browser-sync.js
@@ -20,8 +20,8 @@ if (!module.parent) {
 
     var argv    = yargs.argv;
     var command = argv._[0];
+    var valid   = ["start", "init", "reload", "recipe"];
 
-    var valid = ["start", "init", "reload", "recipe"];
     if (valid.indexOf(command) > -1) {
         handleIncoming(command, yargs.reset());
     } else {
diff --git a/lib/server/utils.js b/lib/server/utils.js
@@ -1,11 +1,12 @@
 "use strict";
 
-var fs           = require("fs");
-var filePath     = require("path");
-var connect      = require("connect");
-var http         = require("http");
-var https        = require("https");
-var snippet      = require("./../snippet").utils;
+var fs        = require("fs");
+var filePath  = require("path");
+var connect   = require("connect");
+var http      = require("http");
+var https     = require("https");
+var Map       = require("immutable").Map;
+var snippet   = require("./../snippet").utils;
 
 var utils = {
     /**
@@ -77,14 +78,37 @@ var utils = {
         /**
          * Add user-provided middlewares
          */
-        options.get("middleware").forEach(function (item) {
-            if (typeof item === "function") {
-                return app.use(item);
-            }
-            if ((item.route !== undefined) && item.handle) {
+        options.get("middleware")
+            .map(function (item) {
+                /**
+                 * Object given in options, which
+                 * ended up being a Map
+                 */
+                if (Map.isMap(item)) {
+                    return item.toJS();
+                }
+                /**
+                 * Single function
+                 */
+                if (typeof item === "function") {
+                    return {
+                        route: "",
+                        handle: item
+                    }
+                }
+                /**
+                 * Plain obj
+                 */
+                if ((item.route !== undefined) && item.handle) {
+                    return item;
+                }
+            })
+            .forEach(function (item) {
+                /**
+                 * Add each middleware
+                 */
                 app.stack.push(item);
-            }
-        });
+            });
 
         return app;
     },
diff --git a/test/specs/e2e/middleware/middleware.option.js b/test/specs/e2e/middleware/middleware.option.js
@@ -2,8 +2,9 @@
 
 var browserSync = require("../../../../index");
 var assert  = require("chai").assert;
+var request = require("supertest");
 
-describe("Accepting middleware as an option", function () {
+describe("Accepting middleware as an option (1)", function () {
 
     var bs;
 
@@ -36,7 +37,7 @@ describe("Accepting middleware as an option", function () {
     });
 });
 
-describe("Accepting middleware as an option", function () {
+describe("Accepting middleware as an option (2)", function () {
 
     var bs;
 
@@ -71,3 +72,47 @@ describe("Accepting middleware as an option", function () {
         assert.equal(bs.options.get("middleware").size, 2);
     });
 });
+
+describe("Accepting middleware as a plain object", function () {
+
+    it("should accept middlewares with routes", function (done) {
+        browserSync.reset();
+
+        var called = 0;
+        var mw1 =  function myMiddleware(req, res, next) {
+            called += 1;
+            next();
+        };
+        var mw2 =  function bodyResp(req, res) {
+            called += 1;
+            res.end("<html><body>MW2</body></html>");
+        };
+        var config = {
+            server: {
+                baseDir: "test/fixtures"
+            },
+            middleware: [
+                mw1,
+                {
+                    route: "/shane",
+                    handle: mw2
+                }
+            ],
+            logLevel: "silent",
+            open: false
+        };
+
+        browserSync.init(config, function (err, bs) {
+            request(bs.server)
+                .get("/")
+                .set("accept", "text/html")
+                .expect(200)
+                .end(function () {
+                    assert.equal(called, 1, "should call the first middleware");
+                    bs.cleanup();
+                    done();
+                });
+        });
+
+    });
+});
