nails-boilerplate 1.2.1 → 1.3.1

package/lib/controller.js

@@ -61,6 +61,7 @@ class Controller {
 
   /** Initializes local and global routes defined on the Controller subclass */
   _registerControllerRoutes() {
+    const defaultToJson = !!this.json;
     const controllerName = this._getControllerName();
     if (this.routes && this.routes.length) {
       const localizedRoutes = this.routes.map(route => {
@@ -71,6 +72,14 @@ class Controller {
             ? route[1]
             : route[1].startsWith('./') ? route[1].replace('./', routePrefix) : routePrefix + route[1];
         const modifiedOptions = {...route[2]};
+        // TODO: introduce a shorthand so action doesn't have to be redefined everywhere
+        if (!('json' in modifiedOptions)) modifiedOptions.json = defaultToJson;
+        if (!('action' in modifiedOptions)
+            && !modifiedDestination.includes(":action")
+            && !Object.values(modifiedOptions).includes('action')) {
+          const destinationParts = modifiedDestination.split("/");
+          modifiedOptions.action = destinationParts[destinationParts.length - 1];
+        }
         modifiedOptions.controller = controllerName;
         return [route[0], modifiedDestination, modifiedOptions];
       });

package/lib/model_v2.js

@@ -2,7 +2,10 @@ let dbConnector = null;
 
 export default class Model {
   static setConnector(connector) {
-    if (!dbConnector) dbConnector = connector;
+    // TODO: enforce environment using variables
+    if (dbConnector)
+      console.warn("WARNING: Model#setConnector should not be called multiple times outside of tests");
+    dbConnector = connector;
   }
 
   constructor(modelName, connectorOptions) {

package/lib/nails.js

@@ -20,6 +20,7 @@ import ModelV2 from './model_v2.js';
 import Router from './router.js';
 
 import express_app from './application.js';
+import DbConnector from './database_connector.js';
 
 const models = {};
 
@@ -81,7 +82,7 @@ async function configure( app_config ) {
   }
   // TODO: make this Model style mandatory
   console.log("Connecting to DB...");
-  if (DBConnector.connect && DBConnector.generateModelSuperclass) {
+  if (DBConnector instanceof DbConnector) {
     console.log("Generating model superclass...");
     await DBConnector.connect(app_config.db);
     ModelV2.setConnector(DBConnector);

package/lib/sequelize_connector.js

@@ -20,6 +20,7 @@ export default class SequelizeConnector extends DbConnector {
   }
 
   async afterInitialization() {
-    this.sequelize.sync({alter: true});
+    console.log("SEQUELIZE::Writing changes to SQL Database");
+    await this.sequelize.sync({alter: true});
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nails-boilerplate",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "description": "A node.js webserver scaffold",
   "type": "module",
   "main": "index.js",

package/spec/sequelize_connector.spec.js

@@ -19,7 +19,7 @@ describe('ModelV2 using SequelizeConnector', function() {
   let util;
   beforeEach(async function() {
     util = new SequelizeConnectorUtil();
-    let connector = await util.getTestConnector();
+    const connector = await util.getTestConnector();
     Model.setConnector(connector);
     TestSequelizeModel =
         class TestSequelizeModel extends new Model("TestSequelizeModel", TEST_SCHEMA) {

package/spec/services/integration/server/controllers/default_json_controller.js

@@ -0,0 +1,20 @@
+import nails from "../../../../../index.js";
+
+export default class DefaultJsonController extends nails.Controller {
+  json = true;
+  routes = [
+    ['get', 'arbi/trary/testautoaction'],
+    ['get', 'arbi/trary/testautojson', {action: 'testautojson'}],
+    ['get', 'arbi/trary/testjsonoverridden', {action: 'testnojson', json: false}],
+  ];
+
+  testautoaction(params, request, response) {
+    return {json_testautoaction: true};
+  }
+
+  testautojson(params, request, response) {
+    return {json_testautojson: true};
+  }
+
+  testnojson(params, request, response) {}
+}

package/spec/services/integration/server/views/defaultjson/testnojson.ejs

@@ -0,0 +1 @@
+I am some arbitrary text

package/spec/services.integration.spec.js

@@ -89,6 +89,35 @@ describe("Integration", function () {
         });
     });
   });
+  describe("Get /defaultjson/arbi/trary", function () {
+    it("Should default to json if not present in route options", function(done) {
+      request.execute(express_app)
+        .get('/defaultjson/arbi/trary/testautojson')
+        .end((err, res) => {
+          res.should.have.status(200);
+          assert(res.text == JSON.stringify({ json_testautojson: true }));
+          done();
+        });
+    });
+    it("Should autoassign the action if not present in route options", function(done) {
+      request.execute(express_app)
+        .get('/defaultjson/arbi/trary/testautoaction')
+        .end((err, res) => {
+          res.should.have.status(200);
+          assert(res.text == JSON.stringify({ json_testautoaction: true }));
+          done();
+        });
+    });
+    it("Should not render json if route options explicitly say not to", function(done) {
+      request.execute(express_app)
+        .get('/defaultjson/arbi/trary/testjsonoverridden')
+        .end((err, res) => {
+          res.should.have.status(200);
+          assert(res.text == 'I am some arbitrary text');
+          done();
+        });
+    })
+  });
   describe("GET /^\\/(\\w+)\\/(\\w+)$/i", function () {
     it('should route to home_controller#testaction', function (done) {
       request.execute(express_app)