From 11ffd2b9db726d858571d0073985199d8ba2fa9f Mon Sep 17 00:00:00 2001 From: Oscar Funes Date: Sat, 21 Mar 2015 18:33:12 -0600 Subject: [PATCH 1/3] Move route version into its own plugin. --- lib/index.js | 17 +++++------------ lib/version.js | 25 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 lib/version.js diff --git a/lib/index.js b/lib/index.js index c97a4c6..9bb26f0 100755 --- a/lib/index.js +++ b/lib/index.js @@ -2,12 +2,12 @@ var Hapi = require('hapi'); var Hoek = require('hoek'); -var Package = require('../package.json'); - // Declare internals -var internals = {}; +var internals = { + version: require('./version') +}; internals.init = function () { @@ -15,16 +15,9 @@ internals.init = function () { var server = new Hapi.Server(); server.connection({ port: 8000 }); - server.route({ - method: 'GET', - path: '/version', - config: { - description: 'Returns the version of the server', - handler: function (request, reply) { + server.register(internals.version, function (err) { - return reply({ version: Package.version }); - } - } + Hoek.assert(!err,err); }); server.start(function (err) { diff --git a/lib/version.js b/lib/version.js new file mode 100644 index 0000000..11646d7 --- /dev/null +++ b/lib/version.js @@ -0,0 +1,25 @@ +var Package = require('../package'); + +var internals = { + response: { + version: Package.version + } +}; + +exports.register = function (server, options, next) { + + server.route({ + method: 'GET', + path: '/version', + handler: function(request, reply) { + + return reply(internals.response.version); + } + }); + + return next(); +}; + +exports.register.attributes = { + name: 'version' +}; From ee7aeb4b471621ba95f5cbc37c6b3699dff3f63c Mon Sep 17 00:00:00 2001 From: Oscar Funes Date: Sat, 21 Mar 2015 18:38:14 -0600 Subject: [PATCH 2/3] Bump version to 0.0.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3bf1561..ef4eeeb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hueniversity", - "version": "0.0.1", + "version": "0.0.2", "description": "Community learning experiment", "main": "lib/index.js", "repository": { From bf28862b9ba195fea6e39b055caca112b50205ba Mon Sep 17 00:00:00 2001 From: Oscar Funes Date: Mon, 23 Mar 2015 10:12:20 -0600 Subject: [PATCH 3/3] Move start inside the register callback and move require of module to the top. --- lib/index.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/index.js b/lib/index.js index 9bb26f0..f85548e 100755 --- a/lib/index.js +++ b/lib/index.js @@ -2,11 +2,12 @@ var Hapi = require('hapi'); var Hoek = require('hoek'); +var Version = require('./version'); // Declare internals var internals = { - version: require('./version') + version: Version }; @@ -18,12 +19,11 @@ internals.init = function () { server.register(internals.version, function (err) { Hoek.assert(!err,err); - }); - - server.start(function (err) { + server.start(function (err) { - Hoek.assert(!err, err); - console.log('Server started at: ' + server.info.uri); + Hoek.assert(!err, err); + console.log('Server started at: ' + server.info.uri); + }); }); };