migrated path lib to a new module, work on json-2-csv, updated coverage, rev is up to 1.2.0

Author: mrodrig

README.md

@@ -144,10 +144,10 @@ $ npm run coverage
 
 Current Coverage is:
 ```
-Statements   : 94.94% ( 150/158 )
-Branches     : 90.43% ( 85/94 )
-Functions    : 100% ( 33/33 )
-Lines        : 97.22% ( 140/144 )
+Statements   : 94.49% ( 120/127 )
+Branches     : 90.24% ( 74/82 )
+Functions    : 100% ( 30/30 )
+Lines        : 97.39% ( 112/115 )
 ```
 
 ## Features

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "json-2-csv",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "homepage": "https://github.com/mrodrig/json-2-csv",
   "moduleType": [
     "node"

lib/csv-2-json.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var _ = require('underscore'),
-    path = require('./path'),
+    path = require('doc-path'),
     constants = require('./constants');
 
 var options = {}; // Initialize the options - this will be populated when the csv2json function is called.

lib/json-2-csv.js

@@ -2,6 +2,7 @@
 
 var _ = require('underscore'),
     constants = require('./constants'),
+    path = require('doc-path'),
     Promise = require('bluebird');
 
 var options = {}; // Initialize the options - this will be populated when the json2csv function is called.
@@ -76,21 +77,11 @@ var generateDocumentHeading = function(heading, data) {
  * @returns {Array}
  */
 var convertData = function (data, keys) {
-    var output = [], // Array of CSV representing converted docs
-        value; // Temporary variable to store the current data
-
-    _.each(keys, function (key) { // For each key
-        var indexOfPeriod = _.indexOf(key, '.');
-        if (indexOfPeriod > -1) {
-            var pathPrefix = key.slice(0, indexOfPeriod),
-                pathRemainder = key.slice(indexOfPeriod+1);
-            output.push(convertData(data[pathPrefix], [pathRemainder]));
-        } else if (keys.indexOf(key) > -1) { // If the keys contain the current key, then process the data
-            value = data[key]; // Set the current data that we are looking at
-            output.push(convertField(value, output));
-        }
-    });
-    return output; // Return the data joined by our field delimiter
+    // Reduce each key in the data to its CSV value
+    return _.reduce(keys, function (output, key) {
+        // Add the CSV representation of the data at the key in the document to the output array
+        return output.concat(convertField(path.evaluatePath(data, key)));
+    }, []);
 };
 
 /**
@@ -117,9 +108,9 @@ var convertField = function (value) {
  */
 var generateCsv = function (data, headingKeys) {
     // Reduce each JSON document in data to a CSV string and append it to the CSV accumulator
-    return Promise.resolve([headingKeys, _.reduce(data, function (csv, doc) {
-        return csv += _.flatten(convertData(doc, headingKeys)).join(options.DELIMITER.FIELD) + options.EOL;
-    }, '')]);
+    return [headingKeys].concat(_.reduce(data, function (csv, doc) {
+        return csv += convertData(doc, headingKeys).join(options.DELIMITER.FIELD) + options.EOL;
+    }, ''));
 };
 
 module.exports = {

lib/path.js

@@ -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.3",
+    "version": "1.2.0",
     "repository": {
         "type": "git",
     	"url": "http://github.com/mrodrig/json-2-csv.git"
@@ -25,6 +25,7 @@
     ],
     "dependencies": {
     	"underscore": "~1.8.3",
+        "doc-path": "~1.0.0",
         "bluebird": "~2.9.24"
     },
     "devDependencies": {

package.json

@@ -1,9 +1,7 @@
 var json2csvTests = require('./testJson2Csv'),
-    csv2jsonTests = require('./testCsv2Json'),
-    pathTests     = require('./testPath');
+    csv2jsonTests = require('./testCsv2Json');
 
 describe('json-2-csv Module', function() {
     json2csvTests.runTests();
     csv2jsonTests.runTests();
-    pathTests.runTests();
 });