Adding tests for key specification, updating to 1.1.2, updated README

mrodrig · mrodrig · commit beb388b51a25 · 2015-04-12T10:12:17.000-04:00
diff --git a/README.md b/README.md
@@ -40,7 +40,6 @@ var converter = require('json-2-csv');
 ##### json2csv Example:
 
 ```javascript
-
 var converter = require('json-2-csv');
 
 var documents = [
@@ -70,7 +69,6 @@ var json2csvCallback = function (err, csv) {
 };
 
 converter.json2csv(documents, json2csvCallback);
-
 ```
 
 The above code prints out:
@@ -90,7 +88,10 @@ BMW,X5,2014,3287,M
     * `FIELD` - String - Field Delimiter. Default: `','`
     * `ARRAY` - String - Array Value Delimiter. Default: `';'`
   * `EOL` - String - End of Line Delimiter. Default: `'\n'`
-  * `PARSE_CSV_NUMBERS` - Boolean - Should numbers that are found in the CSV be converted to numbers? Default: `false`
+  * `PARSE_CSV_NUMBERS` - Boolean - (TODO) Should numbers that are found in the CSV be converted to numbers? Default: `false`
+  * `KEYS` - Array - Specify the keys (as strings) that should be converted. Default: `null`
+    * If you have a nested object (ie. {info : {name: 'Mike'}}), then set options.KEYS to ['info.name']
+    * If you want all keys to be converted, then specify ```null``` or don't specify the option to utilize the default.
 
 ##### csv2json Example:
 
@@ -137,19 +138,72 @@ _Note_: This requires `mocha`, `should`, `async`, and `underscore`.
 ## Features
 
 - Header Generation (per document keys)
+- Allows for conversion of specific keys in both json2csv and csv2json via the options.KEYS parameter (as of 1.1.2)
 - Verifies all documents have same schema (schema field order does not matter as of 1.1.0)
 - Supports sub-documents natively
 - Supports arrays as document values for both json2csv and csv2json
 - Custom ordering of columns (see F.A.Q. for more information)
 - Ability to re-generate the JSON documents that were used to generate the CSV (including nested documents)
 - Allows for custom field delimiters, end of line delimiters, etc.
-- Promisifiable via bluebird's .promisify(<function) and .promisifyAll() (as of 1.1.1)
+- Promisifiable via bluebird's .promisify(<function>) and .promisifyAll(<object>) (as of 1.1.1)
 
 ## F.A.Q.
 
 - Can the order of the keys be changed in the output?
 __Yes.__ Currently, changing the order of the keys in the JSON document will also change the order of the columns. (Tested on Node 10.xx)
 
+- Can I specify the keys that I would like to have converted to CSV or JSON?
+__Yes.__ This is currently supported for both json2csv and csv2json.  Specify the keys in options.KEYS. For example,
+
+```javascript
+var converter = require('json-2-csv');
+
+var options = {
+    KEYS : ['info.name', 'year']
+};
+
+var documents = [
+    {
+        "info": {
+            "name": "Mike"
+        },
+        "coursesTaken": ["CS2500", "CS2510"],
+        "year": "Sophomore"
+    },
+    {
+        "info": {
+            "name": "John"
+        },
+        "coursesTaken": ["ANTH1101", "POL2312", "MATH2142", "POL3305", "LAW2100"],
+        "year": "Senior"
+    },
+    {
+        "info": {
+                    "name": "Joe"
+        },
+        "coursesTaken": [],
+        "year": "Freshman"
+    }
+];
+
+converter.json2csv(documents, function (err, csv) {
+    if (!err) {
+        return console.log(csv);
+    }
+    throw err;
+}, options);
+```
+
+This prints out:
+
+```csv
+info.name,year
+Mike,Sophomore
+John,Senior
+Joe,Freshman
+
+```
+
 ## Milestones
  - Created: Apr 23, 2014
  - 1K Downloads/Month: January 15, 2015
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "json-2-csv",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "homepage": "https://github.com/mrodrig/json-2-csv",
   "moduleType": [
     "node"
diff --git a/lib/csv-2-json.js b/lib/csv-2-json.js
@@ -89,7 +89,7 @@ var convertCSV = function (lines, callback) {
     _.each(lines, function (line) { // For each line, create the document and add it to the array of documents
         jsonDocs.push(createDoc(headers, line));
     });
-    return _.filter(jsonDocs, function (doc) { return doc !== false; });; // Return all non 'falsey' values to filter blank lines
+    return _.filter(jsonDocs, function (doc) { return doc !== false; }); // Return all non 'falsey' values to filter blank lines
 };
 
 module.exports = {
@@ -109,4 +109,4 @@ module.exports = {
         callback(null, json); // Send the data back to the caller
     }
 
-};
+};
diff --git a/package.json b/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.1.1",
+    "version": "1.1.2",
     "repository": {
         "type": "git",
     	"url": "http://github.com/mrodrig/json-2-csv.git"
diff --git a/test/CSV/arrayValueDocs_specificKeys.csv b/test/CSV/arrayValueDocs_specificKeys.csv
@@ -0,0 +1,4 @@
+info.name,year
+Mike,Sophomore
+John,Senior
+Joe,Freshman
diff --git a/test/CSV/withQuotes/arrayValueDocs_specificKeys.csv b/test/CSV/withQuotes/arrayValueDocs_specificKeys.csv
@@ -0,0 +1,4 @@
+"info.name","year"
+"Mike","Sophomore"
+"John","Senior"
+"Joe","Freshman"
diff --git a/test/JSON/arrayValueDocs_specificKeys.json b/test/JSON/arrayValueDocs_specificKeys.json
@@ -0,0 +1,20 @@
+[
+        {
+                "info": {
+                    "name": "Mike"
+                },
+                "year": "Sophomore"
+        },
+        {
+                "info": {
+                    "name": "John"
+                },
+                "year": "Senior"
+        },
+        {
+                "info": {
+                            "name": "Joe"
+                },
+                "year": "Freshman"
+        }
+]
diff --git a/test/testComma.js b/test/testComma.js
@@ -21,6 +21,7 @@ var json_regularJson                 = require('./JSON/regularJson'),
     json_noData                      = require('./JSON/noData.json'),
     json_singleDoc                   = require('./JSON/singleDoc.json'),
     json_arrayValue                  = require('./JSON/arrayValueDocs.json'),
+    json_arrayValue_specificKeys     = require('./JSON/arrayValueDocs_specificKeys.json'),
     json_sameSchemaDifferentOrdering = require('./JSON/sameSchemaDifferentOrdering'),
     json_differentSchemas            = require('./JSON/differentSchemas'),
     csv_regularJson                  = '',
@@ -29,7 +30,8 @@ var json_regularJson                 = require('./JSON/regularJson'),
     csv_nestedQuotes                 = '',
     csv_noData                       = '',
     csv_singleDoc                    = '',
-    csv_arrayValue                   = '';
+    csv_arrayValue                   = '',
+    csv_arrayValue_specificKeys      = '';
 
 var json2csvTests = function () {
     describe('json2csv - non-promisified', function (done) {
@@ -90,6 +92,16 @@ var json2csvTests = function () {
                 }, options);
             });
 
+            it('should parse the specified keys to CSV', function (done) {
+                // Create a copy so we don't modify the actual options object
+                var opts = _.extend(JSON.parse(JSON.stringify(options)), {KEYS: ['info.name', 'year']});
+                converter.json2csv(json_arrayValue, function (err, csv) {
+                    csv.should.equal(csv_arrayValue_specificKeys);
+                    csv.split(options.EOL).length.should.equal(5);
+                    done();
+                }, opts);
+            });
+
             it('should parse an array of JSON documents with the same schema but different ordering of fields', function (done) {
                 converter.json2csv(json_sameSchemaDifferentOrdering, function (err, csv) {
                     csv.should.equal(csv_regularJson);
@@ -510,6 +522,20 @@ var json2csvTests = function () {
                     });
             });
 
+            it('should parse the specified keys to CSV', function (done) {
+                // Create a copy so we don't modify the actual options object
+                var opts = _.extend(JSON.parse(JSON.stringify(options)), {KEYS: ['info.name', 'year']});
+                converter.json2csvAsync(json_arrayValue, opts)
+                    .then(function (csv) {
+                        csv.should.equal(csv_arrayValue_specificKeys);
+                        csv.split(options.EOL).length.should.equal(5);
+                        done();
+                    })
+                    .catch(function (err) {
+                        throw err;
+                    });
+            });
+
             it('should parse an array of JSON documents with the same schema but different ordering of fields', function (done) {
                 converter.json2csvAsync(json_sameSchemaDifferentOrdering)
                     .then(function (csv) {
@@ -617,6 +643,15 @@ var csv2jsonTests = function () {
                 }, options);
             });
 
+            it('should parse the specified keys to JSON', function (done) {
+                var opts = _.extend(JSON.parse(JSON.stringify(options)), {KEYS : ['info.name', 'year']});
+                converter.csv2jsonAsync(csv_arrayValue.replace(/,/g, options.DELIMITER.FIELD), function (err, json) {
+                    var isEqual = _.isEqual(json, json_arrayValue_specificKeys);
+                    true.should.equal(isEqual);
+                    done();
+                }, opts);
+            });
+
             it('should throw an error about not having been passed data - 1', function (done) {
                 converter.csv2json(null, function (err, json) {
                     err.message.should.equal('Cannot call csv2json on null.');
@@ -876,6 +911,19 @@ var csv2jsonTests = function () {
                     });
             });
 
+            it('should parse the specified keys to JSON', function (done) {
+                var opts = _.extend(JSON.parse(JSON.stringify(options)), {KEYS : ['info.name', 'year']});
+                converter.csv2jsonAsync(csv_arrayValue.replace(/,/g, options.DELIMITER.FIELD), opts)
+                    .then(function (json) {
+                        var isEqual = _.isEqual(json, json_arrayValue_specificKeys);
+                        true.should.equal(isEqual);
+                        done();
+                    })
+                    .catch(function (err) {
+                        throw err;
+                    });
+            });
+
             it('should throw an error about not having been passed data - 1', function (done) {
                 converter.csv2jsonAsync(null, options)
                     .then(function (json) {
@@ -1063,6 +1111,13 @@ module.exports = {
                                 csv_arrayValue = data.toString();
                                 callback(null);
                             });
+                        },
+                        function(callback) {
+                            fs.readFile('test/CSV/arrayValueDocs_specificKeys.csv', function (err, data) {
+                                if (err) callback(err);
+                                csv_arrayValue_specificKeys = data.toString();
+                                callback(null);
+                            });
                         }
                     ],
                     function(err, results) {
diff --git a/test/testQuoted.js b/test/testQuoted.js
@@ -23,6 +23,7 @@ var json_regularJson                 = require('./JSON/regularJson'),
     json_noData                      = require('./JSON/noData.json'),
     json_singleDoc                   = require('./JSON/singleDoc.json'),
     json_arrayValue                  = require('./JSON/arrayValueDocs.json'),
+    json_arrayValue_specificKeys     = require('./JSON/arrayValueDocs_specificKeys.json'),
     json_sameSchemaDifferentOrdering = require('./JSON/sameSchemaDifferentOrdering'),
     json_differentSchemas            = require('./JSON/differentSchemas'),
     csv_regularJson                  = '',
@@ -32,7 +33,8 @@ var json_regularJson                 = require('./JSON/regularJson'),
     csv_nestedComma                  = '',
     csv_noData                       = '',
     csv_singleDoc                    = '',
-    csv_arrayValue                   = '';
+    csv_arrayValue                   = '',
+    csv_arrayValue_specificKeys      = '';
 
 var json2csvTests = function () {
     describe('json2csv - non-promisified', function (done) {
@@ -101,6 +103,16 @@ var json2csvTests = function () {
                 }, options);
             });
 
+            it('should parse the specified keys to CSV', function (done) {
+                // Create a copy so we don't modify the actual options object
+                var opts = _.extend(JSON.parse(JSON.stringify(options)), {KEYS: ['info.name', 'year']});
+                converter.json2csv(json_arrayValue, function (err, csv) {
+                    csv.should.equal(csv_arrayValue_specificKeys);
+                    csv.split(options.EOL).length.should.equal(5);
+                    done();
+                }, opts);
+            });
+
             it('should parse an array of JSON documents with the same schema but different ordering of fields', function (done) {
                 converter.json2csv(json_sameSchemaDifferentOrdering, function (err, csv) {
                     csv.should.equal(csv_regularJson);
@@ -258,6 +270,20 @@ var json2csvTests = function () {
                     });
             });
 
+            it('should parse the specified keys to CSV', function (done) {
+                // Create a copy so we don't modify the actual options object
+                var opts = _.extend(JSON.parse(JSON.stringify(options)), {KEYS: ['info.name', 'year']});
+                converter.json2csvAsync(json_arrayValue, opts)
+                    .then(function (csv) {
+                        csv.should.equal(csv_arrayValue_specificKeys);
+                        csv.split(options.EOL).length.should.equal(5);
+                        done();
+                    })
+                    .catch(function (err) {
+                        throw err;
+                    });
+            });
+
             it('should parse an array of JSON documents with the same schema but different ordering of fields', function (done) {
                 converter.json2csvAsync(json_sameSchemaDifferentOrdering, options)
                     .then(function (csv) {
@@ -366,6 +392,13 @@ module.exports = {
                                 csv_arrayValue = data.toString();
                                 callback(null);
                             });
+                        },
+                        function(callback) {
+                            fs.readFile('test/CSV/withQuotes/arrayValueDocs_specificKeys.csv', function (err, data) {
+                                if (err) callback(err);
+                                csv_arrayValue_specificKeys = data.toString();
+                                callback(null);
+                            });
                         }
                     ],
                     function(err, results) {
diff --git a/test/testSemi.js b/test/testSemi.js
diff --git a/test/tests.js b/test/tests.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "json-2-csv",`
`3`		`- "version": "1.1.1",`
	`3`	`+ "version": "1.1.2",`
`4`	`4`	`"homepage": "https://github.com/mrodrig/json-2-csv",`
`5`	`5`	`"moduleType": [`
`6`	`6`	`"node"`