Merge pull request #17 from mrodrig/make-promisifiable

Make json-2-csv promisifiable

Author: mrodrig

.npmignore

@@ -1,3 +1,6 @@
 test/
 .git*
+npm-debug.log
 .travis.yml
+node_modules/
+node_modules/*

README.md

@@ -143,6 +143,7 @@ _Note_: This requires `mocha`, `should`, `async`, and `underscore`.
 - 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)
 
 ## F.A.Q.
 

bower.json

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

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,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.0",
+    "version": "1.1.1",
     "repository": {
         "type": "git",
     	"url": "http://github.com/mrodrig/json-2-csv.git"
@@ -27,9 +27,9 @@
         "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"
     },
     "engines": {
     	"node": "*"