Add promise interface

README.md

@@ -124,6 +124,20 @@ restify HTTP errors).  If `obj` looks like a `RestError`:
 then `err` gets "upconverted" into a `RestError` for you.  Otherwise
 it will be an `HttpError`.
 
+**Promise interface:**
+
+Without passing a callback as a last parameter to the method call, it returns 
+a Promise.  
+
+This returned Promise will be resolved with the same arguments as the callback 
+version would, except that arguments will be wrapped in an object, for example:
+
+```js
+client.get('/foo/bar')
+  .then(function({ req, res, obj }) {})
+  .catch(function(err) {});
+```
+
 #### createJsonClient(options)
 
 ```javascript
@@ -228,6 +242,20 @@ the source for `JsonClient`. Effectively, you extend it, and set the
 appropriate options in the constructor and implement a `write` (for
 put/post) and `parse` method (for all HTTP bodies), and that's it.
 
+**Promise interface:**
+
+Without passing a callback as a last parameter to the method call, it returns 
+a Promise.  
+
+This returned Promise will be resolved with the same arguments as the callback 
+version would, except that arguments will be wrapped in an object, for example:
+
+```js
+client.get('/foo/bar')
+  .then(function({ req, res, data }) {})
+  .catch(function(err) {});
+```
+
 #### createStringClient(options)
 
 ```javascript

lib/StringClient.js

@@ -8,9 +8,55 @@ var zlib = require('zlib');
 var assert = require('assert-plus');
 var qs = require('querystring');
 var util = require('util');
+var Promise = require('es6-promise');
 
 var HttpClient = require('./HttpClient');
 
+/**
+ * Returns a Promise when callback fn is undefined
+ * @function promisify
+ * @returns {Promise|*}
+ */
+function promisify () {
+    var args = Array.prototype.slice.call(arguments);
+    var fn = args.shift();
+    var self = this;
+
+    assert.func(fn, 'args[0]');
+
+    // Is callback presented?
+    if (typeof args[args.length - 1] === 'function') {
+        return (fn.apply(self, args));
+    }
+
+    return new Promise(function (resolve, reject) {
+        // callback is passed as last argument (undefined)
+        args[args.length - 1] = function (err, req, res, data) {
+            if (err) {
+                reject(err);
+                return;
+            }
+
+            var result = {
+                req: req,
+                res: res
+            };
+
+            if (data) {
+                if (self.constructor.name === 'JsonClient') {
+                    result.obj = data;
+                } else {
+                    result.data = data;
+                }
+            }
+
+            resolve(result);
+        };
+
+        fn.apply(self, args);
+    });
+}
+
 
 // --- API
 
@@ -57,27 +103,58 @@ function normalizeArgs(arg1, arg2, arg3) {
     };
 }
 
+StringClient.prototype.del = function del(options, callback) {
+    var opts = this._options('DELETE', options);
+    var read = promisify.bind(this, this.read);
+    return (read(opts, callback));
+};
+
+
+StringClient.prototype.get = function get(options, callback) {
+    var opts = this._options('GET', options);
+    var read = promisify.bind(this, this.read);
+    return (read(opts, callback));
+};
+
+
+StringClient.prototype.head = function head(options, callback) {
+    var opts = this._options('HEAD', options);
+    var read = promisify.bind(this, this.read);
+    return (read(opts, callback));
+};
+
+
+StringClient.prototype.opts = function httpOptions(options, callback) {
+    var opts = this._options('OPTIONS', options);
+    var read = promisify.bind(this, this.read);
+    return (read(opts, callback));
+};
+
+
 StringClient.prototype.post = function post(options, body, callback) {
     var opts = this._options('POST', options);
+    var write = promisify.bind(this, this.write);
 
     var args = normalizeArgs.apply(null, arguments);
-    return (this.write(opts, args.body, args.callback));
+    return (write(opts, args.body, args.callback));
 };
 
 
 StringClient.prototype.put = function put(options, body, callback) {
     var opts = this._options('PUT', options);
+    var write = promisify.bind(this, this.write);
 
     var args = normalizeArgs.apply(null, arguments);
-    return (this.write(opts, args.body, args.callback));
+    return (write(opts, args.body, args.callback));
 };
 
 
 StringClient.prototype.patch = function patch(options, body, callback) {
     var opts = this._options('PATCH', options);
+    var write = promisify.bind(this, this.write);
 
     var args = normalizeArgs.apply(null, arguments);
-    return (this.write(opts, args.body, args.callback));
+    return (write(opts, args.body, args.callback));
 };
 
 

package.json

@@ -60,6 +60,7 @@
     "assert-plus": "^1.0.0",
     "backoff": "^2.4.1",
     "bunyan": "^1.8.3",
+    "es6-promise": "4.1.1",
     "fast-safe-stringify": "^1.1.3",
     "keep-alive-agent": "0.0.1",
     "lodash": "^4.7.0",

test/index.js

@@ -273,6 +273,15 @@ describe('restify-client tests', function () {
         });
     });
 
+    it('GET json via Promise interface', function () {
+        return JSON_CLIENT.get('/json/mcavage')
+            .then(function (result) {
+                assert.ok(result.req);
+                assert.ok(result.res);
+                assert.deepEqual(result.obj, {hello: 'mcavage'});
+            });
+    });
+
     it('GH-778 GET jsonp', function (done) {
         // Using variables here to keep lines under 80 chars
         var jsonpUrl = '/json/jsonp?callback=testCallback';
@@ -354,6 +363,16 @@ describe('restify-client tests', function () {
         });
     });
 
+    it('POST json via Promise interface', function () {
+        var data = { hello: 'foo' };
+        return JSON_CLIENT.post('/json/mcavage', data)
+            .then(function (result) {
+                assert.ok(result.req);
+                assert.ok(result.res);
+                assert.deepEqual(result.obj, {hello: 'foo'});
+            });
+    });
+
     it('POST with circular JSON', function (done) {
         var data = {
             hello: 'foo'
@@ -463,6 +482,16 @@ describe('restify-client tests', function () {
         });
     });
 
+    it('GET text via Promise interface', function () {
+        return STR_CLIENT.get('/str/mcavage')
+            .then(function (result) {
+                assert.ok(result.req);
+                assert.ok(result.res);
+                assert.equal(result.res.body, result.data);
+                assert.equal(result.data, 'hello mcavage');
+            });
+    });
+
     it('GET PARTIAL text', function (done) {
         var opts = {
             path: '/str/mcavage',

test/nock.js

@@ -44,5 +44,23 @@ describe('restify-client tests against nock', function () {
         client.get('/nock', done);
     });
 
+    it('reject with promise interface', function (done) {
+        var nockErr = new Error('My Error');
+
+        nock('http://127.0.0.1', {allowUnmocked: true})
+            .get('/nock')
+            .replyWithError(nockErr);
+
+        var client = clients.createJsonClient({
+            url: 'http://127.0.0.1'
+        });
+
+        client.get('/nock')
+            .catch(function (err) {
+                assert.equal(err, nockErr);
+                done();
+            });
+    });
+
 });