Changeset 489 for Dev/trunk/src/node_modules/ya-csv

Timestamp:

03/08/14 11:41:10 (11 years ago)

Author:

hendrikvanantwerpen

Message:

Update node modules

Location:

Dev/trunk/src/node_modules/ya-csv

Files:

• README.md (modified) (1 diff)
• bin/reshuffle.js (modified) (2 diffs)
• lib/ya-csv.js (modified) (4 diffs)
• package.json (modified) (2 diffs)
• test/echo.js (modified) (2 diffs)
• test/empty-quote.js (added)
• test/empty_fields.csv (added)
• test/index.js (modified) (2 diffs)
• test/simple_escaping.csv (added)
• test/stream.js (modified) (3 diffs)

Dev/trunk/src/node_modules/ya-csv/README.md

@@ -17 +17 @@
     npm install ya-csv
 
-Current version requires at least Node.js v0.2.3 and it's tested with Node.js v0.4.12, 0.6.11 and 0.7.5. Hope it works with the other versions in between too.
+Current version requires at least Node.js v0.2.3 and it's tested with Node.js v0.4.12, 0.6.11, 0.7.5 and v0.10.24. Hope it works with the other versions in between too.
 
 ## Features

Dev/trunk/src/node_modules/ya-csv/bin/reshuffle.js

@@ -1 +1 @@
 var csv = require('../lib/ya-csv'),
-    sys = require('sys');
+    util = require('util');
 
 var reader = csv.createCsvStreamReader(process.openStdin(), { columnsFromHeader: true });
@@ -6 +6 @@
 
 if (process.argv.length < 3) {
-    sys.error("Usage: " + process.argv[0] + " " + process.argv[1] + " <output columns>");
+    util.error("Usage: " + process.argv[0] + " " + process.argv[1] + " <output columns>");
     process.exit(1);
 }

Dev/trunk/src/node_modules/ya-csv/lib/ya-csv.js

@@ -73 +73 @@
          * @return {ReadStream} the readstream instance
          */
-        self.destoy = function(){
+        self.destroy = function(){
             readStream.destroy();
             return self;
@@ -113 +113 @@
                 var isEscape = false;
                 if (c === this.escapechar) {
-                    var nextChar = data.charAt(i + 1);
-                    if (this._isEscapable(nextChar)) {
-                        this._addCharacter(nextChar);
-                        i++;
-                        isEscape = true;
+                    // double-quote at the field beginning does not count as an escape string`
+                    if (c !== this.quotechar || ps.openField || ps.quotedField) {
+                       var nextChar = data.charAt(i + 1);
+                       if (this._isEscapable(nextChar)) {
+                           this._addCharacter(nextChar);
+                           i++;
+                           isEscape = true;
+                        }
                     }
                 }
@@ -217 +220 @@
     var ps = this.parsingStatus;
     if (this.columnsFromHeader && ps.rows === 0) {
-        this.setColumnNames(ps.openRecord);
+        // user has passed columnNames through option
+        if (this.columnNames.length === 0)
+          this.setColumnNames(ps.openRecord);
     } else if (this.columnNames != null && this.columnNames.length > 0) {
         var objResult = {};
@@ -327 +332 @@
 function _setOptions(obj, options) {
     options = options || {};
-    obj.separator   = options.separator   || ',';
-    obj.quotechar   = options.quote       || '"';
-    obj.escapechar  = options.escape      || '"';
-    obj.commentchar = options.comment     || '';
-    obj.columnNames = options.columnNames || [];
-    obj.columnsFromHeader = options.columnsFromHeader || false;
-    obj.nestedQuotes = options.nestedQuotes || false;
-};
+    obj.separator = (typeof options.separator !== 'undefined') ? options.separator : ',';
+    obj.quotechar = (typeof options.quote !== 'undefined') ? options.quote : '"';
+    obj.escapechar = (typeof options.escape !== 'undefined') ? options.escape : '"';
+    obj.commentchar = (typeof options.comment !== 'undefined') ? options.comment : '';
+    obj.columnNames = (typeof options.columnNames !== 'undefined') ? options.columnNames : [];
+    obj.columnsFromHeader = (typeof options.columnsFromHeader !== 'undefined') ? options.columnsFromHeader : false;
+    obj.nestedQuotes = (typeof options.nestedQuotes !== 'undefined') ? options.nestedQuotes : false;
+};

Dev/trunk/src/node_modules/ya-csv/package.json

@@ -2 +2 @@
   "name": "ya-csv",
   "description": "CSV parser and generator for Node.js",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "keywords": [
     "node",
@@ -37 +37 @@
   },
   "main": "lib/ya-csv",
-  "readme": "# ya-csv\n\nEvent based CSV parser and writer for Node.js suitable for processing large CSV streams.\n\n    // A simple echo program:\n    var csv = require('ya-csv');\n\n    var reader = csv.createCsvStreamReader(process.openStdin());\n    var writer = csv.createCsvStreamWriter(process.stdout);\n\n    reader.addListener('data', function(data) {\n        writer.writeRecord(data);\n    });\n\n## Installation\n\n    npm install ya-csv\n\nCurrent version requires at least Node.js v0.2.3 and it's tested with Node.js v0.4.12, 0.6.11 and 0.7.5. Hope it works with the other versions in between too.\n\n## Features\n\n - event based, suitable for processing big CSV streams\n - configurable separator, quote and escape characters (comma, double-quote and double-quote by default)\n - ignores lines starting with configurable comment character (off by default)\n - supports memory-only streaming\n\n## More examples\n\nEcho first column of the `data.csv` file:\n\n    // equivalent of csv.createCsvFileReader('data.csv') \n    var reader = csv.createCsvFileReader('data.csv', {\n        'separator': ',',\n        'quote': '\"',\n        'escape': '\"',       \n        'comment': '',\n    });\n    var writer = new csv.CsvWriter(process.stdout);\n    reader.addListener('data', function(data) {\n        writer.writeRecord([ data[0] ]);\n    });\n\nReturn data in objects rather than arrays: either by grabbing the column names form the header row (first row is not passed to the `data` listener):\n\n    var reader = csv.createCsvFileReader('data.csv', { columnsFromHeader: true });\n    reader.addListener('data', function(data) {\n        // supposing there are so named columns in the source file\n        sys.puts(data.col1 + \" ... \" + data.col2);\n    });\n\n... or by providing column names from the client code (first row is passed to the `data` listener in this case):\n\n    var reader = csv.createCsvFileReader('data.csv');\n    reader.setColumnNames([ 'col1', 'col2' ]);\n    reader.addListener('data', function(data) {\n        sys.puts(data.col1 + \" ... \" + data.col2);\n    });\n\nNote `reader.setColumnNames()` resets the column names so next invocation of the `data` listener will again receive the data in an array rather than an object.\n\nConvert the `/etc/passwd` file to comma separated format, drop commented lines and dump the results to the standard output:\n\n    var reader = csv.createCsvFileReader('/etc/passwd', {\n        'separator': ':',\n        'quote': '\"',\n        'escape': '\"',\n        'comment': '#',\n    });\n    var writer = new csv.CsvWriter(process.stdout);\n    reader.addListener('data', function(data) {\n        writer.writeRecord(data);\n    });\n\nParsing an upload as the data comes in, using node-formidable:\n\n    upload_form.onPart = function(part) {\n        if (!part.filename) { upload_form.handlePart(part); return }\n\n        var reader = csv.createCsvFileReader({'comment': '#'});\n        reader.addListener('data', function(data) {\n            saveRecord(data);\n        });\n\n        part.on('data', function(buffer) {\n            // Pipe incoming data into the reader.\n            reader.parse(buffer);\n        });\n        part.on('end', function() {\n            reader.end()\n        }\n    }\n",
+  "readme": "# ya-csv\n\nEvent based CSV parser and writer for Node.js suitable for processing large CSV streams.\n\n    // A simple echo program:\n    var csv = require('ya-csv');\n\n    var reader = csv.createCsvStreamReader(process.openStdin());\n    var writer = csv.createCsvStreamWriter(process.stdout);\n\n    reader.addListener('data', function(data) {\n        writer.writeRecord(data);\n    });\n\n## Installation\n\n    npm install ya-csv\n\nCurrent version requires at least Node.js v0.2.3 and it's tested with Node.js v0.4.12, 0.6.11, 0.7.5 and v0.10.24. Hope it works with the other versions in between too.\n\n## Features\n\n - event based, suitable for processing big CSV streams\n - configurable separator, quote and escape characters (comma, double-quote and double-quote by default)\n - ignores lines starting with configurable comment character (off by default)\n - supports memory-only streaming\n\n## More examples\n\nEcho first column of the `data.csv` file:\n\n    // equivalent of csv.createCsvFileReader('data.csv') \n    var reader = csv.createCsvFileReader('data.csv', {\n        'separator': ',',\n        'quote': '\"',\n        'escape': '\"',       \n        'comment': '',\n    });\n    var writer = new csv.CsvWriter(process.stdout);\n    reader.addListener('data', function(data) {\n        writer.writeRecord([ data[0] ]);\n    });\n\nReturn data in objects rather than arrays: either by grabbing the column names form the header row (first row is not passed to the `data` listener):\n\n    var reader = csv.createCsvFileReader('data.csv', { columnsFromHeader: true });\n    reader.addListener('data', function(data) {\n        // supposing there are so named columns in the source file\n        sys.puts(data.col1 + \" ... \" + data.col2);\n    });\n\n... or by providing column names from the client code (first row is passed to the `data` listener in this case):\n\n    var reader = csv.createCsvFileReader('data.csv');\n    reader.setColumnNames([ 'col1', 'col2' ]);\n    reader.addListener('data', function(data) {\n        sys.puts(data.col1 + \" ... \" + data.col2);\n    });\n\nNote `reader.setColumnNames()` resets the column names so next invocation of the `data` listener will again receive the data in an array rather than an object.\n\nConvert the `/etc/passwd` file to comma separated format, drop commented lines and dump the results to the standard output:\n\n    var reader = csv.createCsvFileReader('/etc/passwd', {\n        'separator': ':',\n        'quote': '\"',\n        'escape': '\"',\n        'comment': '#',\n    });\n    var writer = new csv.CsvWriter(process.stdout);\n    reader.addListener('data', function(data) {\n        writer.writeRecord(data);\n    });\n\nParsing an upload as the data comes in, using node-formidable:\n\n    upload_form.onPart = function(part) {\n        if (!part.filename) { upload_form.handlePart(part); return }\n\n        var reader = csv.createCsvFileReader({'comment': '#'});\n        reader.addListener('data', function(data) {\n            saveRecord(data);\n        });\n\n        part.on('data', function(buffer) {\n            // Pipe incoming data into the reader.\n            reader.parse(buffer);\n        });\n        part.on('end', function() {\n            reader.end()\n        }\n    }\n",
   "readmeFilename": "README.md",
-  "_id": "ya-csv@0.9.2",
+  "homepage": "https://github.com/koles/ya-csv",
+  "_id": "ya-csv@0.9.3",
   "dist": {
-    "shasum": "088ddf523ca066bbe654146100cf70030d9f6779"
+    "shasum": "e3b1e84b699c569949b8b68a319a1b065ac456b3"
   },
-  "_from": "ya-csv@",
-  "_resolved": "https://registry.npmjs.org/ya-csv/-/ya-csv-0.9.2.tgz"
+  "_from": "ya-csv@0.9.3",
+  "_resolved": "https://registry.npmjs.org/ya-csv/-/ya-csv-0.9.3.tgz"
 }

Dev/trunk/src/node_modules/ya-csv/test/echo.js

@@ -1 +1 @@
 var csv  = require('../lib/ya-csv'),
-    sys  = require('sys');
+    util = require('util');
 
-sys.debug('start');
+util.debug('start');
 
 if (process.argv.length < 3) {
-    sys.error("Usage: node " + process.argv[1] + " <csv file>");
+    util.error("Usage: node " + process.argv[1] + " <csv file>");
     process.exit(1);
 }
@@ -24 +24 @@
 
 csvIn.addListener('end', function() {
-    sys.debug('end');
-    sys.debug(columns + ' columns, ' + lines + ' lines');
+    util.debug('end');
+    util.debug(columns + ' columns, ' + lines + ' lines');
 });
 

Dev/trunk/src/node_modules/ya-csv/test/index.js

@@ -1 @@
-var sys;
+var util;
 try {
-  sys    = require('util'); 
+  util    = require('util'); 
 } catch (e) {
-  sys    = require('sys');
+  util = require('sys');
 }
 
@@ -27 +27 @@
 csvIn.addListener('end', function() {
     assert.strictEqual(expectedRows, lines, "Wrong number of records");
-    sys.debug(columns + ' columns, ' + lines + ' lines');
+    util.debug(columns + ' columns, ' + lines + ' lines');
 });
 

Dev/trunk/src/node_modules/ya-csv/test/stream.js

@@ -1 +1 @@
 var csv  = require('../lib/ya-csv'),
-    sys  = require('sys'),
+    util = require('util'),
     fs = require('fs');
 
-sys.debug('start');
+util.debug('start');
 
 if (process.argv.length < 3) {
-    sys.error("Usage: node " + process.argv[1] + " <csv file>");
+    util.error("Usage: node " + process.argv[1] + " <csv file>");
     process.exit(1);
 }
@@ -20 +20 @@
 
 csvIn.addListener('end', function() {
-    sys.debug('end');
-    sys.debug(columns + ' columns, ' + lines + ' lines');
+    util.debug('end');
+    util.debug(columns + ' columns, ' + lines + ' lines');
 });
 
 csvIn.addListener('error', function(e) {
-    sys.debug('error');
-    sys.debug(e);
+    util.debug('error');
+    util.debug(e);
 });
 
@@ -38 +38 @@
 fileIn.setEncoding('utf8');
 fileIn.on('data', function(data) {
-  sys.debug(data);
+  util.debug(data);
   csvIn.parse(data);
 });