Removing baked in functions for modules

avoidwork · Dec 28, 2015 · 6d12632 · 6d12632
1 parent 7072e8c
commit 6d12632
Show file tree

Hide file tree

Showing 16 changed files with 66 additions and 125 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -2,6 +2,7 @@
 
 var fs = require("fs"),
     path = require("path"),
+    merge = require("tiny-merge"),
     root = path.join(__dirname, ".."),
     cfg = require(path.join(root, "config.json")),
     tenso = require(path.join(__dirname, "tenso.js")),
@@ -10,7 +11,7 @@ var fs = require("fs"),
 function factory(arg) {
 	var hostname = arg ? arg.hostname || "localhost" : "localhost",
 	    vhosts = {},
-	    config = arg ? utility.merge(utility.clone(cfg), arg) : utility.clone(cfg),
+	    config = arg ? merge(utility.clone(cfg), arg) : utility.clone(cfg),
 	    obj = undefined;
 
 	if (!config.port) {

diff --git a/lib/iterate.js b/lib/iterate.js
@@ -0,0 +1,13 @@
+"use strict";
+
+function iterate(obj, fn) {
+	if (obj instanceof Object) {
+		Object.keys(obj).forEach(function (i) {
+			fn.call(obj, obj[i], i);
+		});
+	} else {
+		obj.forEach(fn);
+	}
+}
+
+module.exports = iterate;
diff --git a/lib/middleware.js b/lib/middleware.js
@@ -2,8 +2,9 @@
 
 var path = require("path"),
     array = require("retsu"),
+    coerce = require("tiny-coerce"),
     regex = require(path.join(__dirname, "regex.js")),
-    shared = require(path.join(__dirname, "shared.js"));
+    iterate = require(path.join(__dirname, "iterate.js"));
 
 var rateHeaders = ["x-ratelimit-limit", "x-ratelimit-remaining", "x-ratelimit-reset"];
 
@@ -72,7 +73,7 @@ function parse(req, res, next) {
 			req.body = {};
 
 			array.each(args, function (i) {
-				req.body[i[0]] = shared.coerce(i[1]);
+				req.body[i[0]] = coerce(i[1]);
 			});
 		}
 
@@ -111,7 +112,7 @@ function keymaster(req, res, next) {
 				res.send(result);
 			}
 		} else {
-			shared.iterate(routes, function (value, key) {
+			iterate(routes, function (value, key) {
 				if (new RegExp("^" + key + "$", "i").test(uri)) {
 					return !(result = value);
 				}

diff --git a/lib/renderers.js b/lib/renderers.js
@@ -35,7 +35,7 @@ renderers.set("text/html", function (arg, req, headers, tpl) {
 		return i.indexOf("html") === -1;
 	}).map(function (i) {
 		return "<option value='" + i + "'>" + i.replace(/^.*\//, "").toUpperCase() + "</option>";
-	}).join("\n")).replace("{{body}}", JSON.stringify(arg, null, 2)).replace("{{year}}", new Date().getFullYear()).replace("{{version}}", "3.0.2").replace("{{allow}}", headers.allow).replace("{{methods}}", utility.explode(headers.allow.replace("GET, HEAD, OPTIONS", "")).filter(function (i) {
+	}).join("\n")).replace("{{body}}", JSON.stringify(arg, null, 2)).replace("{{year}}", new Date().getFullYear()).replace("{{version}}", "3.0.3").replace("{{allow}}", headers.allow).replace("{{methods}}", utility.explode(headers.allow.replace("GET, HEAD, OPTIONS", "")).filter(function (i) {
 		return i !== "";
 	}).map(function (i) {
 		return "<option value='" + i + "'>" + i + "</option>";

diff --git a/lib/tenso.js b/lib/tenso.js
@@ -8,6 +8,7 @@ var path = require("path"),
     array = require("retsu"),
     turtleio = require("turtle.io"),
     deferred = require("tiny-defer"),
+    merge = require("tiny-merge"),
     regex = require(path.join(__dirname, "regex")),
     utility = require(path.join(__dirname, "utility"));
 
@@ -23,7 +24,7 @@ var Tenso = (function () {
 		this.rates = {};
 		this.server = turtleio(config);
 		this.server.tenso = this;
-		this.version = "3.0.2";
+		this.version = "3.0.3";
 	}
 
 	_createClass(Tenso, [{
@@ -124,7 +125,7 @@ var Tenso = (function () {
 				ref = [headers || {}];
 
 				if (res._headers) {
-					utility.merge(ref[0], res._headers);
+					merge(ref[0], res._headers);
 				}
 
 				if (req.protect) {

diff --git a/lib/utility.js b/lib/utility.js
@@ -2,6 +2,7 @@
 
 var path = require("path"),
     array = require("retsu"),
+    coerce = require("tiny-coerce"),
     keysort = require("keysort"),
     url = require("url"),
     session = require("express-session"),
@@ -10,7 +11,7 @@ var path = require("path"),
     uuid = require("tiny-uuid4"),
     middleware = require(path.join(__dirname, "middleware.js")),
     regex = require(path.join(__dirname, "regex.js")),
-    shared = require(path.join(__dirname, "shared.js")),
+    iterate = require(path.join(__dirname, "iterate.js")),
     passport = require("passport"),
     BasicStrategy = require("passport-http").BasicStrategy,
     BearerStrategy = require("passport-http-bearer").Strategy,
@@ -59,26 +60,6 @@ function isEmpty(obj) {
 	return trim(obj) === "";
 }
 
-function merge(a, b) {
-	if (a instanceof Object && b instanceof Object) {
-		Object.keys(b).forEach(function (i) {
-			if (a[i] instanceof Object && b[i] instanceof Object) {
-				a[i] = merge(a[i], b[i]);
-			} else if (a[i] instanceof Array && b[i] instanceof Array) {
-				a[i] = a[i].concat(b[i]);
-			} else {
-				a[i] = b[i];
-			}
-		});
-	} else if (a instanceof Array && b instanceof Array) {
-		a = a.concat(b);
-	} else {
-		a = b;
-	}
-
-	return a;
-}
-
 function auth(obj, config) {
 	var ssl = config.ssl.cert && config.ssl.key,
 	    proto = "http" + (ssl ? "s" : ""),
@@ -138,7 +119,7 @@ function auth(obj, config) {
 	});
 
 	if (async) {
-		shared.iterate(config.auth, function (v, k) {
+		iterate(config.auth, function (v, k) {
 			if (v.enabled) {
 				authMap[k + "_uri"] = "/auth/" + k;
 				config.auth.protect.push(new RegExp("^/auth/" + k));
@@ -530,16 +511,16 @@ function bootstrap(obj, config) {
 
 	// Setting headers
 	config.headers = config.headers || {};
-	config.headers.server = "tenso/3.0.2";
+	config.headers.server = "tenso/3.0.3";
 
 	// Creating status > message map
-	shared.iterate(obj.server.codes, function (value, key) {
+	iterate(obj.server.codes, function (value, key) {
 		obj.messages[value] = obj.server.messages[key];
 	});
 
 	// Setting routes
-	shared.iterate(config.routes, function (routes, method) {
-		shared.iterate(routes, function (arg, route) {
+	iterate(config.routes, function (routes, method) {
+		iterate(routes, function (arg, route) {
 			if (typeof arg === "function") {
 				obj.server[method](route, function () {
 					for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
@@ -608,7 +589,7 @@ function queryString() {
 		if (item[1] === undefined) {
 			item[1] = "";
 		} else {
-			item[1] = shared.coerce(decodeURIComponent(item[1]));
+			item[1] = coerce(decodeURIComponent(item[1]));
 		}
 
 		if (obj[item[0]] === undefined) {
@@ -649,7 +630,7 @@ function parse(uri) {
 	parsed = url.parse(luri);
 	parsed.query = parsed.search ? queryString(parsed.search) : {};
 
-	shared.iterate(parsed, function (v, k) {
+	iterate(parsed, function (v, k) {
 		if (v === null) {
 			parsed[k] = "";
 		}
@@ -813,7 +794,6 @@ module.exports = {
 	escape: escape,
 	hypermedia: hypermedia,
 	isEmpty: isEmpty,
-	merge: merge,
 	queryString: queryString,
 	parse: parse,
 	trim: trim

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tenso",
   "description": "Tensō is a REST API gateway for node.js, designed to simplify the implementation of APIs.",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "homepage": "http://avoidwork.github.io/tenso",
   "author": "Jason Mulligan <[email protected]>",
   "repository": {
@@ -36,7 +36,9 @@
     "passport-saml": "^0.14.0",
     "passport-twitter": "^1.0.3",
     "retsu": "^2.0.0",
+    "tiny-coerce": "^1.0.1",
     "tiny-defer": "^1.0.4",
+    "tiny-merge": "^1.0.0",
     "tiny-uuid4": "^1.0.0",
     "tiny-xml": "^1.0.6",
     "turtle.io": "^5.0.3",

diff --git a/www/css/style.scss → sass/style.scss b/www/css/style.scss → sass/style.scss
diff --git a/src/index.js b/src/index.js
@@ -1,5 +1,6 @@
 const fs = require("fs"),
 	path = require("path"),
+	merge = require("tiny-merge"),
 	root = path.join(__dirname, ".."),
 	cfg = require(path.join(root, "config.json")),
 	tenso = require(path.join(__dirname, "tenso.js")),
@@ -8,7 +9,7 @@ const fs = require("fs"),
 function factory (arg) {
 	let hostname = arg ? arg.hostname || "localhost" : "localhost",
 		vhosts = {},
-		config = arg ? utility.merge(utility.clone(cfg), arg) : utility.clone(cfg),
+		config = arg ? merge(utility.clone(cfg), arg) : utility.clone(cfg),
 		obj;
 
 	if (!config.port) {

diff --git a/src/iterate.js b/src/iterate.js
@@ -0,0 +1,11 @@
+function iterate (obj, fn) {
+	if (obj instanceof Object) {
+		Object.keys(obj).forEach(function (i) {
+			fn.call(obj, obj[i], i);
+		});
+	} else {
+		obj.forEach(fn);
+	}
+}
+
+module.exports = iterate;
diff --git a/src/middleware.js b/src/middleware.js
@@ -1,7 +1,8 @@
 const path = require("path"),
 	array = require("retsu"),
+	coerce = require("tiny-coerce"),
 	regex = require(path.join(__dirname, "regex.js")),
-	shared = require(path.join(__dirname, "shared.js"));
+	iterate = require(path.join(__dirname, "iterate.js"));
 
 const rateHeaders = [
 	"x-ratelimit-limit",
@@ -71,7 +72,7 @@ function parse (req, res, next) {
 			req.body = {};
 
 			array.each(args, function (i) {
-				req.body[i[0]] = shared.coerce(i[1]);
+				req.body[i[0]] = coerce(i[1]);
 			});
 		}
 
@@ -107,7 +108,7 @@ function keymaster (req, res, next) {
 				res.send(result);
 			}
 		} else {
-			shared.iterate(routes, function (value, key) {
+			iterate(routes, function (value, key) {
 				if (new RegExp("^" + key + "$", "i").test(uri)) {
 					return !(result = value);
 				}

diff --git a/src/shared.js b/src/shared.js
diff --git a/src/tenso.js b/src/tenso.js
@@ -2,6 +2,7 @@ const path = require("path"),
 	array = require("retsu"),
 	turtleio = require("turtle.io"),
 	deferred = require("tiny-defer"),
+	merge = require("tiny-merge"),
 	regex = require(path.join(__dirname, "regex")),
 	utility = require(path.join(__dirname, "utility"));
 
@@ -104,7 +105,7 @@ class Tenso {
 			ref = [headers || {}];
 
 			if (res._headers) {
-				utility.merge(ref[0], res._headers);
+				merge(ref[0], res._headers);
 			}
 
 			if (req.protect) {