diff --git a/lib/createHandler.js b/lib/createHandler.js index 415c96c..7152abb 100644 --- a/lib/createHandler.js +++ b/lib/createHandler.js @@ -4,8 +4,7 @@ var ws = require('./webservice'); var createHandler = exports.createHandler = function ( module, options ){ var router = ws.createRouter( module, options || {}); return function (request, response, next) { - - router.route(request, request.body, function (result) { + router.handle(request, request.body, function (result) { var contentType = contentType = "text/html"; @@ -34,4 +33,4 @@ var createHandler = exports.createHandler = function ( module, options ){ } }); }; -} \ No newline at end of file +} diff --git a/lib/createRouter.js b/lib/createRouter.js index c3d386b..d3009df 100644 --- a/lib/createRouter.js +++ b/lib/createRouter.js @@ -17,7 +17,8 @@ var createRouter = exports.createRouter = function createRouter( module, options routes = _createMetaRoutes( module ); // create a router object with an associated routing table - var router = new(journey.Router)(function (map) { + var router = new(journey.Router)(); + router.map(function (map) { if(options.bindroot !== false){ map.root.bind(function(res){ @@ -26,17 +27,17 @@ var createRouter = exports.createRouter = function createRouter( module, options } // returns the docs of the API - map.get('/docs').bind(function (res) { + map.get('/docs').bind(function (reg, res, id) { res.send(200, {'Content-Type': 'text/html'}, ws.view.renderRoutes('html', '', routes, template.toString())); }); // returns the docs of the API - map.get('/docs.json').bind(function (res) { + map.get('/docs.json').bind(function (reg, res, id) { res.send(200, {'Content-Type': 'text/html'}, ws.view.renderRoutes('html', '', routes, JSON.stringify(routes))); }); // returns the version of the API - map.get('/version').bind(function (res) { + map.get('/version').bind(function (reg, res, id) { res.send(200, {'Content-Type': 'text/html'}, { version: journey.version.join('.') }); }); @@ -80,21 +81,13 @@ function _extendRouter( map, module, options ){ function _createJourneyHandler(module, method, options){ - var handler = function (res, resource, id, params) { + var handler = function (req, res, params) { var args = [], method_options = {}, self = this; - console.log(resource); - console.log(id); - console.log(params); - - if(typeof resource != 'object'){ - method_options.id = resource; - } - - for(var p in resource){ - if(resource[p].length){ - method_options[p] = resource[p]; + for(var p in params){ + if(params[p].length){ + method_options[p] = params[p]; } } @@ -265,4 +258,4 @@ function _createMetaRoutes( module ){ return routes; -} \ No newline at end of file +} diff --git a/lib/createServer.js b/lib/createServer.js index 016f9a4..2a35ad3 100644 --- a/lib/createServer.js +++ b/lib/createServer.js @@ -14,11 +14,14 @@ exports.createServer = function( module ){ requestHandler(request, response, function(request, response , result){ if(result.status === 404){ - response.writeHead(result.status, {'Content-Type': result['Content-Type']}, result.headers); + response.writeHead(result.status, {'Content-Type': result.headers['Content-Type']}, result.headers); response.end('404. The method you requested does not exist.'); - } + } else { + response.writeHead(result.status, {'Content-Type': result.headers['Content-Type']}, result.headers); + response.end(result.body); + } }); }); }); return server; -}; \ No newline at end of file +};