refactor, make all readers delegate to readData + params

lib/index.js

@@ -89,7 +89,9 @@ helpers.discernFormat = function (fileName) {
  * var json = parser('path/to/data.csv');
  */
 helpers.discernParser = function (fileName, delimiter) {
-  if (delimiter) return dsv.dsv(delimiter)
+  if (delimiter) {
+    return dsv.dsv(delimiter)
+  }
   var format = helpers.discernFormat(fileName)
   var parser = parsers[format]
   // If we don't have a parser for this format, notify the user and return as text
@@ -202,6 +204,20 @@ helpers.matches = function (fileName, matcher) {
   }
 }
 
+// Our `readData` fns can take either a delimiter to parse a file, or a full blown parser
+// Determine what they passed in with this handy function
+function getDelimiterOrParser (delimiterOrParser) {
+  var delimiter
+  var parser
+  if (typeof delimiterOrParser === 'string') {
+    delimiter = delimiterOrParser
+    parser = helpers.discernParser(null, delimiter)
+  } else if (_.isObject(delimiterOrParser)) {
+    parser = delimiterOrParser
+  }
+  return parser
+}
+
 /** @namespace */
 var readers = {}
 
@@ -227,11 +243,16 @@ var readers = {}
  * })
  *
  */
-readers.readData = function (path, delimiter_, cb_) {
+readers.readData = function (path, delimiterOrParser_, cb_) {
   var cb = arguments[arguments.length - 1]
-  var delimiter = arguments.length === 3 ? delimiter : false
+  var parser
+  if (arguments.length === 3) {
+    parser = getDelimiterOrParser(delimiterOrParser_)
+  } else {
+    parser = helpers.discernParser(path)
+  }
   fs.readFile(path, 'utf8', function (err, data) {
-    cb(err, helpers.discernParser(path, delimiter).parse(data))
+    cb(err, parser.parse(data))
   })
 }
 
@@ -247,8 +268,14 @@ readers.readData = function (path, delimiter_, cb_) {
  * console.log(data) // Json data
  *
  */
-readers.readDataSync = function (path, delimiter) {
-  return helpers.discernParser(path, delimiter).parse(fs.readFileSync(path, 'utf8'))
+readers.readDataSync = function (path, delimiterOrParser_) {
+  var parser
+  if (arguments.length === 2) {
+    parser = getDelimiterOrParser(delimiterOrParser_)
+  } else {
+    parser = helpers.discernParser(path)
+  }
+  return parser.parse(fs.readFileSync(path, 'utf8'))
 }
 
 /**
@@ -264,9 +291,7 @@ readers.readDataSync = function (path, delimiter) {
  *
  */
 readers.readCsv = function (path, cb) {
-  fs.readFile(path, 'utf8', function (err, data) {
-    cb(err, parsers.csv.parse(data))
-  })
+  readers.readData(path, parsers.csv, cb)
 }
 
 /**
@@ -281,7 +306,7 @@ readers.readCsv = function (path, cb) {
  *
  */
 readers.readCsvSync = function (path) {
-  return parsers.csv.parse(fs.readFileSync(path, 'utf8'))
+  return readers.readDataSync(path, parsers.csv)
 }
 
 /**
@@ -297,9 +322,7 @@ readers.readCsvSync = function (path) {
  *
  */
 readers.readJson = function (path, cb) {
-  fs.readFile(path, function (err, data) {
-    cb(err, parsers.json.parse(data))
-  })
+  readers.readData(path, parsers.json, cb)
 }
 
 /**
@@ -314,7 +337,7 @@ readers.readJson = function (path, cb) {
  *
  */
 readers.readJsonSync = function (path) {
-  return parsers.json.parse(fs.readFileSync(path))
+  return readers.readDataSync(path, parsers.json)
 }
 
 /**
@@ -330,9 +353,7 @@ readers.readJsonSync = function (path) {
  *
  */
 readers.readTsv = function (path, cb) {
-  fs.readFile(path, 'utf8', function (err, data) {
-    cb(err, parsers.tsv.parse(data))
-  })
+  readers.readData(path, parsers.tsv, cb)
 }
 
 /**
@@ -347,7 +368,7 @@ readers.readTsv = function (path, cb) {
  *
  */
 readers.readTsvSync = function (path) {
-  return parsers.tsv.parse(fs.readFileSync(path, 'utf8'))
+  return readers.readDataSync(path, parsers.tsv)
 }
 
 /**
@@ -363,9 +384,7 @@ readers.readTsvSync = function (path) {
  *
  */
 readers.readPsv = function (path, cb) {
-  fs.readFile(path, 'utf8', function (err, data) {
-    cb(err, parsers.psv.parse(data))
-  })
+  readers.readData(path, parsers.psv, cb)
 }
 
 /**
@@ -380,7 +399,7 @@ readers.readPsv = function (path, cb) {
  *
  */
 readers.readPsvSync = function (path) {
-  return parsers.psv.parse(fs.readFileSync(path, 'utf8'))
+  return readers.readDataSync(path, parsers.psv)
 }
 
 /**
@@ -396,9 +415,7 @@ readers.readPsvSync = function (path) {
  *
  */
 readers.readTxt = function (path, cb) {
-  fs.readFile(path, 'utf8', function (err, data) {
-    cb(err, parsers.txt.parse(data))
-  })
+  readers.readData(path, parsers.txt, cb)
 }
 
 /**
@@ -413,7 +430,7 @@ readers.readTxt = function (path, cb) {
  *
  */
 readers.readTxtSync = function (path) {
-  return parsers.txt.parse(fs.readFileSync(path, 'utf8'))
+  return readers.readDataSync(path, parsers.txt)
 }
 
 /**