update dependencies

Author: ivailop

lib/server/app_server.js

@@ -1,12 +1,12 @@
 var path = require('path');
 var restify = require('restify');
-var Logger = require('bunyan');
+var bunyan = require('bunyan');
 var UncaughtExceptionHandler = require('./uncaught_exception_handler');
 
 var ENV = process.env.NODE_ENV;
 
 var log_path = path.resolve(__dirname, '..', '..', 'log', ENV + '.log');
-var logger = new Logger({
+var logger = bunyan.createLogger({
     name: 'app',
     streams: [
         {
@@ -31,9 +31,9 @@ function AppServer(config) {
         log: logger
     });
 
-    self.server.on('after', restify.auditLogger({
-        name: 'audit',
-        log: logger
+    self.server.on('after', restify.plugins.auditLogger({
+        log: logger,
+        event: 'after'
     }));
 
     self.server.on('uncaughtException', uncaught_exception_handler.handle);
@@ -48,8 +48,8 @@ AppServer.prototype.start = function (options) {
 
     self.server.listen(parseInt(port, 10));
 
-    self.server.use(restify.bodyParser());
-    self.server.use(restify.queryParser());
+    self.server.use(restify.plugins.bodyParser());
+    self.server.use(restify.plugins.queryParser());
 
     self.started = true;
 };

lib/server/responder.js

@@ -1,4 +1,4 @@
-var restify = require('restify');
+var errs = require('restify-errors');
 
 function is_full_url(url) {
     return url.indexOf('://') !== -1;
@@ -32,7 +32,7 @@ var responder = {
         }
 
         if (!data) {
-            return responder.error(res, new restify.InternalError("missing data"), next);
+            return responder.error(res, new errs.InternalError("missing data"), next);
         }
 
         if (typeof data !== 'object') {
@@ -86,7 +86,7 @@ var responder = {
         var status = args.status || 302;
         var content_type = 'application/json; charset=utf-8'; // maybe allow this as an optional arg?
         if (!args.url) {
-            return responder.error(res, new restify.InternalError('Redirect requires url arg'), next);
+            return responder.error(res, new errs.InternalError('Redirect requires url arg'), next);
         }
 
         if (!is_full_url(url)) {
@@ -97,7 +97,7 @@ var responder = {
             } else if (url.match(/^\//)) {
                 url = host + url; // a bit hacky
             } else {
-                return responder.error(res, new restify.InternalError('Full-path redirect url requires leading slash (/)'), next);
+                return responder.error(res, new errs.InternalError('Full-path redirect url requires leading slash (/)'), next);
             }
 
             url = prepend_http_protocol(url, req);
@@ -114,11 +114,11 @@ var responder = {
         args.contentType = args.contentType || 'application/octet-stream';
 
         if (!args.filename) {
-            return responder.error(res, new restify.InternalError('Download requires filename arg'), next);
+            return responder.error(res, new errs.InternalError('Download requires filename arg'), next);
         }
 
         if (!args.stream) {
-            return responder.error(res, new restify.InternalError('Download requires stream arg'), next);
+            return responder.error(res, new errs.InternalError('Download requires stream arg'), next);
         }
 
         res.setHeader('Content-Type', args.contentType);

lib/server/router.js

@@ -3,13 +3,12 @@ var router = {
         if (!Array.isArray(routes)) { throw new Error('routes must be an array'); }
 
         routes.forEach(function (route) {
-            if (!route.middleware) {
-                route.middleware = [];
-            }
-
-            server[route.method](route.url, route.middleware, function (req, res, next) {
+            server[route.method](route.url, function (req, res, next) {
                 route.func(req, res, next);
             });
+            if (route.middleware) {
+                server.use(route.middleware);
+            }
         });
     }
 };

package.json

@@ -3,29 +3,26 @@
   "version": "0.0.5",
   "description": "TDD boilerplate for NodeJS API apps",
   "author": "Bryan Donovan",
-  "engines": {
-    "node": ">= 0.8.11"
-  },
   "main": "./index",
   "dependencies": {
-    "async": "1.5.2",
-    "bunyan": "1.7.1",
-    "cache-manager": "1.4.0",
-    "cli-color": "0.2.2",
-    "lru-cache-cluster": "1.0.0",
-    "optimist": "0.6.0",
-    "restify": "4.0.4",
-    "settings": "0.1.1"
+    "async": "^3.2.4",
+    "bunyan": "^1.8.15",
+    "cache-manager": "^5.1.4",
+    "cli-color": "^2.0.3",
+    "lru-cache-cluster": "^1.0.0",
+    "optimist": "^0.6.0",
+    "restify": "^10.0.0",
+    "restify-clients": "^4.2.0",
+    "settings": "^0.1.1"
   },
   "devDependencies": {
     "Faker": "^0.7.2",
-    "faker": "3.0.1",
-    "istanbul": "0.4.2",
-    "jshint": "2.9.1",
-    "jshint-checkstyle-file-reporter": "0.0.1",
-    "mocha": "2.4.5",
-    "sinon": "1.17.3",
-    "xunit-file": "^1.0.0"
+    "istanbul": "^0.4.5",
+    "jshint": "^2.13.6",
+    "jshint-checkstyle-file-reporter": "^0.0.1",
+    "mocha": "^10.2.0",
+    "sinon": "^15.0.1",
+    "xunit-file": "^2.0.0"
   },
   "repository": {
     "type": "git",

test/apps/users/controller.unit.js

@@ -1,4 +1,4 @@
-var restify = require('restify');
+var errs = require('restify-errors');
 var assert = require('assert');
 var sinon = require('sinon');
 var support = require('../../support');
@@ -27,7 +27,7 @@ describe("users/controller.js", function () {
         });
 
         it("passes params to User model", function (done) {
-            sinon.stub(User, 'create', function (args, cb) {
+            sinon.stub(User, 'create').callsFake(function (args, cb) {
                 cb(null, {});
             });
 
@@ -41,8 +41,8 @@ describe("users/controller.js", function () {
 
         context("when model returns an error", function () {
             it("responds with the error", function (done) {
-                var fake_err = new restify.InvalidArgumentError('foo');
-                sinon.stub(User, 'create', function (args, cb) {
+                var fake_err = new errs.InvalidArgumentError('foo');
+                sinon.stub(User, 'create').callsFake(function (args, cb) {
                     cb(fake_err, {});
                 });
 

test/server/responder.functional.js

@@ -1,15 +1,15 @@
 var assert = require('assert');
 var fs = require('fs');
 var path = require('path');
-var restify = require('restify');
+var errs = require('restify-errors');
 var support = require('../support');
 var http = support.http;
 var responder = main.server.responder;
 var file_to_download = path.join(__dirname, '../support/fixtures', 'fake_data.js');
 
 var methods = {
     get_restify_error: function (req, res, next) {
-        var error = new restify.InvalidArgumentError('foo arg invalid');
+        var error = new errs.InvalidArgumentError('foo arg invalid');
         return responder.error(res, error, next);
     },
 
@@ -169,7 +169,7 @@ describe("functional - server/responder.js", function () {
         context("when full path passed in without leading slash", function () {
             it("returns Internal error", function (done) {
                 http_client.get('/test/redirects/full_path_without_leading_slash', function (err) {
-                    assert.equal(err.body.code, 'InternalError');
+                    assert.equal(err.body.code, 'Internal');
                     assert.ok(err.message.match(/leading slash/));
                     done();
                 });

test/server/responder.unit.js

@@ -46,7 +46,7 @@ describe("responder.js", function () {
 
         context("when no data passed in", function () {
             it("calls responder.error()", function (done) {
-                sinon.stub(responder, 'error', function (res, err, next) {
+                sinon.stub(responder, 'error').callsFake(function (res, err, next) {
                     next();
                 });
 
@@ -82,7 +82,7 @@ describe("responder.js", function () {
 
         context("when no args passed in", function () {
             it("responds with an InternalError", function (done) {
-                sinon.stub(responder, 'error', function (res, err, next) {
+                sinon.stub(responder, 'error').callsFake(function (res, err, next) {
                     next();
                 });
 
@@ -97,7 +97,7 @@ describe("responder.js", function () {
 
         context("when args.url not passed in", function () {
             it("responds with an InternalError", function (done) {
-                sinon.stub(responder, 'error', function (res, err, next) {
+                sinon.stub(responder, 'error').callsFake(function (res, err, next) {
                     next();
                 });
 
@@ -143,7 +143,7 @@ describe("responder.js", function () {
 
         context("when no args passed in", function () {
             it("responds with an InternalError", function (done) {
-                sinon.stub(responder, 'error', function (res, err, next) {
+                sinon.stub(responder, 'error').callsFake(function (res, err, next) {
                     next();
                 });
 
@@ -158,7 +158,7 @@ describe("responder.js", function () {
 
         context("when args.filename not passed in", function () {
             it("responds with an InternalError", function (done) {
-                sinon.stub(responder, 'error', function (res, err, next) {
+                sinon.stub(responder, 'error').callsFake(function (res, err, next) {
                     next();
                 });
 
@@ -174,7 +174,7 @@ describe("responder.js", function () {
 
         context("when args.stream not passed in", function () {
             it("responds with an InternalError", function (done) {
-                sinon.stub(responder, 'error', function (res, err, next) {
+                sinon.stub(responder, 'error').callsFake(function (res, err, next) {
                     next();
                 });
 
@@ -191,7 +191,7 @@ describe("responder.js", function () {
         context("when args.contentType not passed in", function () {
             it("responds with Content-Type header set to application/octet-stream", function (done) {
                 sinon.spy(fake_res, 'setHeader');
-                sinon.stub(args.stream, 'pipe', function () { });
+                sinon.stub(args.stream, 'pipe').callsFake(function () { });
 
                 delete args.contentType;
                 responder.download(fake_res, args, fake_next);
@@ -207,7 +207,7 @@ describe("responder.js", function () {
         context("when args.contentLength not passed in", function () {
             it("responds without Content-Length header set", function (done) {
                 sinon.spy(fake_res, 'setHeader');
-                sinon.stub(args.stream, 'pipe', function () { });
+                sinon.stub(args.stream, 'pipe').callsFake(function () { });
 
                 delete args.contentLength;
                 responder.download(fake_res, args, fake_next);
@@ -224,7 +224,7 @@ describe("responder.js", function () {
             it("responds without 200 status and content", function (done) {
                 sinon.spy(fake_res, 'setHeader');
                 sinon.spy(fake_res, 'status');
-                sinon.stub(args.stream, 'pipe', function () { });
+                sinon.stub(args.stream, 'pipe').callsFake(function () { });
 
                 responder.download(fake_res, args, fake_next);
 

test/server/router.unit.js

@@ -48,14 +48,15 @@ describe("server/router.js", function () {
 
     describe("register_routes()", function () {
         it("adds routes to server", function () {
-            assert.strictEqual(Object.keys(server.routes).length, 0);
+            assert.ok(Object.keys(server.router.getRoutes()).length === 0);
             assert.strictEqual(routes.length, 2);
 
             router.register_routes(server, routes);
 
-            assert.strictEqual(Object.keys(server.routes).length, 2);
-            assert.ok(server.routes['gettestfoo']);
-            assert.ok(server.routes['gettestbar']);
+            var new_routes = server.router.getRoutes();
+            assert.strictEqual(Object.keys(new_routes).length, 2);
+            assert.ok(new_routes['gettestfoo']);
+            assert.ok(new_routes['gettestbar']);
         });
 
         it("throws error if routes are not an array", function () {

test/support/http.js

@@ -1,4 +1,5 @@
 var restify = require('restify');
+var clients = require('restify-clients');
 var host = process.env.HOST || 'localhost';
 var port = process.env.PORT;
 
@@ -13,8 +14,8 @@ if (!port) {
 function TestServer(args) {
     this.routes = args.routes;
     this.server = restify.createServer();
-    this.server.use(restify.bodyParser());
-    this.server.use(restify.queryParser());
+    this.server.use(restify.plugins.bodyParser());
+    this.server.use(restify.plugins.queryParser());
     main.server.router.register_routes(this.server, this.routes);
 }
 
@@ -59,7 +60,7 @@ function HttpClient(args) {
         break;
     }
 
-    this.client = restify[method]({url: this.url});
+    this.client = clients[method]({url: this.url});
 }
 
 HttpClient.prototype.get = function (path_or_options, cb) {