more private function scoping

lib/emitters/custom-event-emitter.js

+var sys          = require("sys")
+  , EventEmitter = require("events").EventEmitter
+
+module.exports = (function() {
+  var CustomEventEmitter = function(fct) {
+    this.fct = fct
+  }
+  sys.inherits(CustomEventEmitter, EventEmitter)
+
+  CustomEventEmitter.prototype.run = function() {
+    var self = this
+
+    // delay the function call and return the emitter
+    setTimeout(function(){
+      self.fct.call(self, self)
+    }, 5)
+
+    return this
+  }
+
+  return CustomEventEmitter
+})()

lib/null-emitter.js → lib/emitters/null-emitter.js

-var Utils = require("./utils")
-var NullEmitter = module.exports = function(delay) {
+var Utils = require("../utils")
+
+module.exports = (function(){
+  var NullEmitter = function(delay) {
     var self = this
 
     delay = delay || 10
     setTimeout(function() { self.emitNull() }, delay)
-}
-Utils.addEventEmitter(NullEmitter)
+  }
+  Utils.addEventEmitter(NullEmitter)
 
-NullEmitter.prototype.emitNull = function() {
+  NullEmitter.prototype.emitNull = function() {
     this.emit('success', null)
     this.emit('failure', null)
-}
\ No newline at end of file
+  }
+
+  return NullEmitter
+})()

lib/model-factory.js

@@ -105,7 +105,7 @@ module.exports = (function() {
 
         options = {where: where}
     } else if((options == null) || (options == undefined)) {
-      var NullEmitter = require("./null-emitter")
+      var NullEmitter = require("./emitters/null-emitter")
       return new NullEmitter()
     }
 

lib/model-manager.js

-var ModelManager = module.exports = function(sequelize) {
+module.exports = (function() {
+  var ModelManager = function(sequelize) {
     this.models = []
     this.sequelize = sequelize
-}
+  }
 
-ModelManager.prototype.addModel = function(model) {
+  ModelManager.prototype.addModel = function(model) {
     model.modelManager = this
     this.models.push(model)
+
     return model
-}
+  }
 
-ModelManager.prototype.removeModel = function(model) {
+  ModelManager.prototype.removeModel = function(model) {
     this.models = this.models.filter(function(_model) {
       return _model.name != model.name
     })
-}
+  }
 
-ModelManager.prototype.getModel = function(modelName) {
+  ModelManager.prototype.getModel = function(modelName) {
     var model = this.models.filter(function(model) {
       return model.name == modelName
     })
+
     return !!model ? model[0] : null
-}
+  }
 
-ModelManager.prototype.__defineGetter__('all', function() {
+  ModelManager.prototype.__defineGetter__('all', function() {
     return this.models
-})
+  })
+
+  return ModelManager
+})()

lib/utils.js

@@ -152,17 +152,6 @@ var Utils = module.exports = {
   }
 }
 
-// Some nice class accessors
-var CustomEventEmitter = Utils.CustomEventEmitter = function(fct) {
-  this.fct = fct
-}
-Utils.addEventEmitter(CustomEventEmitter)
-
-CustomEventEmitter.prototype.run = function() {
-  var self = this
-  setTimeout(function(){ self.fct.call(self, self) }, 5) // delay the function call and return the emitter
-  return this
-}
-
+Utils.CustomEventEmitter = require("./emitters/custom-event-emitter")
 Utils.QueryChainer = require("./query-chainer")
 Utils.Lingo = require("lingo")