Fixing multiple branches in converter

Author: mrodrig

lib/converter.js

@@ -11,6 +11,17 @@ var json2Csv = require('./json-2-csv'), // Require our json-2-csv code
  */
 var defaultOptions = constants.DefaultOptions;
 
+var isDefined = function (val) {
+    return !_.isUndefined(val);
+};
+
+var copyOption = function (options, lowercasePath, uppercasePath) {
+    var lowerCaseValue = docPath.evaluatePath(options, lowercasePath);
+    if (isDefined(lowerCaseValue)) {
+        docPath.setPath(options, uppercasePath, lowerCaseValue);
+    }
+};
+
 /**
  * Build the options to be passed to the appropriate function
  * If a user does not provide custom options, then we use our default
@@ -23,19 +34,18 @@ var buildOptions = function (opts, cb) {
 
     // #62: Allow for lower case option names
     if (opts) {
-        if (!_.isUndefined(opts.prependHeader)) { docPath.setPath(opts, 'PREPEND_HEADER', opts.prependHeader); }
-        if (!_.isUndefined(opts.trimHeaderFields)) { docPath.setPath(opts, 'TRIM_HEADER_FIELDS', opts.trimHeaderFields); }
-        if (!_.isUndefined(opts.trimFieldValues)) { docPath.setPath(opts, 'TRIM_FIELD_VALUES', opts.trimFieldValues); }
-        if (!_.isUndefined(opts.sortHeader)) { docPath.setPath(opts, 'SORT_HEADER', opts.sortHeader); }
-        if (!_.isUndefined(opts.parseCsvNumbers)) { docPath.setPath(opts, 'PARSE_CSV_NUMBERS', opts.parseCsvNumbers); }
-        if (!_.isUndefined(opts.keys)) { docPath.setPath(opts, 'KEYS', opts.keys); }
-        if (!_.isUndefined(opts.checkSchemaDifferences)) { docPath.setPath(opts, 'CHECK_SCHEMA_DIFFERENCES', opts.checkSchemaDifferences); }
-        if (!_.isUndefined(opts.emptyFieldValue)) { docPath.setPath(opts, 'EMPTY_FIELD_VALUE', opts.emptyFieldValue); }
-        if (!_.isUndefined(opts.delimiter)) { 
-            if (!_.isUndefined(opts.delimiter.field)) { docPath.setPath(opts, 'DELIMITER.FIELD', opts.delimiter.field); }
-            if (!_.isUndefined(opts.delimiter.array)) { docPath.setPath(opts, 'DELIMITER.ARRAY', opts.delimiter.array); }
-            if (!_.isUndefined(opts.delimiter.wrap)) { docPath.setPath(opts, 'DELIMITER.WRAP', opts.delimiter.wrap); }
-            if (!_.isUndefined(opts.delimiter.eol)) { docPath.setPath(opts, 'DELIMITER.EOL', opts.delimiter.eol); }
+        copyOption(opts, 'prependHeader', 'PREPEND_HEADER');
+        copyOption(opts, 'trimHeaderFields', 'TRIM_HEADER_FIELDS');
+        copyOption(opts, 'sortHeader', 'SORT_HEADER');
+        copyOption(opts, 'parseCsvNumbers', 'PARSE_CSV_NUMBERS');
+        copyOption(opts, 'keys', 'KEYS');
+        copyOption(opts, 'checkSchemaDifferences', 'CHECK_SCHEMA_DIFFERENCES');
+        copyOption(opts, 'emptyFieldValue', 'EMPTY_FIELD_VALUE');
+        if (isDefined(opts.delimiter)) { 
+            copyOption(opts, 'delimiter.field', 'DELIMITER.FIELD');
+            copyOption(opts, 'delimiter.array', 'DELIMITER.ARRAY');
+            copyOption(opts, 'delimiterwrap', 'DELIMITER.WRAP');
+            copyOption(opts, 'delimiter.eol', 'DELIMITER.EOL');
         }
     }
 

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": "2.0.19",
+    "version": "2.0.20",
     "repository": {
         "type": "git",
         "url": "http://github.com/mrodrig/json-2-csv.git"