Moving rate() into keymaster() such that it always executes

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## 0.9.18
+- Moved `rate()` into `keymaster()` such that it always executes
+
 ## 0.9.17
 - Added `rate.override` to `config` which accepts `req` & `rate`, and must return `rate`, such that rate limiting is customizable
 

doc/global.html

@@ -1826,7 +1826,7 @@ <h5>Returns:</h5>
 
 		<span class="jsdoc-message">
 		Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a>
-		on 2014-11-05T07:38:55-05:00 using the <a
+		on 2014-11-05T08:03:07-05:00 using the <a
 			href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
 		</span>
 				</footer>

doc/index.html

@@ -386,7 +386,7 @@ <h2>License</h2>
 
 		<span class="jsdoc-message">
 		Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a>
-		on 2014-11-05T07:38:55-05:00 using the <a
+		on 2014-11-05T08:03:07-05:00 using the <a
 			href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
 		</span>
 				</footer>

doc/module-tenso.html

@@ -125,7 +125,7 @@ <h2>
 	<dt class="tag-version">Version:</dt>
 	<dd class="tag-version">
 		<ul class="dummy">
-			<li>0.9.17</li>
+			<li>0.9.18</li>
 		</ul>
 	</dd>
 
@@ -218,7 +218,7 @@ <h2>
 
 		<span class="jsdoc-message">
 		Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a>
-		on 2014-11-05T07:38:55-05:00 using the <a
+		on 2014-11-05T08:03:07-05:00 using the <a
 			href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
 		</span>
 				</footer>

doc/modules.list.html

@@ -188,7 +188,7 @@ <h2>
 
 		<span class="jsdoc-message">
 		Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a>
-		on 2014-11-05T07:38:55-05:00 using the <a
+		on 2014-11-05T08:03:07-05:00 using the <a
 			href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
 		</span>
 				</footer>

lib/tenso.js

@@ -6,13 +6,13 @@
  * @license BSD-3 <https://raw.github.com/avoidwork/tenso/master/LICENSE>
  * @link http://avoidwork.github.io/tenso
  * @module tenso
- * @version 0.9.17
+ * @version 0.9.18
  */
 ( function () {
 "use strict";
 
 var turtleio = require( "turtle.io" ),
-    SERVER   = "tenso/0.9.17",
+    SERVER   = "tenso/0.9.18",
     CONFIG   = require( __dirname + "/../config.json" ),
     keigai   = require( "keigai" ),
     util     = keigai.util,
@@ -64,7 +64,7 @@ function Tenso () {
 	this.rates        = {};
 	this.server       = turtleio();
 	this.server.tenso = this;
-	this.version      = "0.9.17";
+	this.version      = "0.9.18";
 }
 
 /**
@@ -671,17 +671,9 @@ function bootstrap ( obj, config ) {
 		arguments[2]();
 	}
 
-	function rateLimit ( req, res, next ) {
-		rate( obj, req, res, next );
-	}
-
 	obj.server.use( mediator ).blacklist( mediator );
 	obj.server.use( parse ).blacklist( parse );
 
-	if ( config.rate.enabled ) {
-		obj.server.use( rateLimit ).blacklist( rateLimit );
-	}
-
 	// Bootstrapping configuration
 	config                = auth( obj, config );
 	config.headers        = config.headers || {};
@@ -918,38 +910,20 @@ function hypermedia ( server, req, rep, headers ) {
  * @return {Undefined}     undefined
  */
 function keymaster ( req, res, next ) {
-	var obj, method, result, routes, uri, valid;
+	var obj = req.server.tenso,
+	    method, result, routes, uri, valid;
 
 	// No authentication, or it's already happened
 	if ( !req.protect || !req.protectAsync || ( req.session && req.isAuthenticated() ) ) {
-		obj    = req.server.tenso;
 		method = REGEX_GETREWRITE.test( req.method ) ? "get" : req.method.toLowerCase();
 		routes = req.server.config.routes[method] || {};
 		uri    = req.parsed.pathname;
 		valid  = false;
 
-		if ( uri in routes ) {
-			result = routes[uri];
-
-			if ( typeof result == "function" ) {
-				result.call( obj, req, res );
-			}
-			else {
-				obj.respond( req, res, result );
-			}
-		}
-		else {
-			iterate( routes, function ( value, key ) {
-				var regex = new RegExp( "^" + key + "$", "i" );
-
-				if ( regex.test( uri ) ) {
-					result = value;
-
-					return false;
-				}
-			} );
+		rate( obj, req, res, function () {
+			if ( uri in routes ) {
+				result = routes[ uri ];
 
-			if ( result ) {
 				if ( typeof result == "function" ) {
 					result.call( obj, req, res );
 				}
@@ -958,27 +932,47 @@ function keymaster ( req, res, next ) {
 				}
 			}
 			else {
-				iterate( req.server.config.routes.get || {}, function ( value, key ) {
+				iterate( routes, function ( value, key ) {
 					var regex = new RegExp( "^" + key + "$", "i" );
 
 					if ( regex.test( uri ) ) {
-						valid = true;
+						result = value;
 
 						return false;
 					}
 				} );
 
-				if ( valid ) {
-					obj.error( req, res, 405 );
+				if ( result ) {
+					if ( typeof result == "function" ) {
+						result.call( obj, req, res );
+					}
+					else {
+						obj.respond( req, res, result );
+					}
 				}
 				else {
-					obj.error( req, res, 404 );
+					iterate( req.server.config.routes.get || {}, function ( value, key ) {
+						var regex = new RegExp( "^" + key + "$", "i" );
+
+						if ( regex.test( uri ) ) {
+							valid = true;
+
+							return false;
+						}
+					} );
+
+					if ( valid ) {
+						obj.error( req, res, 405 );
+					}
+					else {
+						obj.error( req, res, 404 );
+					}
 				}
 			}
-		}
+		} );
 	}
 	else {
-		next();
+		rate( obj, req, res, next );
 	}
 }
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tenso",
   "description": "Tensō is a REST API facade for node.js, designed to simplify the implementation of APIs.",
-  "version": "0.9.17",
+  "version": "0.9.18",
   "homepage": "http://avoidwork.github.io/tenso",
   "author": {
     "name": "Jason Mulligan",

src/bootstrap.js

@@ -48,17 +48,9 @@ function bootstrap ( obj, config ) {
 		arguments[2]();
 	}
 
-	function rateLimit ( req, res, next ) {
-		rate( obj, req, res, next );
-	}
-
 	obj.server.use( mediator ).blacklist( mediator );
 	obj.server.use( parse ).blacklist( parse );
 
-	if ( config.rate.enabled ) {
-		obj.server.use( rateLimit ).blacklist( rateLimit );
-	}
-
 	// Bootstrapping configuration
 	config                = auth( obj, config );
 	config.headers        = config.headers || {};

src/keymaster.js

@@ -8,38 +8,20 @@
  * @return {Undefined}     undefined
  */
 function keymaster ( req, res, next ) {
-	var obj, method, result, routes, uri, valid;
+	var obj = req.server.tenso,
+	    method, result, routes, uri, valid;
 
 	// No authentication, or it's already happened
 	if ( !req.protect || !req.protectAsync || ( req.session && req.isAuthenticated() ) ) {
-		obj    = req.server.tenso;
 		method = REGEX_GETREWRITE.test( req.method ) ? "get" : req.method.toLowerCase();
 		routes = req.server.config.routes[method] || {};
 		uri    = req.parsed.pathname;
 		valid  = false;
 
-		if ( uri in routes ) {
-			result = routes[uri];
+		rate( obj, req, res, function () {
+			if ( uri in routes ) {
+				result = routes[ uri ];
 
-			if ( typeof result == "function" ) {
-				result.call( obj, req, res );
-			}
-			else {
-				obj.respond( req, res, result );
-			}
-		}
-		else {
-			iterate( routes, function ( value, key ) {
-				var regex = new RegExp( "^" + key + "$", "i" );
-
-				if ( regex.test( uri ) ) {
-					result = value;
-
-					return false;
-				}
-			} );
-
-			if ( result ) {
 				if ( typeof result == "function" ) {
 					result.call( obj, req, res );
 				}
@@ -48,26 +30,46 @@ function keymaster ( req, res, next ) {
 				}
 			}
 			else {
-				iterate( req.server.config.routes.get || {}, function ( value, key ) {
+				iterate( routes, function ( value, key ) {
 					var regex = new RegExp( "^" + key + "$", "i" );
 
 					if ( regex.test( uri ) ) {
-						valid = true;
+						result = value;
 
 						return false;
 					}
 				} );
 
-				if ( valid ) {
-					obj.error( req, res, 405 );
+				if ( result ) {
+					if ( typeof result == "function" ) {
+						result.call( obj, req, res );
+					}
+					else {
+						obj.respond( req, res, result );
+					}
 				}
 				else {
-					obj.error( req, res, 404 );
+					iterate( req.server.config.routes.get || {}, function ( value, key ) {
+						var regex = new RegExp( "^" + key + "$", "i" );
+
+						if ( regex.test( uri ) ) {
+							valid = true;
+
+							return false;
+						}
+					} );
+
+					if ( valid ) {
+						obj.error( req, res, 405 );
+					}
+					else {
+						obj.error( req, res, 404 );
+					}
 				}
 			}
-		}
+		} );
 	}
 	else {
-		next();
+		rate( obj, req, res, next );
 	}
 }