Merge branch 'master' of git://github.com/arnorhs/apis into arnorhs-m…

…aster MERGE
viggeh · Apr 28, 2013 · 925eb8b · 925eb8b
2 parents 94f42ea + f693fc4
commit 925eb8b
Show file tree

Hide file tree

Showing 21 changed files with 75 additions and 42 deletions.
diff --git a/endpoints/bus/index.js b/endpoints/bus/index.js
@@ -1,4 +1,7 @@
-exports.setup = function(){
+var request = require('request');
+var h = require('../../lib/helpers.js');
+
+exports.setup = function(server){
 	server.post({path: '/bus/search', version: '1.0.0'}, search);
 	server.post({path: '/bus/realtime', version: '1.0.0'}, realtime);
 }

diff --git a/endpoints/bus/realtime.js b/endpoints/bus/realtime.js
@@ -1,4 +1,6 @@
-exports.setup = function(){
+var h = require('../../lib/helpers.js');
+
+exports.setup = function(server){
 	server.post({path: '/bus/realtime', version: '1.0.0'}, realtime); //Old
 
 	server.get({path: '/bus/realtime', version: '1.0.0'}, realtime);

diff --git a/endpoints/bus/search.js b/endpoints/bus/search.js
@@ -1,4 +1,4 @@
-exports.setup = function(){
+exports.setup = function(server){
 	//Search function is broken at this point
 	//server.post({path: '/bus/search', version: '1.0.0'}, search);
 }

diff --git a/endpoints/car/index.js b/endpoints/car/index.js
@@ -1,4 +1,8 @@
-exports.setup = function(){
+var request = require('request');
+var $ = require('jquery');
+var h = require('../../lib/helpers.js');
+
+exports.setup = function(server){
 	server.post({path: '/car', version: '1.0.0'}, slash);
 }
 

diff --git a/endpoints/car/lookup.js b/endpoints/car/lookup.js
@@ -1,4 +1,8 @@
-exports.setup = function(){
+var request = require('request');
+var $ = require('jquery');
+var h = require('../../lib/helpers.js');
+
+exports.setup = function(server){
 	server.post({path: '/car', version: '1.0.0'}, lookup); //Old
 
 	server.get({path: '/car', version: '1.0.0'}, lookup);

diff --git a/endpoints/company/index.js b/endpoints/company/index.js
@@ -1,4 +1,8 @@
-exports.setup = function(){
+var request = require('request');
+var $ = require('jquery');
+var h = require('../../lib/helpers.js');
+
+exports.setup = function(server){
 	server.post({path: '/company', version: '1.0.0'}, lookup); //Old
 
 	server.get({path: '/company', version: '1.0.0'}, lookup);

diff --git a/endpoints/currency/arion.js b/endpoints/currency/arion.js
@@ -1,4 +1,8 @@
-exports.setup = function(){
+var request = require('request');
+var moment = require('moment');
+var h = require('../../lib/helpers.js');
+
+exports.setup = function(server){
 	server.get({path: '/currency/arion', version: '1.0.0'}, slash);
 }
 

diff --git a/endpoints/currency/index.js b/endpoints/currency/index.js
@@ -1,4 +1,9 @@
-exports.setup = function(){
+var request = require('request');
+var moment = require('moment');
+var $ = require('jquery');
+var h = require('../../lib/helpers.js');
+
+exports.setup = function(server){
 	server.post({path: '/currency', version: '1.0.0'}, slash);
 }
 

diff --git a/endpoints/currency/lb.js b/endpoints/currency/lb.js
@@ -1,4 +1,6 @@
-exports.setup = function(){
+var request = require('request');
+
+exports.setup = function(server){
  	server.get({path: '/currency/lb', version: '1.0.0'}, getCurrencies);
 };
 

diff --git a/endpoints/currency/m5.js b/endpoints/currency/m5.js
@@ -1,4 +1,8 @@
-exports.setup = function() {
+var request = require('request');
+var $ = require('jquery');
+var h = require('../../lib/helpers.js');
+
+exports.setup = function(server) {
 	server.get({path: '/currency/m5', version: '1.0.0'}, getCurrencies);
 };
 

diff --git a/endpoints/domainlookup/index.js b/endpoints/domainlookup/index.js
@@ -1,6 +1,10 @@
+var request = require('request');
+var $ = require('jquery');
+var h = require('../../lib/helpers.js');
+
 //Possible endpoint:
 //https://www.isnic.is/is/whois/mini.php?type=all&query=apis.is
-exports.setup = function(){
+exports.setup = function(server){
 	server.get({path: '/whois', version: '1.0.0'}, slash);
 }
 

diff --git a/endpoints/flight/index.js b/endpoints/flight/index.js
@@ -1,4 +1,8 @@
-exports.setup = function(){
+var request = require('request');
+var $ = require('jquery');
+var h = require('../../lib/helpers.js');
+
+exports.setup = function(server){
 	server.post({path: '/flight', version: '1.0.0'}, slash); //Old
 
 	server.post({path: '/flight', version: '1.0.0'}, slash);

diff --git a/endpoints/frontpage/index.js b/endpoints/frontpage/index.js
@@ -1,4 +1,4 @@
-exports.setup = function(){
+exports.setup = function(server){
 	server.get({path: '/'}, getSlash);
 	server.post({path: '/'}, postSlash);
 }

diff --git a/endpoints/house/index.js b/endpoints/house/index.js
@@ -1,6 +1,9 @@
 //Incomplete
 
-exports.setup = function(){
+var request = require('request');
+var $ = require('jquery');
+
+exports.setup = function(server){
 	server.get({path: '/house', version: '1.0.0'}, slash);
 }
 

diff --git a/endpoints/static_endpoints/frontpage.js b/endpoints/static_endpoints/frontpage.js
@@ -1,4 +1,4 @@
-exports.setup = function(){
+exports.setup = function(server){
 	server.get({path: '/'}, getFrontpage);
 	server.post({path: '/'}, postFrontpage);
 }

diff --git a/endpoints/static_endpoints/help_out.js b/endpoints/static_endpoints/help_out.js
@@ -1,4 +1,4 @@
-exports.setup = function(){
+exports.setup = function(server){
 	server.post({path: '/help_out', version: '1.0.0'}, helpOut);
 	server.get({path: '/help_out', version: '1.0.0'}, helpOut);
 	server.post({path: '/help', version: '1.0.0'}, helpOut);

diff --git a/endpoints/static_endpoints/phone.js b/endpoints/static_endpoints/phone.js
@@ -3,9 +3,9 @@ var phone = function(req, res, next){
 	return next();
 }
 
-exports.setup = function(){
+exports.setup = function(server){
 	server.post({path: '/phone', version: '1.0.0'}, phone);
 	server.get({path: '/phone', version: '1.0.0'}, phone);
 	server.post({path: '/phone', version: '2.0.0'}, phone);
 	server.get({path: '/phone', version: '2.0.0'}, phone);
-}
+}
diff --git a/endpoints/word/index.js b/endpoints/word/index.js
@@ -1,5 +1,9 @@
+var request = require('request');
+var $ = require('jquery');
+var h = require('../../lib/helpers.js');
+
 //Very incomplete
-exports.setup = function(){
+exports.setup = function(server){
 	server.post({path: '/word', version: '1.0.0'}, slash);
 }
 

diff --git a/lib/endpoints.js b/lib/endpoints.js
@@ -1,17 +1,19 @@
+var fileModule = require('file');
 /**
  * Loads upp all the required endpoints
  */
-exports.load = function(){	
+
+exports.load = function(server){
 	//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){
 				//Setup the endpoint via the setup function
-				require('../'+file).setup();
+				require('../'+file).setup(server);
 			});
 		}else{
 			console.log('There is no endpoint to load!');
 		}
 	});
-}
+}
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
 	    }
     ],
 	"dependencies" : {
-		"restify": "1.4.x",
+		"restify": "2.4.x",
 		"request": "2.11.x",
 		"jquery": "1.8.x",
 		"scraper" : "0.0.9",

diff --git a/server.js b/server.js
@@ -1,24 +1,8 @@
 /**
  * Global npm modules
  */
-exports.restify = restify = require('restify');
-exports.server = server = restify.createServer();
-
-exports.scraper = scraper = require('scraper');
-exports.request = request = require('request');
-exports.fs = fs = require('fs');
-exports.$ = $ = require('jquery');
-exports.moment = moment = require('moment');
-exports.file = fileModule = require('file');
-exports.parseString = parseString = require('xml2js').parseString;
-exports.cheerio = cheerio = require("cheerio");
-exports.isn2wgs = isn2wgs = require('isn2wgs');
-
-/**
- * Global helpers
- */
-exports.h = h = require('./lib/helpers.js');
-exports.endpoints = endpoints = require('./lib/endpoints.js');
+var restify = require('restify'),
+    server = restify.createServer();
 
 //Enables the use of posted params
 server.use(restify.bodyParser({ mapParams: true }));
@@ -27,7 +11,7 @@ server.use(restify.queryParser());
 /**
  * Endpoints setup
  */
-endpoints.load();
+require('./lib/endpoints.js').load(server);
 
 /**
  * Start the server