cleaned up the code a little bit. going to take another look tomorrow and add a few more tests; incrementing to 1.3.0

Author: mrodrig

README.md

@@ -145,10 +145,10 @@ $ npm run coverage
 
 Current Coverage is:
 ```
-Statements   : 94.49% ( 120/127 )
-Branches     : 90.24% ( 74/82 )
-Functions    : 100% ( 30/30 )
-Lines        : 97.39% ( 112/115 )
+Statements   : 94.51% ( 155/164 )
+Branches     : 92.62% ( 113/122 )
+Functions    : 100% ( 31/31 )
+Lines        : 96.69% ( 146/151 )
 ```
 
 ## Features

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "json-2-csv",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "homepage": "https://github.com/mrodrig/json-2-csv",
   "moduleType": [
     "node"

lib/csv-2-json.js

@@ -6,21 +6,6 @@ var _ = require('underscore'),
 
 var options = {}; // Initialize the options - this will be populated when the csv2json function is called.
 
-/** Helper function from http://phpjs.org/functions/addslashes/ **/
-var addSlashes = function (str) {
-    return (str + '')
-        .replace(/[\\"']/g, '\\$&')
-        .replace(/\u0000/g, '\\0');
-};
-
-var lstrip = function (str, search) {
-    return str.replace(new RegExp('^' + search + '*'), '');
-};
-
-var rstrip = function (str, search) {
-    return str.replace(new RegExp(search + '*$'), '');
-};
-
 /**
  * Generate the JSON heading from the CSV
  * @param lines
@@ -138,43 +123,36 @@ var splitLine = function (line) {
         },
         index = 0;
 
+    // Loop through each character in the line to identify where to split the values
     while(index < line.length) {
-        character = line[index];
+        // Current character
+        character  = line[index];
+        // Previous character
         charBefore = index ? line[index - 1] : '';
+        // Next character
         charAfter = index < lastCharacterIndex ? line[index + 1] : '';
 
-        // If we reached the end of the line and are in the wrap delimiter, substring up to, but not including this char
-        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 === lastCharacterIndex) {
-            stateVariables.parsingValue = false;
-            splitLine.push(line.substring(stateVariables.startIndex));
-            index++;
+        // If we reached the end of the line, add the remaining value
+        if (index === lastCharacterIndex) {
+            splitLine.push(line.substring(stateVariables.startIndex, stateVariables.insideWrapDelimiter ? index : undefined));
         }
         // 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++;
+            stateVariables.startIndex = index + 1;
         }
-        // If the first field is empty
+        // If the first field is empty (ie. line starts with a field delimiter)
         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) {
             splitLine.push(line.substring(stateVariables.startIndex, index));
-            stateVariables.startIndex = index + 2;
+            stateVariables.startIndex = index + 2; // next value starts after the field delimiter
             stateVariables.insideWrapDelimiter = false;
             stateVariables.parsingValue = false;
-            index++;
         }
         // If we reached a wrap delimiter with a field delimiter after it (ie. ,"*)
         else if (character === options.DELIMITER.WRAP && charBefore === options.DELIMITER.FIELD) {
@@ -183,27 +161,23 @@ var splitLine = function (line) {
             }
             stateVariables.insideWrapDelimiter = true;
             stateVariables.parsingValue = true;
-            stateVariables.startIndex = ++index;
+            stateVariables.startIndex = index + 1;
         }
         // 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) {
             splitLine.push(line.substring(stateVariables.startIndex, index));
-            stateVariables.insideWrapDelimiter = false;
-            stateVariables.parsingValue = true;
-            stateVariables.startIndex = ++index;
+            stateVariables.startIndex = index + 1;
         }
         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++;
+            stateVariables.startIndex = index + 1;
         }
+        // Otherwise increment to the next character
+        index++;
     }
 
     return splitLine;

package.json

@@ -2,7 +2,7 @@
     "author": "mrodrig",
     "name": "json-2-csv",
     "description": "A JSON to CSV and CSV to JSON converter that natively supports sub-documents and auto-generates the CSV heading.",
-    "version": "1.2.1",
+    "version": "1.3.0",
     "repository": {
         "type": "git",
     	"url": "http://github.com/mrodrig/json-2-csv.git"