Merge pull request #23 from doug-martin/master

v0.2.1

Author: doug-martin

lib/parser.js

@@ -2,8 +2,7 @@ var extended = require("./extended"),
     isUndefinedOrNull = extended.isUndefinedOrNull,
     trim = extended.trim,
     trimLeft = extended.trimLeft,
-    trimRight = extended.trimRight,
-    LINE_BREAK = extended.LINE_BREAK;
+    trimRight = extended.trimRight;
 
 function createParser(options) {
     options = options || {};
@@ -13,9 +12,10 @@ function createParser(options) {
         doTrim = options.trim || false,
         ESCAPE = options.quote || '"',
         VALUE_REGEXP = new RegExp("([^" + delimiter + "'\"\\s\\\\]*(?:\\s+[^" + delimiter + "'\"\\s\\\\]+)*)"),
-        SEARCH_REGEXP = new RegExp("(?:\\n|" + delimiter + ")"),
+        SEARCH_REGEXP = new RegExp("(?:\\n|\\r|" + delimiter + ")"),
         ESCAPE_CHAR = options.escape || '"',
-        NEXT_TOKEN_REGEXP = new RegExp("([^\\s]|\\\n|" + delimiter + ")");
+        NEXT_TOKEN_REGEXP = new RegExp("([^\\s]|\\n|\\r|" + delimiter + ")"),
+        LINE_BREAK = /[\r\n]/;
 
     function formatItem(item) {
         if (doTrim) {
@@ -67,11 +67,11 @@ function createParser(options) {
             if (hasMoreData) {
                 cursor = null;
             } else {
-                throw new Error("Parse Error: expected: '" + ESCAPE + "' got: '" + nextToken + "'. at '" + str.substr(cursor).replace(/\n/g, "\\n" + "'"));
+                throw new Error("Parse Error: expected: '" + ESCAPE + "' got: '" + nextToken + "'. at '" + str.substr(cursor).replace(/[r\n]/g, "\\n" + "'"));
             }
         } else if ((!depth && nextToken && nextToken.search(SEARCH_REGEXP) === -1)) {
-            throw new Error("Parse Error: expected: '" + ESCAPE + "' got: '" + nextToken + "'. at '" + str.substr(cursor, 10).replace(/\n/g, "\\n" + "'"));
-        } else if (hasMoreData && (!nextToken || nextToken.search(LINE_BREAK) === -1)) {
+            throw new Error("Parse Error: expected: '" + ESCAPE + "' got: '" + nextToken + "'. at '" + str.substr(cursor, 10).replace(/[\r\n]/g, "\\n" + "'"));
+        } else if (hasMoreData && (!nextToken || !LINE_BREAK.test(nextToken))) {
             cursor = null;
         }
         if (cursor !== null) {
@@ -98,7 +98,7 @@ function createParser(options) {
                 items.push(formatItem(searchStr.substr(0, nextIndex)));
                 cursor += nextIndex + 1;
             }
-        } else if (nextChar.search(LINE_BREAK) !== -1) {
+        } else if (LINE_BREAK.test(nextChar)) {
             items.push(formatItem(searchStr.substr(0, nextIndex)));
             cursor += nextIndex;
         } else if (!hasMoreData) {
@@ -127,7 +127,7 @@ function createParser(options) {
             if (isUndefinedOrNull(token)) {
                 i = lastLineI;
                 break;
-            } else if (token === LINE_BREAK) {
+            } else if (LINE_BREAK.test(token)) {
                 i = nextToken.cursor + 1;
                 if (i < l) {
                     rows.push(items);

lib/parser_stream.js

@@ -61,7 +61,7 @@ extended(ParserStream).extend({
 
     __handleLine: function __parseLineData(line, index, ignore) {
         var ignoreEmpty = this._ignoreEmpty;
-        if (extended.isBoolean(ignoreEmpty) && ignoreEmpty && EMPTY.test(line.join(""))) {
+        if (extended.isBoolean(ignoreEmpty) && ignoreEmpty && (!line ||  EMPTY.test(line.join("")))) {
             return null;
         }
         if (!ignore) {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "fast-csv",
-    "version": "0.2.0",
+    "version": "0.2.1",
     "description": "CSV parser and writer",
     "main": "index.js",
     "scripts": {