add the routes asynchronously, so 404 works correctly, #13

Author: kba

src/routes/execute.coffee

@@ -4,8 +4,7 @@ Fs     = require 'fs'
 CONFIG = require '../config'
 Request = require 'superagent'
 
-module.exports = (app, opts) ->
-	opts or= {}
+module.exports = (app, done) ->
 
 	app.swagger '/api/execute',
 		post:
@@ -59,3 +58,5 @@ module.exports = (app, opts) ->
 						res.send '@link': executionUri
 						res.status 201
 						return res.end()
+
+	done()

src/routes/header.coffee

@@ -1,5 +1,7 @@
-module.exports = (app, opts) ->
-	opts or= {}
+module.exports = (app, done) ->
 
 	app.get '/_header', (req, res, next) ->
 		res.render 'header'
+
+	done()
+

src/routes/json-import.coffee

@@ -64,9 +64,7 @@ _postResource = (origDB, resourceEndpoint, callback) ->
 		return callback err if err
 		return callback null, _replaceAll(origDB, mapping)
 
-module.exports = (app, opts) ->
-
-	opts or= {}
+module.exports = (app, done) ->
 
 	app.swagger '/api/json-import',
 		post:
@@ -114,3 +112,5 @@ module.exports = (app, opts) ->
 				, (err) ->
 					return next err if err
 					return res.send JSON.stringify JSON.parse(serializedDB), null, 2
+
+	done()

src/routes/ldf.coffee

@@ -1,5 +1,3 @@
+module.exports = (app, done) ->
 
-module.exports = (app, opts) ->
-	opts or= {}
-
-	app.schemo.handlers.ldf.inject(app, opts)
+	app.schemo.handlers.ldf.inject(app, done)

src/routes/monitor.coffee

@@ -5,8 +5,7 @@ CONFIG = require '../config'
 
 log = require('../log')(module)
 
-module.exports = (app, opts) ->
-	opts or= {}
+module.exports = (app, done) ->
 
 	app.swagger '/api/stats',
 		get:
@@ -82,4 +81,5 @@ module.exports = (app, opts) ->
 						return res.render 'monitor', { byStatus, statuses, allExecutions }
 					else
 						return res.send allExecutions
+	done()
 

src/routes/play.coffee

@@ -2,9 +2,9 @@ BodyParser = require 'body-parser'
 
 log = require('../log')(module)
 
-module.exports = (app, opts) ->
-	opts or= {}
+module.exports = (app, done) ->
 
 	app.get '/play/demo1', (req, res, next) ->
 		res.render 'demo-upload'
 
+	done()

src/routes/restful.coffee

@@ -1,6 +1,5 @@
-module.exports = (app, opts) ->
-	opts or= {}
+module.exports = (app, done) ->
 
 	# restful handlers
-	app.schemo.handlers.restful.inject(app)
+	app.schemo.handlers.restful.inject(app, done)
 

src/routes/schemo.coffee

@@ -1,12 +1,12 @@
-module.exports = setupRoutes = (app, opts) ->
-	opts or= {}
-
-	# schema handlers
-	app.schemo.handlers.schema.inject(app)
+module.exports = setupRoutes = (app, done) ->
 
 	# Schema handler for the ontology, i.e. /schema
 	app.get(app.schemo.schemaPrefix,
 		(req, res, next) ->
 			req.jsonld = app.schemo.jsonldTBox()
 			next()
 		app.jsonldMiddleware)
+
+	# schema handlers
+	app.schemo.handlers.schema.inject(app, done)
+

src/routes/swagger.coffee

@@ -1,5 +1,4 @@
-module.exports = (app, opts) ->
-	opts or= {}
+module.exports = (app, done) ->
 
 	# Swagger interface
 	app.get '/api', (req, res, next) ->
@@ -21,4 +20,4 @@ module.exports = (app, opts) ->
 			}
 		]
 		paths: app.swagger()
-	}
+	}, done

src/routes/syntax-highlight.coffee

@@ -3,8 +3,7 @@ Vim2Html   = require 'vim2html'
 
 log = require('../log')(module)
 
-module.exports = (app, opts) ->
-	opts or= {}
+module.exports = (app, done) ->
 
 	app.swagger '/api/syntax-highlight', 
 		post:
@@ -64,3 +63,5 @@ module.exports = (app, opts) ->
 			if err
 				return next err
 			res.send highlighted
+
+	done()

src/routes/upload.coffee

@@ -5,10 +5,8 @@ Fs     = require 'fs'
 CONFIG = require '../config'
 Request = require 'superagent'
 
-module.exports = (app, opts) ->
+module.exports = (app, done) ->
 
-	opts or= {}
-	
 	app.swagger '/api/upload',
 		post:
 			tags: ['essential']
@@ -92,3 +90,5 @@ module.exports = (app, opts) ->
 								res.status 201
 								res.header 'Location', fileModel.uri()
 								res.send '@link': fileModel.uri()
+
+	done()

src/server.coffee

@@ -108,7 +108,7 @@ class InfolisWebservice
 		# Log access
 		@app.use accessLogger
 		@app.use accessLoggerDev
-		controlers = [
+		controllers = [
 			'header'
 			'restful'
 			'schemo'
@@ -121,9 +121,9 @@ class InfolisWebservice
 			'syntax-highlight'
 			'play'
 		]
-		Async.eachSeries controlers, (controller, done) =>
+		Async.eachSeries controllers, (controller, done) =>
 			log.info "Setting up route #{controller}"
-			done null, require("./routes/#{controller}")(@app)
+			require("./routes/#{controller}")(@app, done)
 		, (err, next) =>
 			# root route
 			@app.get '/', (req, res, next) ->