Temporary solutions for results handler config option. Works, but con…

…ceptually wrong.
tobie · Sep 22, 2010 · ba65c33 · ba65c33
1 parent e249e9e
commit ba65c33
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/lib/config.js b/lib/config.js
@@ -30,7 +30,7 @@ function createConfig(options) {
   // is stored as a full path (defaults to current working dir).
   // Querying config props always returns a full path.
 
-  var self = {}, _o = {}, _keys, props;
+  var self = {}, _o = {}, _keys, props, _resultsHandlerFunction;
 
   function _proxy(key) {
     return {
@@ -146,7 +146,7 @@ function createConfig(options) {
         var initValue = handler;
 
         if (typeof handler === 'function') {
-          _o.resultsHandler = handler;
+          _resultsHandlerFunction = handler;
           return;
         }
 
@@ -156,20 +156,24 @@ function createConfig(options) {
           try {
             // First, try loading the module from the resultHandler directory.
             handler = require('./resultsHandler/' + initValue);
+            // if that worked, save the reference, it's the correct one.
+            _o.resultsHandler = initValue;
           } catch(e) {
             try {
               // Might be an absolute path.
               handler = require(initValue);
+              // if so, save it.
+              _o.resultsHandler = initValue;
             } catch (e) {
               throw new Error('Cannot find module "' + initValue + '".');
             }
           }
         }
 
-        // If it's an object, it must have a handleResults method.
+        // If it's an object, look for its handleResults method.
         if (typeof handler === 'object') {
           if (typeof handler.handleResults === 'function') {
-            _o.resultsHandler = function() {
+            _resultsHandlerFunction = function() {
               return handler.handleResults.apply(handler, arguments);
             };
           } else {
@@ -183,7 +187,8 @@ function createConfig(options) {
   };
 
   self.handleResults = handleResults;
-  function handleResults(options) {
+  function handleResults(results) {
+    return _resultsHandlerFunction(results);
   }
 
   self.getTemplatePath = getTemplatePath;

diff --git a/lib/server.js b/lib/server.js
@@ -11,11 +11,10 @@ function createServer(config) {
   server.set('views', path.join(__dirname, '..', 'views'));
   server.register('.mustache', require('./template'));
 
-  var resultsHandler = config.resultsHandler;
   server.post('/results', function(req, res) {
     var results = _createResults(req);
     res.render('results.mustache', { locals: results });
-    resultsHandler(results);
+    config.handleResults(results);
   });
 
   server.listen(config.port);