New pattern for loading endpoints. More tests and fixes in various fu…

…nctions

endpoints/bus/index.js

@@ -1,4 +1,9 @@
-exports.search = function(req, res, next) {
+exports.setup = function(){
+	server.post({path: '/bus/search', version: '1.0.0'}, search);
+	server.post({path: '/bus/realtime', version: '1.0.0'}, realtime);
+}
+
+search = function(req, res, next) {
 	res.json(404,{error:"This api endpoint has been closed temporarily, because Bus.is changed it's markup."});
 	return next();
 
@@ -191,7 +196,7 @@ exports.search = function(req, res, next) {
 
 }
 
-exports.realtime = function(req, res, next){
+realtime = function(req, res, next){
 	var data = req.params;
 
 	request('http://straeto.is/bitar/bus/livemap/json.jsp', function (error, response, body) {

endpoints/car/index.js

@@ -1,4 +1,8 @@
-exports.slash = function(req, res, next){
+exports.setup = function(){
+	server.post({path: '/car', version: '1.0.0'}, slash);
+}
+
+slash = function(req, res, next){
 	var data = req.params;
 
 	if(!data.number){

endpoints/company/index.js

@@ -1,4 +1,7 @@
-exports.slash = function(req, res, next){
+exports.setup = function(){
+	server.post({path: '/company', version: '1.0.0'}, slash);
+}
+slash = function(req, res, next){
 	res.charSet = 'utf8';
 
 	var data = req.params;

endpoints/currency/arion.js

@@ -1,4 +1,8 @@
-exports.slash = function(req, res, next){
+exports.setup = function(){
+	server.get({path: '/currency/arion', version: '1.0.0'}, slash);
+}
+
+slash = function(req, res, next){
 	res.charSet = 'utf8';
 
 

endpoints/currency/index.js

@@ -1,4 +1,8 @@
-exports.slash = function(req, res, next){
+exports.setup = function(){
+	server.post({path: '/currency', version: '1.0.0'}, slash);
+}
+
+slash = function(req, res, next){
 	var data = req.params;
 	res.charSet = 'utf8';
 
@@ -138,5 +142,4 @@ exports.slash = function(req, res, next){
 		res.json(404,{error:'This provider does not exist',code:2});
 		return next();
 	}
-
 }

endpoints/currency/m5.js

@@ -1,4 +1,8 @@
-exports.slash = function(req, res, next){
+exports.setup = function(){
+	server.get({path: '/currency/m5', version: '1.0.0'}, slash);
+}
+
+slash = function(req, res, next){
 	res.charSet = 'utf8';
 
 	var currencyNames = {

endpoints/domainlookup/index.js

@@ -1,2 +1,4 @@
 //Possible endpoint:
-//https://www.isnic.is/is/whois/mini.php?type=all&query=apis.is
+//https://www.isnic.is/is/whois/mini.php?type=all&query=apis.is
+exports.setup = function(){
+}

endpoints/flight/index.js

@@ -1,4 +1,8 @@
-exports.slash = function(req, res, next){
+exports.setup = function(){
+	server.post({path: '/flight', version: '1.0.0'}, slash);
+}
+
+slash = function(req, res, next){
 
 	var data = req.params;
 
@@ -17,6 +21,7 @@ exports.slash = function(req, res, next){
 		url = 'http://www.kefairport.is/English/Timetables/Arrivals/';
 	}else{
 		res.json(200,{'error':'Wrong parameters given!'});
+		return next();
 	}
 
 	request.get({

endpoints/frontpage/index.js

@@ -1,4 +1,9 @@
-exports.getSlash = function(req, res, next) {
+exports.setup = function(){
+	server.get({path: '/'}, getSlash);
+	server.post({path: '/'}, postSlash);
+}
+
+getSlash = function(req, res, next) {
 	// fs.readFile('public/index.html', 'utf8', function (err,data) {
 	// 	if (err) {
 	// 		h.logError(err,err.stack);
@@ -20,7 +25,7 @@ exports.getSlash = function(req, res, next) {
     return next(false);
 }
 
-exports.postSlash = function(req, res, next) {
+postSlash = function(req, res, next) {
 	res.json(200,{"info":"Velkominn á apis.is! Kíktu á docs.apis.is í vafranum þínum fyrir frekari upplýsingar!"});
 	return next();
 }

endpoints/house/index.js

@@ -1,5 +1,10 @@
-//Ókl!
-exports.slash = function(req, res, next){
+//Incomplete
+
+exports.setup = function(){
+	server.post({path: '/house', version: '1.0.0'}, slash);
+}
+
+slash = function(req, res, next){
 	var data = req.params;
 	res.charSet = 'utf8';
 

endpoints/static_endpoints/help_out.js

@@ -0,0 +1,5 @@
+exports.setup = function(){
+	server.post({path: '/help_out', version: '1.0.0'}, function(req, res, next){
+		res.json(200,{message:'Send us mail: [email protected] ,thanks for your interest!'});
+	});
+}

endpoints/static_endpoints/phone.js

@@ -0,0 +1,10 @@
+exports.setup = function(){
+	server.post({path: '/phone', version: '1.0.0'}, function(req, res, next){
+		res.json(410,{error:"This api endpoint has been closed and it will not be available in the foreseeable future."});
+		return next();
+	});
+	server.post({path: '/phone', version: '2.0.0'}, function(req, res, next){
+		res.json(410,{error:"This api endpoint has been closed and it will not be available in the foreseeable future."});
+		return next();
+	});
+}

endpoints/word/index.js

@@ -1,5 +1,9 @@
 //Very incomplete
-exports.slash = function(req, res, next){
+exports.setup = function(){
+	server.post({path: '/word', version: '1.0.0'}, slash);
+}
+
+slash = function(req, res, next){
 
 	var data = req.params;
 

lib/endpoints.js

@@ -1,88 +1,16 @@
-/**
- * Registers an endpoint onto the server handle
- */
-function register(endpoint,data){
-	console.log('- '+endpoint);
-	switch(endpoint){
-		case 'frontpage':
-			server.get({path: '/'}, data.getSlash);
-			server.post({path: '/'}, data.postSlash);
-			break;
-		case 'bus':
-			server.post({path: '/bus/search', version: '1.0.0'}, data.search);
-			server.post({path: '/bus/realtime', version: '1.0.0'}, data.realtime);
-			break;
-		case 'sms':
-			server.post({path: '/sms', version: '1.0.0'}, data.slash);
-			break;
-		case 'currency':
-			server.post({path: '/currency', version: '1.0.0'}, data.slash);
-			break;
-		case 'currency.m5':
-			server.get({path: '/currency/m5', version: '1.0.0'}, data.slash);
-			break;
-		case 'currency.arion':
-			server.get({path: '/currency/arion', version: '1.0.0'}, data.slash);
-			break;
-		case 'company':
-			server.post({path: '/company', version: '1.0.0'}, data.slash);
-			break;
-		case 'car':
-			server.post({path: '/car', version: '1.0.0'}, data.slash);
-			break;
-		case 'flight':
-			server.post({path: '/flight', version: '1.0.0'}, data.slash);
-			break;
-		case 'house':
-			//Incomplete
-			server.post({path: '/house', version: '1.0.0'}, data.slash);
-			break;
-		case 'word':
-			//Incomplete
-			server.post({path: '/word', version: '1.0.0'}, data.slash);
-			break;
-		case 'phone':
-			server.post({path: '/phone', version: '1.0.0'}, function(req, res, next){
-				res.json(410,{error:"This api endpoint has been closed and it will not be available in the foreseeable future."});
-				return next();
-			});
-			server.post({path: '/phone', version: '2.0.0'}, function(req, res, next){
-				res.json(410,{error:"This api endpoint has been closed and it will not be available in the foreseeable future."});
-				return next();
-			});
-			break;
-		case 'help_out':
-			server.post({path: '/help_out', version: '1.0.0'}, function(req, res, next){
-				res.json(200,{message:'Send us mail: [email protected] ,thanks for your interest!'});
-			});
-			break;
-		default:
-			break;
-	}
-}
-
 /**
  * Loads upp all the required endpoints
  */
-exports.load = function(){
-	console.log('Registering endpoints:');
+exports.load = function(){	
 	//Load all endpoints in the endpoints folder
  	//walk is blocking on purpose because the server can't listen yet
 	fileModule.walk('./endpoints', function(a, dirPath, dirs, files){
 		if(files){
 			files.forEach(function(file,key){
-				var fileName = file.replace('/index.js','')
-									.replace('.js','')
-									.replace('endpoints/','')
-									.replace('/','.'),
-	 				requiredData = require('../'+file);
-	 			register(fileName,requiredData);
-			})
+				//Setup the endpoint via the setup function
+				require('../'+file).setup();
+			});
 		}
 
 	});
-
-	//Register endpoins that do not have file associated.
-	register('phone',null);
-	register('help_out',null);
 }

lib/helpers.js

@@ -164,13 +164,15 @@ exports.logError = function(error,stack){
 	//var data = {error:error,stack:stack,timestamp:h.mysqlTimestamp()};
 	console.log(error);
 	console.log(stack)
+	return true;
 }
 
 /**
  * Logs endpoints visits
  */
 exports.logVisit = function(endpoint,data,testMode){
 	// 	var data = {endpoint:endpoint,data:JSON.stringify(data),timestamp:h.mysqlTimestamp(),test:1}
+	return true;
 }
 
 /**

package.json

@@ -13,6 +13,7 @@
 		"jquery": "1.8.x",
 		"scraper" : "0.0.9",
 		"moment": "2.0.0",
-		"file": "0.1.x"
+		"file": "0.1.x",
+		"nodeunit": "0.7.x"
 	}
 }

test/helpers.js

@@ -0,0 +1,5 @@
+exports['check-globals'] = function (test) {
+	var server = require('../server.js');
+    test.ok(server.moment,'Moment.js module not loaded properly');
+    test.done();
+};

test/test-server.js

@@ -0,0 +1,5 @@
+exports['check-globals'] = function (test) {
+	var server = require('../server.js');
+    test.ok(server.moment);
+    test.done();
+};