ajust code format to project style

Fixup the code style to fit the canned project

Author: sideshowcoder

canned.js

@@ -242,6 +242,7 @@ Canned.prototype.respondWithAny = function (httpObj, files, cb) {
 }
 
 Canned.prototype.responder = function(body, req, res) {
+  var responseHandler
   var httpObj = {}
   var that = this
   var parsedurl = url.parse(req.url)
@@ -263,13 +264,10 @@ Canned.prototype.responder = function(body, req, res) {
     return response.send()
   }
 
-  var paths = lookup.getPaths(httpObj.pathname.join('/'), that.wildcard);
+  var paths = lookup(httpObj.pathname.join('/'), that.wildcard);
   paths.splice(0,1); // The first path is the default
 
-  // Find a response for the first path
-  that.findResponse(httpObj, responseHandler);
-
-  function responseHandler(err, resp) {
+  responseHandler = function (err, resp) {
     if (err) {
       // Try more paths, if there are any still
       if (paths.length > 0) {
@@ -283,6 +281,10 @@ Canned.prototype.responder = function(body, req, res) {
     }
     return resp.send();
   }
+
+  // Find a response for the first path
+  that.findResponse(httpObj, responseHandler);
+
 }
 
 Canned.prototype.findResponse = function(httpObj, cb) {
@@ -292,16 +294,16 @@ Canned.prototype.findResponse = function(httpObj, cb) {
       if (err) {
         that._responseForFile(httpObj, files, function (err, resp) {
           if (err) {
-            that.respondWithAny(httpObj, files, cb);
+            that.respondWithAny(httpObj, files, cb)
           } else {
-            return cb(null, resp);
+            cb(null, resp)
           }
         })
       } else {
         if (stats.isDirectory()) {
-          that.respondWithDir(httpObj, cb);
+          that.respondWithDir(httpObj, cb)
         } else {
-          return cb(null, new Response('html', '', 500, httpObj.res));
+          cb(null, new Response('html', '', 500, httpObj.res))
         }
       }
     })

lib/lookup.js

@@ -1,4 +1,5 @@
-var lookup = module.exports = {};
+"use strict";
+
 
 /***
  * Given a path and a wildcard string, return a list of paths
@@ -28,47 +29,47 @@ var lookup = module.exports = {};
  * @returns {Array} - the resulting combination, ordered by specificity
  */
 
-lookup.getPaths = function (path, wildcard) {
-  "use strict";
+var lookup = module.exports = function (path, wildcard) {
 
   // Split the path and calculate how many paths will be generated
-  var parts = path.split('/');
-  var matches = path.match(/\/\d+(\/|$)/gi);
+  var parts = path.split('/')
+  var matches = path.match(/\/\d+(\/|$)/gi)
+  var i
 
   if (!matches){
-    return [path];
+    return [path]
   }
 
   var lookPathsParts = [];
 
   // Locate replaceable parts indexes
-  var matchesIndexes = [];
+  var matchesIndexes = []
   parts.forEach(function (p, i) {
     if (p.match(/^\d+$/)) {
-      matchesIndexes.push(i);
+      matchesIndexes.push(i)
     }
-  });
+  })
 
   // Copy the original parts as a starting point for the new parts
-  for (var i = 0; i < Math.pow(2, matches.length); i++) {
-    lookPathsParts.push(parts.slice());
+  for (i = 0; i < Math.pow(2, matches.length); i++) {
+    lookPathsParts.push(parts.slice())
   }
 
   // Generate the new paths parts
-  for (var i = matches.length; i > 0; --i) {
-    var skip = Math.pow(2, i) / 2;
-    var replacePartIndex = matches.length - i;
+  for (i = matches.length; i > 0; --i) {
+    var skip = Math.pow(2, i) / 2
+    var replacePartIndex = matches.length - i
     for (var j = skip; j < lookPathsParts.length; j += (skip * 2)) {
       for (var k = 0; k < skip; k++) {
-        lookPathsParts[j + k][matchesIndexes[replacePartIndex]] = wildcard;
+        lookPathsParts[j + k][matchesIndexes[replacePartIndex]] = wildcard
       }
     }
   }
 
   // Build the final path strings
-  var lookPaths = [];
+  var lookPaths = []
   lookPathsParts.forEach(function (p) {
-    lookPaths.push(p.join('/'));
-  });
-  return lookPaths;
-};
+    lookPaths.push(p.join('/'))
+  })
+  return lookPaths
+}

spec/lookup.spec.js

@@ -1,10 +1,10 @@
 "use strict";
 
-var lookup = require('../lib/lookup');
+var lookup = require('../lib/lookup')
 
 describe('lookup', function () {
   it('should generate a list of paths in the correct order', function (done) {
-    var testPath = '/api/2/customer/123/invoice/321/';
+    var testPath = '/api/2/customer/123/invoice/321/'
     var expectedPaths = [
       '/api/2/customer/123/invoice/321/',
       '/api/2/customer/123/invoice/any/',
@@ -14,9 +14,8 @@ describe('lookup', function () {
       '/api/any/customer/123/invoice/any/',
       '/api/any/customer/any/invoice/321/',
       '/api/any/customer/any/invoice/any/'
-    ];
-    var generatedPaths = lookup.getPaths(testPath, 'any');
-    expect(generatedPaths).toEqual(expectedPaths);
-    done();
+    ]
+    expect(lookup(testPath, 'any')).toEqual(expectedPaths)
+    done()
   });
-});
+});