Merge pull request #9 from zipang/master

Setting up the context of controllers' calls
chetan51 · Jul 19, 2012 · bc72e8a · bc72e8a
2 parents 37b9df8 + 5f9707f
commit bc72e8a
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/lib/ni.js b/lib/ni.js
@@ -23,10 +23,12 @@ var Ni = function() {
     var Ni = this;
 
     /*
-     *  Registry for Ni and custom configuration variables.
+     *  Set the optional call context for controllers (should be the running app).
      */
 
-    this.config = {};
+    this.setContext = function(ctx) {
+        this.context = ctx;
+    };
 
     /*
      *  Getter and setter for configuration variables.
@@ -144,11 +146,11 @@ var Ni = function() {
                 if (typeof(controller.__init) === 'function' && fn) {
                   args.unshift(function () {
                     args.shift();
-                    fn.apply(null, args);
+                    fn.apply(Ni.context, args);
                   });
                   controller.__init.apply(null, args);
                 } else if (fn) {
-                    fn.apply(null, args);
+                    fn.apply(Ni.context, args);
                 }
                 else {
                     res.Ni.controller = undefined;
@@ -168,10 +170,10 @@ var Ni = function() {
 
                 if (typeof(controller.__init) === 'function') {
                   controller.__init(function () {
-                    controller.index(req, res, next);
+                    controller.index.call(Ni.context, req, res, next);
                   }, req, res, next);
                 } else {
-                  controller.index(req, res, next);
+                  controller.index.call(Ni.context, req, res, next);
                 }
             }
             else {
@@ -491,4 +493,4 @@ function loadFilesFromDir(dir, fnOnFile, callback) {
  *  Exports the Ni object to Node.js.
  */
 
-module.exports = new Ni();
+module.exports = new Ni();