Making the json2csv and csv2json functions promisifiable

Author: mrodrig

lib/converter.js

@@ -40,6 +40,12 @@ module.exports = {
     // a callback that will be called with (err, csv) after
     // processing is completed, and optional options
     json2csv: function (array, callback, opts) {
+        // If this was promisified (callback and opts are swapped) then fix the argument order.
+        if (_.isObject(callback) && !_.isFunction(callback)) {
+            var func = opts;
+            opts = callback;
+            callback = func;
+        }
         buildOptions(opts, function (err, options) { // Build the options
             if (err) {
                 return callback(err);
@@ -55,6 +61,12 @@ module.exports = {
     // a callback that will be called with (err, csv) after
     // processing is completed, and optional options
     csv2json: function (csv, callback, opts) {
+        // If this was promisified (callback and opts are swapped) then fix the argument order.
+        if (_.isObject(callback) && !_.isFunction(callback)) {
+            var func = opts;
+            opts = callback;
+            callback = func;
+        }
         buildOptions(opts, function (err, options) { // Build the options
             if (err) {
                 return callback(err);

package.json

@@ -2,7 +2,11 @@
     "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.",
+<<<<<<< HEAD
     "version": "1.1.0",
+=======
+    "version": "1.0.9",
+>>>>>>> Making the json2csv and csv2json functions promisifiable
     "repository": {
         "type": "git",
     	"url": "http://github.com/mrodrig/json-2-csv.git"
@@ -27,12 +31,13 @@
         "bluebird": "~2.9.24"
     },
     "devDependencies": {
-        "mocha": "~1.14.0",
-        "should": "~2.0.2",
-        "async": "~0.2.9"
+        "mocha": "~2.2.4",
+        "should": "~5.2.0",
+        "async": "~0.2.10",
+        "bluebird": "~2.9.24"
     },
     "engines": {
     	"node": "*"
     },
     "license": "MIT"
-}
+}