Created Application mixin to allow defining global behavior for all c…

…ontrollers.
geddy · Mar 26, 2010 · cfc84ca · cfc84ca
1 parent 93879da
commit cfc84ca
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/lib/app.js b/lib/app.js
@@ -38,6 +38,10 @@ var App = function (config) {
         constructor.prototype = new Controller(route.controller, params, req, resp);
         var controller = new constructor();
 
+        // Mix in any user-defined Application methods
+        var mixin = new this.controllers.Application();
+        controller = fleegix.mixin(controller, mixin);
+
         controller[route.action].call(controller, params);
       }
       else {

diff --git a/lib/controller.js b/lib/controller.js
@@ -28,8 +28,8 @@ Controller.prototype = new function () {
   this.respond = function (content, format) {
 
     var negotiated = this.negotiateContent(format);
-    this.format = negotiated[0];
-    this.contentType = negotiated[1];
+    this.format = negotiated.format;
+    this.contentType = negotiated.contentType;
 
     if (!this.contentType) {
       throw new errors.NotAcceptableError('Not an acceptable media type.');
@@ -116,7 +116,7 @@ Controller.prototype = new function () {
       throw new errors.InternalServerError('Unknown format');
     }
 
-    return [format, contentType];
+    return {format: format, contentType: contentType};
   };
 
   this.formatContent = function (content) {

diff --git a/scripts/Jakefile.js b/scripts/Jakefile.js
@@ -30,7 +30,8 @@ exports.tasks = {
         'mkdir -p ./' + dir + '/app/controllers',
         'mkdir -p ./' + dir + '/public',
         'cp ~/.node_libraries/geddy/scripts/gen/router.js ' + dir + '/config/',
-        'cp ~/.node_libraries/geddy/scripts/gen/main.js ' + dir + '/app/controllers/'
+        'cp ~/.node_libraries/geddy/scripts/gen/main.js ' + dir + '/app/controllers/',
+        'cp ~/.node_libraries/geddy/scripts/gen/application.js ' + dir + '/app/controllers/'
       ]
       runCmds(cmds, function () {
         sys.puts('Created app ' + dir + '.');