Merge pull request #5 from BoolJS/develop

Refactored to decrease code complexity.

Author: pandres95

.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
-before_install:
-  - npm install booljs@latest
+before_script:
+  - npm install booljs@latest --no-save
 node_js:
   - lts/*

example

@@ -1,46 +1,16 @@
 'use strict';
 
-const _ = require('underscore');
 const Express = require('express');
 const BodyParser = require('body-parser');
 
 module.exports = async function (instance) {
-    let expressApplication = new Express();
+    const application = new Express();
 
-    // X-Powered-By: bool.js
-    expressApplication.use(function (req, res, next) {
-        res.header('X-Powered-By', 'booljs');
-        next();
-    });
-
-    var configuration = instance.getComponents().configuration.get('server');
-
-    // Sets listening hostname
-    expressApplication.set('host', (
-        process.env.IP || process.env.HOSTNAME || process.env.HOST ||
-        (configuration && (
-            configuration.ip || configuration.hostname || configuration.host
-        )) ||
-        '0.0.0.0'
-    ));
-
-    // Sets listening port
-    expressApplication.set('port', (
-        process.env.PORT || (configuration && configuration.port) || 3001
-    ));
-
-    // Enable body-parser middlewares
-    var bodyParserOptions = (configuration && configuration.body) || undefined;
-
-    if (bodyParserOptions !== undefined) {
-        expressApplication.use(BodyParser.urlencoded(
-            _.extend({ extended: true }, bodyParserOptions))
-        );
-        expressApplication.use(BodyParser.json(bodyParserOptions));
-    } else {
-        expressApplication.use(BodyParser.urlencoded({ extended: true }));
-        expressApplication.use(BodyParser.json());
-    }
+    exports.setPoweredBy(application);
+    exports.configureServer(application, instance
+        .getComponents().configuration.get('server'));
+    exports.configureBodyParser(application, instance
+        .getComponents().configuration.get('server'));
 
     // Enables Json View
     if (!instance.getComponents().views) {
@@ -51,5 +21,44 @@ module.exports = async function (instance) {
         'Json', require('../views/json'), instance.getComponents().views
     );
 
-    return expressApplication;
+    return application;
+};
+
+/**
+ * Renders the X-Powered-By header
+ * @param  {ExpressApplication} application - The express application
+ */
+exports.setPoweredBy = function (application) {
+    application.use((request, response, next) => {
+        response.header('X-Powered-By', 'booljs');
+        next();
+    });
+};
+
+/**
+ * Configures server options
+ * @param  {ExpressApplication} application - The express application
+ * @param  {Object} [configuration={}] - The configuration object
+ */
+exports.configureServer = function (application, configuration = {}) {
+    let { IP, HOSTNAME, HOST, PORT } = process.env;
+    let { ip, hostname, host, port } = configuration;
+    // Sets listening hostname
+    application.set('host',
+        IP || HOSTNAME || HOST || ip || hostname || host || '0.0.0.0');
+
+    // Sets listening port
+    application.set('port', PORT || port || 3001);
+};
+
+/**
+ * Enables body-parser middlewares
+ * @param  {ExpressApplication} application - The express application
+ * @param  {Object} [configuration={}] - The configuration object
+ */
+exports.configureBodyParser = function (application, configuration = {}) {
+    let { body: options = {} } = configuration;
+
+    application.use(BodyParser.urlencoded({ extended: true, ...options }));
+    application.use(BodyParser.json({ ...options }));
 };

lib/server/init.js

@@ -1,20 +1,16 @@
 'use strict';
 
-const _ = require('underscore');
-
-exports.execute = function (error, data, response, statusCode) {
-    let status = error ? (error.status || 500) : (statusCode || 200);
-
-    let object = { success: !error };
-
-    if (error !== undefined && error !== null) {
-        object.error = _.omit(error, 'status');
-        object.error.message = error.message || 'internal_server_error';
-    } else if (data !== undefined && data !== null) {
-        object.data = data;
+exports.execute = function (error, data, response, status = 200) {
+    if (error !== undefined && error !== null && error.status !== null) {
+        status = error.status;
+        delete error.status;
     }
 
-    response.status(status).json(object);
+    response.status(status).json({
+        success: error === undefined && error === null && !error,
+        data,
+        error
+    });
 };
 
 module.exports = class JsonView {

lib/views/json.js

@@ -1,6 +1,6 @@
 {
   "name": "booljs.express",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "Express driver for bool.js",
   "main": "index.js",
   "keywords": [
@@ -32,7 +32,6 @@
     "underscore": "1.x"
   },
   "dependencies": {
-    "async": "^2.2.0",
     "body-parser": "^1.18.2",
     "express": "^4.16.2"
   },
@@ -45,7 +44,8 @@
     "eslint-plugin-node": "^5.1.0",
     "eslint-plugin-promise": "^3.5.0",
     "eslint-plugin-standard": "^3.0.1",
-    "mocha": "^4.0.1"
+    "mocha": "^4.0.1",
+    "supertest": "^3.0.0"
   },
   "engines": {
     "node": ">=8.0.0",

package.json

@@ -1,17 +1,23 @@
-/* global describe, before, it */
 'use strict';
 
 const resolver = require('../lib/utils/resolve');
 const Bool = require('booljs');
+const Agent = require('supertest');
 
 describe('Bool.js', function () {
-    let app;
+    let server;
 
-    before(() => {
-        app = new Bool('com.example.api', [ resolver('') ])
+    before(async () => {
+        let app = await new Bool('com.example.api', [ resolver('') ])
             .setServerDrivers([ 'booljs.express' ])
-            .setBase('example');
+            .setBase('example')
+            .run();
+        server = new Agent(app.server);
     });
 
-    it('Boots using express.js', () => app.run());
+    it('GET / -> 200 OK', () => server.get('/').expect(200));
+
+    it('GET /undefined -> 501 Not Implemented', () => server
+        .get('/undefined')
+        .expect(501));
 });