Merge pull request #74 from mrodrig/fix-escaping

Fixing #73, bad test, and associated csv-2-json functionality to behave correctly

Author: mrodrig

README.md

@@ -109,10 +109,10 @@ $ npm run coverage
 
 Current Coverage is:
 ```
-Statements   : 96.69% ( 175/181 )
-Branches     : 93.48% ( 129/138 )
-Functions    : 100% ( 33/33 )
-Lines        : 97.63% ( 165/169 )
+Statements   : 94.84% ( 202/213 )
+Branches     : 93.33% ( 154/165 )
+Functions    : 100% ( 37/37 )
+Lines        : 95.52% ( 192/201 )
 ```
 
 ## Frequently Asked Questions (FAQ)

lib/csv-2-json.js

@@ -175,6 +175,11 @@ var splitLine = function (line) {
             stateVariables.parsingValue = true;
             stateVariables.startIndex = index + 1;
         }
+        else if (character === "\\" && charAfter === options.DELIMITER.WRAP && stateVariables.insideWrapDelimiter) {
+            line = line.slice(0, index) + line.slice(index+1); // Remove the current character from the line
+            index--; // Move to position before to prevent moving ahead and skipping a character
+            lastCharacterIndex--; // Update the value since we removed a character
+        }
         // Otherwise increment to the next character
         index++;
     }

lib/json-2-csv.js

@@ -133,6 +133,7 @@ var convertField = function (value) {
     } else if (_.isBoolean(value)) { // If we have a boolean (avoids false being converted to '')
         return options.DELIMITER.WRAP + convertValue(value) + options.DELIMITER.WRAP;
     }
+    value = options.DELIMITER.WRAP && value ? value.replace(new RegExp(options.DELIMITER.WRAP, 'g'), "\\"+options.DELIMITER.WRAP) : value;
     return options.DELIMITER.WRAP + convertValue(value) + options.DELIMITER.WRAP; // Otherwise push the current value
 };
 

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": "2.0.23",
+    "version": "2.1.0",
     "repository": {
         "type": "git",
         "url": "http://github.com/mrodrig/json-2-csv.git"
@@ -25,7 +25,7 @@
     ],
     "dependencies": {
         "underscore": "1.8.3",
-        "doc-path": "1.0.7",
+        "doc-path": "1.0.8",
         "bluebird": "3.4.6"
     },
     "devDependencies": {

test/CSV/quoted/nestedQuotes.csv

@@ -1,3 +1,3 @@
 "a string"
 "with a description"
-"with a description and "quotes""
+"with a description and \"quotes\""