refactor(Connection, Discoverable): Finished es2015 refactor

Author: jspizziri

dist/index.js

@@ -1,5 +1,5 @@
 // Import Connect
-import Connect from './lib/Connect';
+import Connection from './lib/Connection';
 
-// Export Connect
-export default Connect;
+// Export Connection
+module.exports = Connection;

dist/index.js.map

@@ -12,7 +12,7 @@ let instance = null;
 
 class Connection {
 
-  constructor(database, username, password, options={}, discover=["/model"], matcher=null, logger=console) {
+  constructor(database, username, password, options={}, discover=["/model"], matcher=null, logger=false) {
 
     if(instance) return instance;
 
@@ -28,7 +28,9 @@ class Connection {
     this.models = {};
     this.Sequelize = Sequelize; // Expose Sequelize
 
-    this._connect()
+    instance = this._connect();
+
+    return instance
       .then((connection) => {
         return instance = connection;
       });
@@ -43,10 +45,10 @@ class Connection {
     // return the instance, although this shouldn't be being called externally
     if(instance) return instance;
 
-    this.logger.log("info", "Connecting to: " + this.database + " as: " + this.username);
+    this._log("info", "Connecting to: " + this.database + " as: " + this.username);
 
     // Instantiate a new sequelize instance
-    let sequelize = new db.Sequelize(this.database, this.username, this.password, this.options);
+    let sequelize = new this.Sequelize(this.database, this.username, this.password, this.options);
     let models = {};
 
 
@@ -59,43 +61,52 @@ class Connection {
         let model  = sequelize["import"](path);
 
         if(model) {
-          this.logger.log("debug", "Import for path succeeded: " + path);
+          this._log("debug", "Import for path succeeded: " + path);
           models[model.name] = model;
         } else {
-          this.logger.log("debug", "Import for path failed: " + path);
+          this._log("debug", "Import for path failed: " + path);
         }
 
       })
       .then((path) => {
         // Execute the associate methods for each Model
-        this.logger.log("info","Import completed");
+        this._log("info","Import completed");
 
         return Promise.each(Object.keys(models), (modelName) => {
 
           if ("associate" in models[modelName]) {
-            this.logger.log("debug", "Associating Model: "+ modelName);
+            this._log("debug", "Associating Model: "+ modelName);
             models[modelName].associate(models);
           } else {
-            this.logger.log("debug", "Nothing to associate for Model: "+ modelName);
+            this._log("debug", "Nothing to associate for Model: "+ modelName);
           }
         });
 
       })
       .then(() => {
         // Syncronize the DB
-        this.logger.log("info", "Finished connecting to: " + database + " as: " + username);
+        this._log("info", "Finished connecting to: " + this.database + " as: " + this.username);
         return sequelize.sync();
 
       })
       .then(() => {
-        this.logger.log("info", "Finished synchronizing " + database);
+        this._log("info", "Finished synchronizing " + this.database);
         // Expose objects
         this.sequelize = sequelize;
         this.models    = models;
 
         return this;
       });
   }
+
+  /**
+   * Attempt to log
+   * @param  {String} message Message to log
+   * @return {null}
+   */
+  _log(level, message){
+    this.logger ? this.logger.log(level, message) : false;
+  }
 }
 
-export default Connection;
+module.exports =  Connection;

dist/lib/Connect.js.map

@@ -6,7 +6,7 @@ let fs = Promise.promisifyAll(f);
 
 class Discoverable {
 
-  constructor(paths, matcher, logger=console){
+  constructor(paths, matcher, logger=false){
     this.paths = paths;
     this.matcher = matcher;
     this.logger = logger;
@@ -22,19 +22,19 @@ class Discoverable {
 
     let discovered = [];
 
-    return Promise.each(this.paths, function(location){
+    return Promise.each(this.paths, (location) => {
 
       // Recurse through the api directory and collect the models
       return this._dive(location)
         .then((results) => {
-          this.logger.log("debug", "Flattening results");
+          this._log("debug", "Flattening results");
           return _.flatten(results, true);
         })
         .filter((value) => {
           return value !== false
         })
         .then((results) => {
-          this.logger.log("debug", "Assigning filtered results to discover: " + results);
+          this._log("debug", "Assigning filtered results to discover: " + results);
           return discovered = results;
         });
 
@@ -61,18 +61,27 @@ class Discoverable {
       } else {
         // Allow user to define a custom matcher function
         if(typeof this.matcher === 'function' && this.matcher(file) === true) {
-          this.logger.log("debug", "Discovered path: " + path);
+          this._log("debug", "Discovered path: " + path);
           return path;
         } else if((file.indexOf(".") !== 0) && (file.indexOf(".model.js") > 0)) {
-          this.logger.log("debug", "Discovered path: " + path);
+          this._log("debug", "Discovered path: " + path);
           return path;
         }
 
         return false;
       }
     });
 
-  };
+  }
+
+  /**
+   * Attempt to log
+   * @param  {String} message Message to log
+   * @return {null}
+   */
+  _log(level, message){
+    this.logger ? this.logger.log(level, message) : false;
+  }
 }
 
-export default Discoverable;
+module.exports =  Discoverable;

dist/lib/Connect.js dist/lib/Connection.js

@@ -34,7 +34,7 @@
     "babel-eslint": "^6.0.4",
     "babel-preset-es2015": "^6.9.0",
     "babelify": "^7.3.0",
-    "commitizen": "^2.7.6",
+    "commitizen": "^2.8.1",
     "cz-conventional-changelog": "^1.1.5",
     "eslint": "^2.10.2",
     "gulp": "^3.9.1",