fix: issues found during integration tests

Author: bbartolome

lib/asyncwares/init-route.js

@@ -10,7 +10,7 @@ module.exports = function exported(api) {
 	return function initRoute(ws, done) {
 		var routes = api.router.recognize(ws.upgradeReq.url);
 
-		if (routes[0]) {
+		if (routes && routes[0]) {
 			ws.route = routes[0].handler(routes[0]);
 		}
 

lib/index.js

@@ -54,7 +54,7 @@ function newApi(options) {
 
 				next();
 			},
-			sync: function syncHandler(req, res, next) {
+			sync: function syncHandler(req, res) {
 				var self = this;
 
 				self.express(req, req.route, function done(err, result) {
@@ -64,7 +64,7 @@ function newApi(options) {
 
 					res.write(result);
 
-					return next();
+					return res.end();
 				});
 			}
 		}
@@ -107,7 +107,7 @@ function newApi(options) {
 	instance.syncware.use(initSyncUser);
 	instance.syncware.use(initAnonymousUser(instance));
 	instance.syncware.use(initBody);
-	instance.syncware.use(initSyncRoute(instance, router));
+	instance.syncware.use(initSyncRoute(router));
 	instance.syncware.use(syncHandler);
 
 	// LISTENERS
@@ -130,7 +130,7 @@ function newApi(options) {
 	var emitRequestEvents = require('./listeners/emit-request-events.js');
 	instance.on('listening', emitRequestEvents());
 
-	var addCloseEvent = require('./listeners/add-close-event.js');
+	var addCloseEvent = require('./listeners/add-close-event.js')(instance);
 	instance.on('listening', addCloseEvent);
 
 	instance.close = require('./api/close.js')();

lib/listeners/add-close-event.js

@@ -6,11 +6,10 @@
 
 'use strict';
 
-module.exports = function exported() {
+module.exports = function exported(api) {
 	return function addCloseEvent(httpServer) {
-		var api = this;
-
 		var closeHttpServer = httpServer.close.bind(httpServer);
+
 		api.on('close', closeHttpServer);
 	};
 };

lib/registrars/views.js

@@ -43,5 +43,5 @@ function getPatternUri(view) {
 }
 
 function onNext(api, _, handler, uri) {
-	api.router.add({path: uri, handler: handler.bind(null, uri)});
+	api.router.add([{path: uri, handler: handler.bind(null, uri)}]);
 }

lib/syncwares/init-route.js

@@ -6,11 +6,11 @@
 
 'use strict';
 
-module.exports = function exported(api) {
+module.exports = function exported(router) {
 	return function initRoute(req, res, next) {
-		var routes = api.router.recognize(req.url);
+		var routes = router.recognize(req.url);
 
-		if (routes[0]) {
+		if (routes && routes[0]) {
 			req.route = routes[0].handler(routes[0]);
 		}
 

test/unit/registrars/views.js

@@ -10,9 +10,9 @@ module.exports = function(test) {
 		var api = {
 			router: {
 				add: function(params) {
-					t.ok(params);
-					t.equal(params.path, testUri);
-					t.deepEqual(params.handler({params: {id: 'test'}}), _.assign(
+					t.ok(params[0]);
+					t.equal(params[0].path, testUri);
+					t.deepEqual(params[0].handler({params: {id: 'test'}}), _.assign(
 						{}, {uri: testUri}, {id: 'test'}
 					));
 				}