nails-boilerplate 2.0.8 → 2.0.10

package/lib/sequelize_connector.js

@@ -16,6 +16,9 @@ export default class SequelizeConnector extends DbConnector {
   }
 
   generateModelSuperclass(name, options) {
+    if (options.schema) {
+      return this.sequelize.define(name, options.schema, options.options);
+    }
     return this.sequelize.define(name, options);
   }
 

package/package.json

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

package/spec/sequelize_connector.spec.js

@@ -14,6 +14,22 @@ const TEST_SCHEMA = {
   cash: DataTypes.INTEGER,
 }
 let TestSequelizeModel = null;
+let TestSequelizeIndexedModel = null;
+
+const TEST_OPTIONS = {
+  schema: {
+    label: DataTypes.STRING,
+    value: DataTypes.STRING,
+  },
+  options: {
+    indexes: [
+      {
+        unique: true,
+        fields: ['label', 'value'],
+      },
+    ],
+  },
+};
 
 describe('ModelV2 using SequelizeConnector', function() {
   let util;
@@ -22,8 +38,9 @@ describe('ModelV2 using SequelizeConnector', function() {
     const connector = await util.getTestConnector();
     Model.setConnector(connector);
     TestSequelizeModel =
-        class TestSequelizeModel extends new Model("TestSequelizeModel", TEST_SCHEMA) {
-        };
+        class TestSequelizeModel extends new Model("TestSequelizeModel", TEST_SCHEMA) {};
+    TestSequelizeIndexedModel =
+        class TestSequelizeIndexedModel extends new Model("TestSequelizeIndexedModel", TEST_OPTIONS) {};
     await connector.sequelize.sync({ force: true });
   });
 
@@ -36,4 +53,39 @@ describe('ModelV2 using SequelizeConnector', function() {
     assert(models[0].name == MODEL_NAME, "Name should be consistent");
     assert(models[0] instanceof TestSequelizeModel);
   });
+
+  it("Should be able to create, save, and retrieve a complex model", async function() {
+    const MODEL_LABEL = "First test model LABEL";
+    const MODEL_VALUE = "First test model VALUE";
+    const testModel = await TestSequelizeIndexedModel.create({label: MODEL_LABEL, value: MODEL_VALUE});
+    const models = await TestSequelizeIndexedModel.findAll();
+    assert(models.length == 1, "Should have one model");
+    assert(models[0].label == MODEL_LABEL, "label should be persisted");
+    assert(models[0].value == MODEL_VALUE, "value should be persisted");
+    assert(models[0] instanceof TestSequelizeIndexedModel);
+  });
+
+  it("Should be able to respect unique indexes", async function() {
+    const MODEL_LABEL_0 = "MODEL_LABEL_0";
+    const MODEL_VALUE_0 = "MODEL_VALUE_0";
+    const MODEL_LABEL_1 = "MODEL_LABEL_1";
+    const MODEL_VALUE_1 = "MODEL_VALUE_1";
+    const testModels = await TestSequelizeIndexedModel.bulkCreate(
+      [
+        {label: MODEL_LABEL_0, value: MODEL_VALUE_0},
+        {label: MODEL_LABEL_0, value: MODEL_VALUE_1},
+        {label: MODEL_LABEL_1, value: MODEL_VALUE_0},
+        {label: MODEL_LABEL_1, value: MODEL_VALUE_1},
+      ]
+    );
+    assert(testModels.length == 4, "Should creaete 4 models");
+    let indexWasRespected = true;
+    try {
+      await TestSequelizeIndexedModel.create({label: MODEL_LABEL_0, value: MODEL_VALUE_0});
+      indexWasRespected = false;
+    } catch(e) {
+      console.log("Error was thrown as expected");
+    }
+    assert(indexWasRespected, "Should have thrown an error")
+  });
 });

package/templates/bin/start.sh

@@ -1,9 +1,16 @@
 SCRIPT_DIR=$(dirname "$0")
 echo "Script directory (relative): $SCRIPT_DIR"
 
+COMMAND=$1
+if [[ -z "${COMMAND}" ]]; then
+  COMMAND=start
+else
+  echo "COMMAND is NOT empty."
+fi
+
 
 SCRIPT_PATH=$(readlink -f "$0")
 SCRIPT_DIR=$(dirname "$SCRIPT_PATH")
 echo "Script directory (absolute, resolved): $SCRIPT_DIR"
 
-npm --prefix=$SCRIPT_DIR/.. start
+npm --prefix=$SCRIPT_DIR/.. run $COMMAND

package/templates/config/routes.js

@@ -22,10 +22,12 @@ export default [
   ['get', "/", {controller: 'home'}],
   // Routes all requests starting with /public as static requests to the public folder.
   ['get', '/public', {public: true}],
+
 	// A test route which routes the first part of pathname to controller and the second to the action
-	['get', /^\/(\w+)\/(\w+)$/i, {0: 'controller', 1: 'action'}],
+	// ['get', /^\/(\w+)\/(\w+)$/i, {0: 'controller', 1: 'action'}],
+
   // Maps the first two parts of the path to controller and action, and the third to the id parameter
-  ['get', "/:controller/:action/:id"],
+  // ['get', "/:controller/:action/:id"],
 
   // For all other GET requests, render HomeController#index
   ['get', '/:catchall', {controller: 'home'}],