From 27d988559d5e7bf5efdfec021cc7c01040d11561 Mon Sep 17 00:00:00 2001 From: Apoorva Korde Date: Fri, 15 Jan 2016 21:06:53 +0530 Subject: [PATCH 1/5] Convert to a plugin --- lib/index.js | 33 +++++++++++++-------------------- lib/version.js | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 20 deletions(-) create mode 100644 lib/version.js diff --git a/lib/index.js b/lib/index.js index c97a4c6..b5cdf9d 100755 --- a/lib/index.js +++ b/lib/index.js @@ -1,36 +1,29 @@ +'use strict'; + // Load modules -var Hapi = require('hapi'); -var Hoek = require('hoek'); -var Package = require('../package.json'); +const Hapi = require('hapi'); +const Hoek = require('hoek'); +const Version = require('./version'); // Declare internals -var internals = {}; +const internals = {}; internals.init = function () { - var server = new Hapi.Server(); + const 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.start(function (err) { + server.register(Version, 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 new file mode 100644 index 0000000..a75d8ed --- /dev/null +++ b/lib/version.js @@ -0,0 +1,35 @@ +'use strict'; + +// Load modules + +const Package = require('../package.json'); + + +// Declare internals + +const internals = { + response: { + version: Package.version; + } +}; + +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(internals.response); + } + } + }); + + return next(); +}; + +exports.register.attributes = { + name: 'version' +} From f592d48561f2beeacbc9a14b7706657fca9ffa32 Mon Sep 17 00:00:00 2001 From: Apoorva Korde Date: Fri, 15 Jan 2016 21:14:13 +0530 Subject: [PATCH 2/5] Fix typo in internals.response var --- lib/version.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/version.js b/lib/version.js index a75d8ed..19c5dc2 100644 --- a/lib/version.js +++ b/lib/version.js @@ -9,7 +9,7 @@ const Package = require('../package.json'); const internals = { response: { - version: Package.version; + version: Package.version } }; From 09eac22525590dc9ee6b4a7c0cf5f4806c4a96fc Mon Sep 17 00:00:00 2001 From: Apoorva Korde Date: Fri, 15 Jan 2016 21:40:02 +0530 Subject: [PATCH 3/5] Bump version in package.json --- package.json | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 3bf1561..a174c51 100644 --- a/package.json +++ b/package.json @@ -1,28 +1,27 @@ { - "name": "hueniversity", - "version": "0.0.1", + "name": "hapi-university", + "version": "0.0.2", "description": "Community learning experiment", "main": "lib/index.js", "repository": { "type": "git", - "url": "https://github.com/hueniverse/hueniversity.git" + "url": "https://github.com/hapijs/university.git" }, "keywords": [ "hapi", "learn", "community" ], - "license": "BSD", + "license": "BSD-3-Clause", "bugs": { - "url": "https://github.com/hueniverse/hueniversity/issues" + "url": "https://github.com/hapijs/university/issues" }, - "homepage": "https://github.com/hueniverse/hueniversity", + "homepage": "https://github.com/hapijs/university", "dependencies": { - "hapi": "8.x.x", - "hoek": "2.x.x" + "hapi": "12.x.x", + "hoek": "8.x.x" }, "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", "start": "node lib/index.js" } } From 617a67915cd91fc7b25a16f920265ea687a3da68 Mon Sep 17 00:00:00 2001 From: Apoorva Korde Date: Sun, 17 Jan 2016 18:35:03 +0530 Subject: [PATCH 4/5] Correct Hoek version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a174c51..30e054a 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "homepage": "https://github.com/hapijs/university", "dependencies": { "hapi": "12.x.x", - "hoek": "8.x.x" + "hoek": "3.x.x" }, "scripts": { "start": "node lib/index.js" From c99694f60aea20a196cae987397f3d069d798748 Mon Sep 17 00:00:00 2001 From: Apoorva Korde Date: Mon, 18 Jan 2016 22:23:23 +0530 Subject: [PATCH 5/5] Use arrow-callback --- .gitignore | 1 + lib/index.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 12db069..c67999d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ config.json */._* */*/._* coverage.* +.settings diff --git a/lib/index.js b/lib/index.js index b5cdf9d..cfdffd4 100755 --- a/lib/index.js +++ b/lib/index.js @@ -16,10 +16,10 @@ internals.init = function () { const server = new Hapi.Server(); server.connection({ port: 8000 }); - server.register(Version, function (err) { + server.register(Version, (err) => { Hoek.assert(!err, err); - server.start(function (err) { + server.start((err) => { Hoek.assert(!err, err); console.log('Server started at: ' + server.info.uri);