fix browser path when resources are at /

cainus · Jun 10, 2013 · 6f42146 · 6f42146
1 parent 975bde1
commit 6f42146
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 22 deletions.
diff --git a/lib/Percolator.js b/lib/Percolator.js
@@ -14,7 +14,9 @@ var fs = require('fs');
 var Server = require('oneone');
 var hyperjsonBrowser = require('hyperjson-browser');
 var connect = require('connect');
+var nodePath = require('path');
 var urlgreyConnect = require('urlgrey-connect');
+var logger = require('log-driver').logger;
 
 
 Percolator = function(options){
@@ -118,8 +120,8 @@ Percolator.prototype.defaultRequestHandler = function(req, res, handler, cb){
                   that.statusman.createResponder(req, res).unsupportedMediaType(req.headers['content-type']);
                   return;
                 } 
-                console.log("post mediaTypes middleware error:");
-                console.log(err);
+                logger.error("post mediaTypes middleware error:");
+                logger.error(err);
                 return cb(err);
               } else {
                 cb(null, context(req, res));
@@ -187,7 +189,7 @@ Percolator.prototype._assignErrorHandlers = function(){
     // TODO fix resource.fetch to use this handle404 instead of default!!!
 
     var path = that.options.resourcePath;
-    var browserPath = path + '/browser';
+    var browserPath = nodePath.normalize(path + '/browser');
     var responder = statusman.createResponder($.req, $.res);
     if (that.options.browser !== false){
       hyperjsonBrowser(browserPath, path)($.req, $.res, function(){
@@ -209,15 +211,15 @@ Percolator.prototype._assignErrorHandlers = function(){
   this.server.on500(function(context, err){
     var req = context.req;
     var res = context.res;
-    console.log("===============================");
-    console.log("Uncaught Exception");
-    console.log(err);
-    console.log(req.method, ' ', req.url);
-    console.log(err.stack);
+    logger.error("===============================");
+    logger.error("Uncaught Exception");
+    logger.error(err);
+    logger.error(req.method, ' ', req.url);
+    logger.error(err.stack);
     try {
       statusman.createResponder(req, res).internalServerError();
     } catch(ex){
-      console.log("error sending 500: ", ex);
+      logger.error("error sending 500: ", ex);
     }
   });
 

diff --git a/lib/mediaTypes/xml.js b/lib/mediaTypes/xml.js
@@ -1,34 +1,32 @@
-
 var _ = require('underscore');
 var ET = require('elementtree');
 
-exports.in = function(str){
+exports["in"] = function(str){
   return str;
-}
+};
 
 
 exports.out = function(obj){
-  console.log("xml out");
   var rootKeys = _.keys(obj);
-  console.log("xml out");
+  var root;
+  var subobj;
   try {
     if (rootKeys.length > 1){
-      var root = new ET.Element('root');
-      var subobj = obj;
+      root = new ET.Element('root');
+      subobj = obj;
     } else {
-      var root = ET.Element(rootKeys[0]);
-      var subobj = obj[rootKeys[0]];
+      root = ET.Element(rootKeys[0]);
+      subobj = obj[rootKeys[0]];
     }
   } catch(ex){
     console.log(ex);
   }
 
   _.each(subobj, function(v, k){
-    var body = ET.SubElement(root, k)
+    var body = ET.SubElement(root, k);
     body.text = JSON.stringify(v);
   });
 
-  console.log("xml out");
   console.log(ET.tostring(root));
   return ET.tostring(root);
-}
+};
diff --git a/package.json b/package.json
@@ -30,7 +30,8 @@
     "JSV": "4.0.2",
     "connect": "2.7.4",
     "urlgrey-connect": "0.1.0",
-    "onbody": "0.0.1"
+    "onbody": "0.0.1",
+    "log-driver": "1.2.1"
   },
   "devDependencies": {
     "request": "2.19.0",