private method scoping

lib/connectors/connector-manager.js

-var ConnectorManager = module.exports = function(sequelize, config) {
+module.exports = (function(){
+  var ConnectorManager = function(sequelize, config) {
     throw new Error('Define the constructor!')
-}
+  }
 
-ConnectorManager.prototype.getQueryGenerator = function() {
+  ConnectorManager.prototype.getQueryGenerator = function() {
     this.__QueryGenerator = this.__QueryGenerator || require(__dirname + '/' + this.sequelize.options.connector + '/query-generator')
     return this.__QueryGenerator
-}
+  }
 
-ConnectorManager.prototype.query = function(sql, callee, options) {
+  ConnectorManager.prototype.query = function(sql, callee, options) {
     throw new Error('Define the query method!')
-}
+  }
 
-ConnectorManager.prototype.connect = function() {
+  ConnectorManager.prototype.connect = function() {
     throw new Error('Define the connect method!')
-}
+  }
 
-ConnectorManager.prototype.disconnect = function() {
+  ConnectorManager.prototype.disconnect = function() {
     throw new Error('Define the disconnect method!')
-}
+  }
 
-ConnectorManager.prototype.reconnect = function() {
+  ConnectorManager.prototype.reconnect = function() {
     this.disconnect()
     this.connect()
-}
+  }
+
+  return ConnectorManager
+})()

lib/connectors/mysql/connector-manager.js

@@ -2,7 +2,8 @@ var Query   = require("../../query")
   , Utils   = require("../../utils")
   , without = function(arr, elem) { return arr.filter(function(e) { return e != elem }) }
 
-var ConnectorManager = module.exports = function(sequelize, config) {
+module.exports = (function() {
+  var ConnectorManager = function(sequelize, config) {
     this.sequelize = sequelize
     this.client = null
     this.config = config || {}
@@ -10,10 +11,10 @@ var ConnectorManager = module.exports = function(sequelize, config) {
     this.queue = []
     this.activeQueue = []
     this.maxConcurrentQueries = (this.config.maxConcurrentQueries || 50)
-}
-Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype)
+  }
+  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype)
 
-ConnectorManager.prototype.query = function(sql, callee, options) {
+  ConnectorManager.prototype.query = function(sql, callee, options) {
     if(!this.isConnected) this.connect()
 
     var queueItem = {
@@ -21,12 +22,12 @@ ConnectorManager.prototype.query = function(sql, callee, options) {
       sql: sql
     }
 
-  this._enqueue(queueItem)
+    enqueue.call(this, queueItem)
 
     return queueItem.query
-}
+  }
 
-ConnectorManager.prototype.connect = function() {
+  ConnectorManager.prototype.connect = function() {
     var self = this
 
     this.client = require("mysql").createClient({
@@ -38,70 +39,73 @@ ConnectorManager.prototype.connect = function() {
     })
 
    this.client.setMaxListeners(this.maxConcurrentQueries)
-}
+  }
 
-ConnectorManager.prototype.disconnect = function() {
+  ConnectorManager.prototype.disconnect = function() {
     var self = this
     this.client.end(function() { self.client = null })
-}
+  }
 
-// private
+  // private
 
-ConnectorManager.prototype._enqueue = function(queueItem) {
+  var enqueue = function(queueItem) {
     if(this.activeQueue.length < this.maxConcurrentQueries) {
       this.activeQueue.push(queueItem)
-    this._execQueueItem(queueItem)
+      execQueueItem.call(this, queueItem)
     } else {
       this.queue.push(queueItem)
     }
-}
+  }
 
-ConnectorManager.prototype._dequeue = function(queueItem) {
+  var dequeue = function(queueItem) {
     this.activeQueue = without(this.activeQueue, queueItem)
-}
+  }
 
-ConnectorManager.prototype._transferQueuedItems = function(count) {
+  var transferQueuedItems = function(count) {
     for(var i = 0; i < count; i++) {
       var queueItem = this.queue[0]
       if(queueItem) {
-      this._enqueue(queueItem)
+        enqueue.call(this, queueItem)
         this.queue = without(this.queue, queueItem)
       }
     }
-}
+  }
 
-ConnectorManager.prototype._afterQuery = function(queueItem) {
+  var afterQuery = function(queueItem) {
     var self = this
 
-  this._dequeue(queueItem)
-  this._transferQueuedItems(this.maxConcurrentQueries - this.activeQueue.length)
-  this._disconnectIfNoConnections()
-}
+    dequeue.call(this, queueItem)
+    transferQueuedItems.call(this, this.maxConcurrentQueries - this.activeQueue.length)
+    disconnectIfNoConnections.call(this)
+  }
 
 
-ConnectorManager.prototype._execQueueItem = function(queueItem) {
+  var execQueueItem = function(queueItem) {
     var self = this
 
     queueItem.query
-    .on('success', function(){ self._afterQuery(queueItem) })
-    .on('failure', function(){ self._afterQuery(queueItem) })
+      .on('success', function(){ afterQuery.call(self, queueItem) })
+      .on('failure', function(){ afterQuery.call(self, queueItem) })
 
     queueItem.query.run(queueItem.sql)
-}
+  }
 
-ConnectorManager.prototype.__defineGetter__('hasNoConnections', function() {
+  ConnectorManager.prototype.__defineGetter__('hasNoConnections', function() {
     return (this.queue.length == 0) && (this.activeQueue.length == 0) && this.client._queue && (this.client._queue.length == 0)
-})
+  })
 
-ConnectorManager.prototype.__defineGetter__('isConnected', function() {
+  ConnectorManager.prototype.__defineGetter__('isConnected', function() {
     return this.client != null
-})
+  })
 
-ConnectorManager.prototype._disconnectIfNoConnections = function() {
+  var disconnectIfNoConnections = function() {
     var self = this
 
     this.disconnectTimeoutId && clearTimeout(this.disconnectTimeoutId)
     this.disconnectTimeoutId = setTimeout(function() {
       self.isConnected && self.hasNoConnections && self.disconnect()
     }, 100)
-}
+  }
+
+  return ConnectorManager
+})()

lib/connectors/query-generator.js

-var QueryGenerator = module.exports = {
+module.exports = (function() {
+  var QueryGenerator = {
     /*
       Returns a query for creating a table.
       Attributes should have the format: {attributeName: type, attr2: type2} --> {title: 'VARCHAR(255)'}
@@ -105,4 +106,8 @@ var QueryGenerator = module.exports = {
     hashToWhereConditions: function(hash) {
       throw new Error('Define the method hashToWhereConditions!')
     }
-}
+  }
+
+  return QueryGenerator
+})()
+