From 3ea8cf355858f0f5bd8a386938ca23ef89648cf2 Mon Sep 17 00:00:00 2001 From: Steven Jeffries Date: Sat, 18 Aug 2018 11:28:22 -0700 Subject: [PATCH] Revert "Added a new config option called "additionalDelimitersToGuess" that" This reverts commit ea08648dbff2305f0aa3b985bd49b66e93cd5d1a. --- papaparse.js | 7 +++---- tests/test-cases.js | 40 +--------------------------------------- 2 files changed, 4 insertions(+), 43 deletions(-) diff --git a/papaparse.js b/papaparse.js index cea444e..059ccbb 100755 --- a/papaparse.js +++ b/papaparse.js @@ -1024,7 +1024,7 @@ _delimiterError = false; if (!_config.delimiter) { - var delimGuess = guessDelimiter(input, _config.newline, _config.skipEmptyLines, _config.comments, _config.additionalDelimitersToGuess); + var delimGuess = guessDelimiter(input, _config.newline, _config.skipEmptyLines, _config.comments); if (delimGuess.successful) _config.delimiter = delimGuess.bestDelimiter; else @@ -1208,10 +1208,9 @@ return _results; } - function guessDelimiter(input, newline, skipEmptyLines, comments, additionalDelimitersToGuess) + function guessDelimiter(input, newline, skipEmptyLines, comments) { - additionalDelimitersToGuess = additionalDelimitersToGuess || []; - var delimChoices = [',', '\t', '|', ';', Papa.RECORD_SEP, Papa.UNIT_SEP].concat(additionalDelimitersToGuess); + var delimChoices = [',', '\t', '|', ';', Papa.RECORD_SEP, Papa.UNIT_SEP]; var bestDelim, bestDelta, fieldCountPrevRow; for (var i = 0; i < delimChoices.length; i++) diff --git a/tests/test-cases.js b/tests/test-cases.js index 60fd25b..deb2e65 100644 --- a/tests/test-cases.js +++ b/tests/test-cases.js @@ -2110,6 +2110,7 @@ var CUSTOM_TESTS = [ }); } } + ]; describe('Custom Tests', function() { @@ -2126,42 +2127,3 @@ describe('Custom Tests', function() { generateTest(CUSTOM_TESTS[i]); } }); - - -var DELIMITERS_TO_GUESS_TESTS = [ - { - description: "Should correctly guess custom delimiter when passed additional delimiters to guess.", - expected: "~", - run: function(callback) { - var results = Papa.parse('"A"~"B"~"C"~"D"', { - additionalDelimitersToGuess: ['~', '@', '%'] - }); - callback(results.meta.delimiter); - } - }, - { - description: "Should still correctly guess default delimiters when additional delimiters to guess are given.", - expected: ",", - run: function(callback) { - var results = Papa.parse('"A","B","C","D"', { - additionalDelimitersToGuess: ['~', '@', '%'] - }); - callback(results.meta.delimiter); - } - } -]; - -describe('Additional Delimiters to Guess Tests', function() { - function generateTest(test) { - (test.disabled ? it.skip : it)(test.description, function(done) { - test.run(function(actual) { - assert.deepEqual(JSON.stringify(actual), JSON.stringify(test.expected)); - done(); - }); - }); - } - - for (var i = 0; i < DELIMITERS_TO_GUESS_TESTS.length; i++) { - generateTest(DELIMITERS_TO_GUESS_TESTS[i]); - } -});