Add more test cases, fix bugs.

Author: jheer

package.json

@@ -14,7 +14,8 @@
   },
   "dependencies": {
     "d3": "3.5.x",
-    "topojson": "^1.6.18"
+    "topojson": "^1.6.18",
+    "request": "2.53.0"
   },
   "devDependencies": {
     "browser-sync": "^2.6.0",

src/util/tree.js src/import/formats/tree.js

@@ -1,6 +1,6 @@
 var TREE_KEY = '__tree_data__';
 
-function isTree(data) {
+function isTree(obj) {
   return obj && obj[TREE_KEY];
 }
 

src/import/formats/treejson.js

@@ -1,5 +1,5 @@
 var util = require('../../util');
-var tree = require('../../util/tree');
+var tree = require('./tree');
 var json = require('./json');
 
 module.exports = function(data, format) {

src/import/load.js

@@ -11,17 +11,18 @@ var fileProtocol = 'file://';
 // Returns cleaned up URL, or false if access is not allowed
 function sanitizeUrl(opt) {
   var url = opt.url;
+  if (!url && opt.file) { return fileProtocol + opt.file; }
 
   // In case this is a relative url (has no host), prepend opt.baseURL
   if (opt.baseURL && !protocol_re.test(url)) {
-    if (!util.startsWith(url, '/') && opt.baseURL[baseURL.length-1] !== '/') {
+    if (!util.startsWith(url, '/') && opt.baseURL[opt.baseURL.length-1] !== '/') {
       url = '/' + url; // Ensure that there is a slash between the baseURL (e.g. hostname) and url
     }
     url = opt.baseURL + url;
   }
   // relative protocol, starts with '//'
   if (util.isNode && util.startsWith(url, '//')) {
-    url = opt.defaultProtocol + url;
+    url = (opt.defaultProtocol || 'http') + ':' + url;
   }
   // If opt.domainWhiteList is set, only allows url, whose hostname
   // * Is the same as the origin (window.location.hostname)
@@ -32,10 +33,6 @@ function sanitizeUrl(opt) {
     if (util.isNode) {
       // relative protocol is broken: https://github.com/defunctzombie/node-url/issues/5
       var parts = require('url').parse(url);
-      // In safe mode, make sure url begins with http:// or https://
-      if (opt.safeMode && parts.protocol !== 'http:' && parts.protocol !== 'https:') {
-        return false;
-      }
       domain = parts.hostname;
       origin = null;
     } else {
@@ -59,18 +56,23 @@ function sanitizeUrl(opt) {
           (idx > 1 && domain[idx-1] === '.' && domain.lastIndexOf(d) === idx);
       });
       if (!whiteListed) {
-        util.error('URL is not whitelisted: ' + url);
-        url = false;
+        throw 'URL is not whitelisted: ' + url;
       }
     }
   }
   return url;
 }
 
 function load(opt, callback) {
-  var url = load.sanitizeUrl(opt); // enable override
+  try {
+    var url = load.sanitizeUrl(opt); // enable override
+  } catch (err) {
+    callback(err, null);
+    return;
+  }
+
   if (!url) {
-    callback('Bad URL', null);
+    callback('Invalid URL: ' + url, null);
   } else if (!util.isNode) {
     // in browser, use xhr
     xhr(url, callback);
@@ -91,8 +93,6 @@ function xhrHasResponse(request) {
 }
 
 function xhr(url, callback) {
-  util.log('LOAD XHR: ' + url);
-
   var request = new XMLHttpRequest;
   // If IE does not support CORS, use XDomainRequest (from d3.xhr)
   if (this.XDomainRequest
@@ -117,12 +117,10 @@ function xhr(url, callback) {
 }
 
 function file(file, callback) {
-  util.log('LOAD FILE: ' + file);
   require('fs').readFile(file, callback);
 }
 
 function http(url, callback) {
-  util.log('LOAD HTTP: ' + url);
   var req = require('request')(url, function(error, response, body) {
     if (!error && response.statusCode === 200) {
       callback(null, body);

src/import/read.js

@@ -1,5 +1,5 @@
 var util = require('../util');
-var tree = require('../util/tree');
+var tree = require('./formats/tree');
 var formats = require('./formats');
 
 var parsers = {
@@ -17,18 +17,20 @@ function read(data, format) {
 
 function parseValues(data, types) {
   var cols = util.keys(types),
-      parse = cols.map(function(col) { return parsers[types[col]]; });
-  parseArray(tree ? [data] : data, cols, parse, tree.isTree(data));
+      parse = cols.map(function(col) { return parsers[types[col]]; }),
+      isTree = tree.isTree(data);
+
+  parseArray(isTree ? [data] : data, cols, parse, isTree);
 }
 
-function parseArray(data, cols, parse, tree) {
+function parseArray(data, cols, parse, isTree) {
   var d, i, j, len, clen;
   for (i=0, len=data.length; i<len; ++i) {
     d = data[i];
     for (j=0, clen=cols.length; j<clen; ++j) {
       d[cols[j]] = parse[j](d[cols[j]]);
     }
-    if (tree && d.values) {
+    if (isTree && d.values) {
       parseArray(d.values, cols, parse, true);
     }
   }

src/util/index.js

@@ -35,11 +35,11 @@ u.isBoolean = function(obj) {
 
 // type coercion functions
 
-u.number = function(s) { return s === null ? null : +s; };
+u.number = function(s) { return s == null ? null : +s; };
 
-u.boolean = function(s) { return s === null ? null :  !!s; };
+u.boolean = function(s) { return s == null ? null : s==='false' ? false : !!s; };
 
-u.date = function(s) {return s === null ? null : Date.parse(s); }
+u.date = function(s) { return s == null ? null : Date.parse(s); }
 
 u.array = function(x) { return x != null ? (u.isArray(x) ? x : [x]) : []; };
 
@@ -217,7 +217,8 @@ u.stablesort = function(array, sortBy, keyFn) {
 u.bins = require('./bins');
 
 var log = require('./log');
-u.log = function(msg) { log(msg, msg.LOG); };
+u.log = function(msg) { log(msg, log.LOG); };
+u.log.silent = log.silent;
 u.error = function(msg) { log(msg, log.ERR); };
 
 u.truncate = require('./truncate');

src/util/log.js

@@ -1,30 +1,24 @@
 var LOG = "LOG";
 var ERR = "ERR";
-
-var log;
-var has_stderr = typeof process !== 'undefined'
-              && typeof process.stderr !== 'undefined';
+var silent = false;
 
 function prepare(msg, type) {
-  return "[" + Date.now() + "] " + (type || LOG) + " " + msg;
+  return '[' + [
+    '"'+(type || LOG)+'"',
+    Date.now(),
+    '"'+msg+'"'
+  ].join(", ") + ']';
 }
 
-if (has_stderr) {
-  log = function(msg, type) {
-    msg = prepare(msg, type);
-    process.stderr.write(msg);
-  };
-} else {
-  log = function(msg, type) {
+function log(msg, type) {
+  if (!silent) {
     msg = prepare(msg, type);
-    if (type === ERR) {
-      console.error(msg)
-    } else {
-      console.log(msg);
-    }
+    console.error(msg);
   }
 }
 
+log.silent = function(val) { silent = !!val; };
+
 log.LOG = LOG;
 log.ERR = ERR;
 module.exports = log;