From 8d1553e0e853a0a0f45858bde4813f31be52b92a Mon Sep 17 00:00:00 2001 From: George Yamana Date: Tue, 24 Mar 2015 01:55:33 +1100 Subject: [PATCH 1/3] Commit changes required for assignment 2 Missed out on assignment 1 but hope that is OK. --- lib/index.js | 16 +++++----------- lib/version.js | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 lib/version.js diff --git a/lib/index.js b/lib/index.js index c97a4c6..2386add 100755 --- a/lib/index.js +++ b/lib/index.js @@ -2,8 +2,6 @@ var Hapi = require('hapi'); var Hoek = require('hoek'); -var Package = require('../package.json'); - // Declare internals @@ -15,15 +13,11 @@ 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) { - - return reply({ version: Package.version }); - } + server.register({ + register: require('./version') + }, function(err) { + if (err) { + console.error('Failed to load plugin:', err); } }); diff --git a/lib/version.js b/lib/version.js new file mode 100644 index 0000000..4156928 --- /dev/null +++ b/lib/version.js @@ -0,0 +1,21 @@ +'use strict'; + +var Package = require('../package.json'); + +exports.register = function (server, options, next) { + server.route({ + method: 'GET', + path: '/version', + config: { + description: 'Returns the version of the server', + handler: function (request, reply) { + return reply({ version: Package.version }); + } + } + }); + next(); +}; + +exports.register.attributes = { + pkg: Package +}; \ No newline at end of file From 32c2f7717d1f402d8b833051fb56d84657e2d271 Mon Sep 17 00:00:00 2001 From: George Yamana Date: Tue, 24 Mar 2015 02:29:07 +1100 Subject: [PATCH 2/3] Minor formatting changes --- lib/index.js | 5 ++--- lib/version.js | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/index.js b/lib/index.js index 2386add..30a546f 100755 --- a/lib/index.js +++ b/lib/index.js @@ -2,19 +2,18 @@ var Hapi = require('hapi'); var Hoek = require('hoek'); +var Vertsion = require('./version'); // Declare internals - var internals = {}; - internals.init = function () { var server = new Hapi.Server(); server.connection({ port: 8000 }); server.register({ - register: require('./version') + register: Vertsion }, function(err) { if (err) { console.error('Failed to load plugin:', err); diff --git a/lib/version.js b/lib/version.js index 4156928..1e93ae1 100644 --- a/lib/version.js +++ b/lib/version.js @@ -2,6 +2,7 @@ var Package = require('../package.json'); +//Plugin exports.register = function (server, options, next) { server.route({ method: 'GET', @@ -16,6 +17,7 @@ exports.register = function (server, options, next) { next(); }; +//Attributes exports.register.attributes = { pkg: Package }; \ No newline at end of file From fc8934c43762fb4daead0924b781b423e1155d74 Mon Sep 17 00:00:00 2001 From: George Yamana Date: Tue, 24 Mar 2015 13:54:04 +1100 Subject: [PATCH 3/3] Applied updates and fixes as per feedback from hueniversity/hueniversity#69 Thank you --- lib/index.js | 17 ++++++++--------- lib/version.js | 9 ++++++--- package.json | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/lib/index.js b/lib/index.js index 30a546f..de70b66 100755 --- a/lib/index.js +++ b/lib/index.js @@ -2,7 +2,7 @@ var Hapi = require('hapi'); var Hoek = require('hoek'); -var Vertsion = require('./version'); +var Version = require('./version'); // Declare internals var internals = {}; @@ -13,17 +13,16 @@ internals.init = function () { server.connection({ port: 8000 }); server.register({ - register: Vertsion - }, function(err) { - if (err) { - console.error('Failed to load plugin:', err); - } - }); + register: Version - server.start(function (err) { + }, function(err) { Hoek.assert(!err, err); - console.log('Server started at: ' + server.info.uri); + server.start(function (err) { + + Hoek.assert(!err, err); + console.log('Server started at: ' + server.info.uri); + }); }); }; diff --git a/lib/version.js b/lib/version.js index 1e93ae1..006b1d0 100644 --- a/lib/version.js +++ b/lib/version.js @@ -4,20 +4,23 @@ var Package = require('../package.json'); //Plugin exports.register = function (server, options, next) { + server.route({ method: 'GET', path: '/version', config: { description: 'Returns the version of the server', handler: function (request, reply) { + return reply({ version: Package.version }); } } }); - next(); + + return next(); }; //Attributes exports.register.attributes = { - pkg: Package -}; \ No newline at end of file + name: 'version' +}; 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": {