From 39571f91a3f15c3e9383c5a1271fe59b0e53fa96 Mon Sep 17 00:00:00 2001
From: Chyld Medford <chyld.medford@gmail.com>
Date: Wed, 18 Mar 2015 12:09:47 -0700
Subject: [PATCH 1/4] assignment 2

---
 lib/index.js   | 28 ++++++----------------------
 lib/version.js | 26 ++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 22 deletions(-)
 create mode 100644 lib/version.js

diff --git a/lib/index.js b/lib/index.js
index c97a4c6..c0e41ad 100755
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,36 +1,20 @@
-// Load modules
-
 var Hapi = require('hapi');
 var Hoek = require('hoek');
-var Package = require('../package.json');
-
-
-// Declare internals
 
 var internals = {};
 
-
 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.start(function (err) {
+    server.register(require('./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..9e610c6
--- /dev/null
+++ b/lib/version.js
@@ -0,0 +1,26 @@
+var internals = {
+  response: {
+    version: require('../package.json').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 a347f00ad03144c59bfb47f7ec04c79396fe9bdb Mon Sep 17 00:00:00 2001
From: Chyld Medford <chyld.medford@gmail.com>
Date: Wed, 18 Mar 2015 15:10:57 -0700
Subject: [PATCH 2/4] added use strict

---
 lib/index.js   | 2 ++
 lib/version.js | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/lib/index.js b/lib/index.js
index c0e41ad..33eb9d6 100755
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var Hapi = require('hapi');
 var Hoek = require('hoek');
 
diff --git a/lib/version.js b/lib/version.js
index 9e610c6..3b0f6a5 100644
--- a/lib/version.js
+++ b/lib/version.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var internals = {
   response: {
     version: require('../package.json').version

From f6a72f578735345c425287496745c3ab8ae63e3c Mon Sep 17 00:00:00 2001
From: Chyld Medford <chyld.medford@gmail.com>
Date: Thu, 19 Mar 2015 09:58:28 -0700
Subject: [PATCH 3/4] added comments, version

---
 lib/index.js   | 4 +++-
 lib/version.js | 5 +++--
 package.json   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 33eb9d6..fca46e2 100755
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,8 +1,10 @@
-'use strict';
+// Load modules
 
 var Hapi = require('hapi');
 var Hoek = require('hoek');
 
+// Declare internals
+
 var internals = {};
 
 internals.init = function () {
diff --git a/lib/version.js b/lib/version.js
index 3b0f6a5..4b3b684 100644
--- a/lib/version.js
+++ b/lib/version.js
@@ -1,4 +1,4 @@
-'use strict';
+// Declare internals
 
 var internals = {
   response: {
@@ -24,5 +24,6 @@ exports.register = function (server, options, next) {
 };
 
 exports.register.attributes = {
-    name: 'version'
+    name: 'version',
+    version: '0.0.1'
 };
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 5ec3c3220bf69871ebffd8495bf767f8ac53a9c9 Mon Sep 17 00:00:00 2001
From: Chyld Medford <chyld.medford@gmail.com>
Date: Sun, 22 Mar 2015 11:50:21 -0700
Subject: [PATCH 4/4] moved require to top of file

---
 lib/index.js   | 3 ++-
 lib/version.js | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index fca46e2..a8e2389 100755
--- a/lib/index.js
+++ b/lib/index.js
@@ -2,6 +2,7 @@
 
 var Hapi = require('hapi');
 var Hoek = require('hoek');
+var Version = require('./version');
 
 // Declare internals
 
@@ -11,7 +12,7 @@ internals.init = function () {
 
     var server = new Hapi.Server();
     server.connection({ port: 8000 });
-    server.register(require('./version'), function (err) {
+    server.register(Version, function (err) {
 
         Hoek.assert(!err, err);
         server.start(function (err) {
diff --git a/lib/version.js b/lib/version.js
index 4b3b684..e1f0efa 100644
--- a/lib/version.js
+++ b/lib/version.js
@@ -1,8 +1,12 @@
+// Load modules
+
+var Package = require('../package.json');
+
 // Declare internals
 
 var internals = {
   response: {
-    version: require('../package.json').version
+    version: Package.version
   }
 };
 
@@ -24,6 +28,5 @@ exports.register = function (server, options, next) {
 };
 
 exports.register.attributes = {
-    name: 'version',
-    version: '0.0.1'
+    name: 'version'
 };