Adding key specification to csv2json

Author: mrodrig

lib/csv-2-json.js

@@ -9,8 +9,14 @@ var retrieveHeading = function (lines, callback) {
     if (!lines.length) { // If there are no lines passed in, then throw an error
         return callback(new Error("No data provided to retrieve heading.")); // Pass an error back to the user
     }
-    var heading = lines[0]; // Grab the top line (header line)
-    return heading.split(options.DELIMITER.FIELD); // Return the heading split by the field delimiter
+    var heading = lines[0].split(options.DELIMITER.FIELD); // Grab the top line (header line) and split by the field delimiter
+    heading = _.map(heading, function (headerKey, index) {
+        return {
+            value: headerKey,
+            index: index
+        }
+    });
+    return heading;
 };
 
 // Add a nested key and its value in the given document
@@ -53,21 +59,18 @@ var convertArrayRepresentation = function (val) {
 };
 
 // Create a JSON document with the given keys (designated by the CSV header) and the values (from the given line)
-var createDoc = function (keys, line, callback) {
+var createDoc = function (keys, line) {
+    if (line == '') { return false; } // If we have an empty line, then return false so we can remove all blank lines (falsy values)
     var doc = {}, // JSON document to start with and manipulate
         val,      // Temporary variable to set the current key's value to
         line = line.trim().split(options.DELIMITER.FIELD); // Split the line using the given field delimiter after trimming whitespace
-    if (line == '') { return false; } // If we have an empty line, then return false so we can remove all blank lines (falsy values)
-    if (keys.length !== line.length) { // If the number of keys is different than the number of values in the current line
-        return callback(new Error("Not every line has a correct number of values.")); // Pass the error back to the client
-    }
     _.each(keys, function (key, indx) {
-        val = line[indx] === '' ? null : line[indx];
+        val = line[key.index] === '' ? null : line[key.index];
         if (isArrayRepresentation(val)) {
             val = convertArrayRepresentation(val);
         }
-        if (key.indexOf('.')) { // If key has '.' representing nested document
-            doc = addNestedKey(key, val, doc); // Update the document to add the nested key structure
+        if (key.value.indexOf('.')) { // If key has '.' representing nested document
+            doc = addNestedKey(key.value, val, doc); // Update the document to add the nested key structure
         } else { // Else we just have a straight key:value mapping
             doc[key] = val; // Set the value at the current key
         }
@@ -77,8 +80,11 @@ var createDoc = function (keys, line, callback) {
 
 // Main wrapper function to convert the CSV to the JSON document array
 var convertCSV = function (lines, callback) {
-    var headers = retrieveHeading(lines, callback), // Retrieve the headings from the CSV
-        jsonDocs = []; // Create an array that we can add the generated documents to
+    var generatedHeaders = retrieveHeading(lines, callback), // Retrieve the headings from the CSV, unless the user specified the keys
+        jsonDocs = [], // Create an array that we can add the generated documents to
+        headers = options.KEYS ? _.filter(generatedHeaders, function (headerKey) {
+            return _.contains(options.KEYS, headerKey.value);
+        }) : generatedHeaders;
     lines = lines.splice(1); // Grab all lines except for the header
     _.each(lines, function (line) { // For each line, create the document and add it to the array of documents
         jsonDocs.push(createDoc(headers, line));