adding tests, all branches should be handled. need to clean up the code a bit and comment it a bit better before going ahead and merging this into master

Author: mrodrig

csv2json-test.js

@@ -1,14 +1,19 @@
 var converter = require('./lib/converter');
 
 var mycsv = 'header1,header2,"header3"\n'
-        + 'row1 column1,"row1 column2, with comma","row1 column3"\n'
+        + '"row1 column1",row1 column2,row1 column3\n'
         + '"row2 column1","row2 column2","row2 column3"\n';
 
 var csv = 'header1,header2,header3\n'
-        + 'row1 column1,"row1 column2, with comma", row1 column3\n'
+        + ',"row1 column2, with comma", row1 column3\n'
         + 'row2 column1,row2 column2, row2 column3\n';
 
-converter.csv2json(csv, function (err, json) {
+var csvArrays = '"info.name","coursesTaken","year"\n'
+        + '"Mike","[CS2500/CS2510]","Sophomore"\n'
+        + '"John","[ANTH1101/POL2312/MATH2142/POL3305/LAW2100]","Senior"\n'
+        + '"Joe","[]","Freshman"\n';
+
+converter.csv2json(mycsv, function (err, json) {
     if (!err) {
         return console.log(json);
     }

lib/csv-2-json.js

@@ -130,7 +130,7 @@ var splitLine = function (line) {
         character,
         charBefore,
         charAfter,
-        lastLineIndex = line.length - 1,
+        lastCharacterIndex = line.length - 1,
         stateVariables = {
             insideWrapDelimiter: false,
             parsingValue: true,
@@ -141,26 +141,35 @@ var splitLine = function (line) {
     while(index < line.length) {
         character = line[index];
         charBefore = index ? line[index - 1] : '';
-        charAfter = index < lastLineIndex ? line[index + 1] : '';
+        charAfter = index < lastCharacterIndex ? line[index + 1] : '';
 
-        console.log(charBefore, character, charAfter);
         // If we reached the end of the line and are in the wrap delimiter, substring up to, but not including this char
-        if (index === lastLineIndex && stateVariables.insideWrapDelimiter) {
-            console.log('CASE 1');
+        if (index === lastCharacterIndex && stateVariables.insideWrapDelimiter) {
             stateVariables.parsingValue = false;
             splitLine.push(line.substring(stateVariables.startIndex, index));
             index++;
         }
         // If we reached the end of the line and are not in the wrap delimiter
-        else if (index === lastLineIndex) {
-            console.log('CASE 2');
+        else if (index === lastCharacterIndex) {
             stateVariables.parsingValue = false;
             splitLine.push(line.substring(stateVariables.startIndex));
             index++;
         }
+        // If the line starts with a wrap delimiter
+        else if (character === options.DELIMITER.WRAP && index === 0) {
+            stateVariables.startIndex = index + 1;
+            stateVariables.insideWrapDelimiter = true;
+            stateVariables.parsingValue = true;
+            index++;
+        }
+        // If the first field is empty
+        else if (character === options.DELIMITER.FIELD && index == 0) {
+            splitLine.push('');
+            stateVariables.parsingValue = false;
+            index++;
+        }
         // If we reached a wrap delimiter with a field delimiter after it (ie. *",)
         else if (character === options.DELIMITER.WRAP && charAfter === options.DELIMITER.FIELD) {
-            console.log('CASE 3');
             splitLine.push(line.substring(stateVariables.startIndex, index));
             stateVariables.startIndex = index + 2;
             stateVariables.insideWrapDelimiter = false;
@@ -169,29 +178,32 @@ var splitLine = function (line) {
         }
         // If we reached a wrap delimiter with a field delimiter after it (ie. ,"*)
         else if (character === options.DELIMITER.WRAP && charBefore === options.DELIMITER.FIELD) {
-            console.log('CASE 4');
             if (stateVariables.parsingValue) {
                 splitLine.push(line.substring(stateVariables.startIndex, index-1));
             }
             stateVariables.insideWrapDelimiter = true;
             stateVariables.parsingValue = true;
             stateVariables.startIndex = ++index;
         }
-        // TODO: if index === 0 and comma, then first field is empty
-        // TODO: if character === '"' and index === 0
         // If we reached a field delimiter and are not inside the wrap delimiters (ie. *,*)
         else if (character === options.DELIMITER.FIELD && charBefore !== options.DELIMITER.WRAP
                     && charAfter !== options.DELIMITER.WRAP && !stateVariables.insideWrapDelimiter
                     && stateVariables.parsingValue) {
-            console.log('CASE 5');
             splitLine.push(line.substring(stateVariables.startIndex, index));
             stateVariables.insideWrapDelimiter = false;
             stateVariables.parsingValue = true;
             stateVariables.startIndex = ++index;
-        } else {
+        }
+        else if (character === options.DELIMITER.FIELD && charBefore === options.DELIMITER.WRAP
+                    && charAfter !== options.DELIMITER.WRAP) {
+            stateVariables.insideWrapDelimiter = false;
+            stateVariables.parsingValue = true;
+            stateVariables.startIndex = ++index;
+        }
+        // Otherwise...
+        else {
             index++;
         }
-        console.log(splitLine);
     }
 
     return splitLine;

test/CSV/quoted/nestedSomeFieldsWrappedJson.csv

@@ -0,0 +1,5 @@
+"carModel","priceRange.min","priceRange.max"
+Audi,"9000",11000
+"BMW",14000,16000
+"Mercedes",19000,"21000"
+"Porsche","29000",31000