Fixing routing regression (oops!)

avoidwork · Feb 15, 2016 · f1a802b · f1a802b
1 parent 46c5a48
commit f1a802b
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 1 deletion.
diff --git a/lib/router.js b/lib/router.js
@@ -203,6 +203,16 @@ var Router = function () {
 
 			return result;
 		}
+	}, {
+		key: "setHost",
+		value: function setHost(arg) {
+			if (!array.contains(this.hosts, arg)) {
+				this.hosts.push(arg);
+				this.patterns.push(new RegExp("^" + arg.replace(/\*/g, ".*") + "$"));
+			}
+
+			return this;
+		}
 	}, {
 		key: "use",
 		value: function use(rpath, fn, host, method) {

diff --git a/lib/turtleio.js b/lib/turtleio.js
@@ -778,6 +778,14 @@ function factory() {
 		obj.error = errHandler;
 	}
 
+	// Setting default routes
+	obj.router.setHost("all");
+
+	// Registering virtual hosts
+	Object.keys(obj.config.hosts).forEach(function (i) {
+		obj.router.setHost(i);
+	});
+
 	return obj;
 }
 

diff --git a/sample.js b/sample.js
@@ -11,7 +11,8 @@ server = require(path.join(__dirname, "index"))({
 		level: "debug"
 	},
 	hosts: {
-		test: "test"
+		test: "test",
+		test2: "test2"
 	}
 }, function (req, res, status, body) {
 	var deferred = defer();

diff --git a/sites/test2/index.html b/sites/test2/index.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+	<h1>Hello world!!!</h1>
+</body>
+</html>
diff --git a/src/router.js b/src/router.js
@@ -173,6 +173,15 @@ class Router {
 		return result;
 	}
 
+	setHost (arg) {
+		if (!array.contains(this.hosts, arg)) {
+			this.hosts.push(arg);
+			this.patterns.push(new RegExp("^" + arg.replace(/\*/g, ".*") + "$"));
+		}
+
+		return this;
+	}
+
 	use (rpath, fn, host, method) {
 		let lpath = rpath,
 			lfn = fn,

diff --git a/src/turtleio.js b/src/turtleio.js
@@ -713,6 +713,14 @@ function factory (cfg = {}, errHandler = null) {
 		obj.error = errHandler;
 	}
 
+	// Setting default routes
+	obj.router.setHost("all");
+
+	// Registering virtual hosts
+	Object.keys(obj.config.hosts).forEach(i => {
+		obj.router.setHost(i);
+	});
+
 	return obj;
 }