support promise and thunk. fixed #6

Author: fengmk2

.npmignore

@@ -6,3 +6,5 @@ Makefile
 logo.png
 .jshint*
 coverage/
+logo.png
+*.log

README.md

@@ -55,6 +55,12 @@ Require [co](https://github.com/visionmedia/co) and node >= `0.11.12`:
 
 ```js
 var co = require('co');
+var gitlab = require('node-gitlab');
+
+var client = gitlab.createThunk({
+  api: 'https://gitlab.com/api/v3',
+  privateToken: 'your private token'
+});
 
 co(function* () {
   var milestones = yield client.milestones.list({id: 1});
@@ -63,6 +69,8 @@ co(function* () {
 
 ### Promise way
 
+Require node >= `0.11.13` or [bluebird](https://github.com/petkaantonov/bluebird):
+
 ```js
 var gitlab = require('node-gitlab');
 

lib/gitlab.js

@@ -52,3 +52,13 @@ Gitlab.prototype.setAuthentication = function (req) {
 Gitlab.create = function (options) {
   return new Gitlab(options);
 };
+
+Gitlab.createPromise = function (options) {
+  var client = Gitlab.create(options);
+  return require('./promisify')(client);
+};
+
+Gitlab.createThunk = function (options) {
+  var client = Gitlab.create(options);
+  return require('./thunkify')(client);
+};

lib/promisify.js

@@ -0,0 +1,60 @@
+/**!
+ * gitlab - lib/promisify.js
+ *
+ * Copyright(c) fengmk2 and other contributors.
+ * MIT Licensed
+ *
+ * Authors:
+ *   fengmk2 <[email protected]> (http://fengmk2.github.com)
+ */
+
+'use strict';
+
+/**
+ * Module dependencies.
+ */
+
+/* jshint ignore:start */
+var Promise = require('native-or-bluebird');
+/* jshint ignore:end */
+var properties = require('./properties');
+
+module.exports = promisifyAll;
+
+function promisifyAll(source) {
+  var target = {
+    request: promisify('request', source.request.bind(source))
+  };
+  Object.keys(properties).forEach(function (name) {
+    var methods = properties[name];
+    target[name] = {};
+    methods.forEach(function (method) {
+      target[name][method] = promisify(method, source[name][method].bind(source[name]));
+    });
+  });
+  return target;
+}
+
+function promisify(name, fn) {
+  /* jshint evil:true */
+  return eval('(function ' + name + '() {\n'
+    + '  var len = arguments.length;\n'
+    + '  var args = new Array(len + 1);\n'
+    + '  for (var i = 0; i < len; ++i) { args[i] = arguments[i]; }\n'
+    + '  var lastIndex = i;\n'
+    + '  return new Promise(function (resolve, reject) {\n'
+    + '    args[lastIndex] = makeCallback(resolve, reject);\n'
+    + '    fn.apply(null, args);\n'
+    + '  });\n'
+    + '});');
+}
+
+function makeCallback(resolve, reject) {
+  return function (err, result) {
+    if (err) {
+      reject(err);
+    } else {
+      resolve(result);
+    }
+  };
+}

lib/methods.js renamed to lib/properties.js

@@ -1,5 +1,5 @@
 /**!
- * gitlab - lib/methods.js
+ * gitlab - lib/properties.js
  *
  * Copyright(c) fengmk2 and other contributors.
  * MIT Licensed
@@ -16,7 +16,7 @@
 
 var defaultMethods = ['get', 'list', 'create', 'update', 'remove'];
 
-var methods = {
+var properties = {
   milestones: [],
   members: [],
   hooks: [],
@@ -46,8 +46,9 @@ var methods = {
   groupMembers: [],
 };
 
-methods.forEach(function (apis) {
-  apis = defaultMethods.concat(apis);
-});
+for (var key in properties) {
+  var methods = properties[key];
+  properties[key] = defaultMethods.concat(methods);
+}
 
-module.exports = methods;
+module.exports = properties;

lib/thunkify.js

@@ -0,0 +1,27 @@
+/**!
+ * gitlab - lib/thunkify.js
+ *
+ * Copyright(c) fengmk2 and other contributors.
+ * MIT Licensed
+ *
+ * Authors:
+ *   fengmk2 <[email protected]> (http://fengmk2.github.com)
+ */
+
+'use strict';
+
+/**
+ * Module dependencies.
+ */
+
+var thunkify = require('thunkify-wrap');
+var properties = require('./properties');
+
+module.exports = function (client) {
+  thunkify(client, 'request');
+  for (var key in properties) {
+    var methods = properties[key];
+    thunkify(client[key], methods);
+  }
+  return client;
+};

package.json

@@ -4,23 +4,26 @@
   "description": "Gitlab API nodejs client.",
   "main": "index.js",
   "scripts": {
-    "test": "mocha -R spec -t 20000 test/*.test.js",
-    "test-cov": "node --harmony node_modules/.bin/istanbul cover node_modules/.bin/_mocha -- -t 20000 test/*.test.js",
-    "test-travis": "node --harmony node_modules/.bin/istanbul cover node_modules/.bin/_mocha --report lcovonly -- -t 20000 test/*.test.js",
+    "test": "mocha --harmony -R spec -r co-mocha -t 20000 test/*.test.js",
+    "test-cov": "node --harmony node_modules/.bin/istanbul cover node_modules/.bin/_mocha -- -r co-mocha -t 20000 test/*.test.js",
+    "test-travis": "node --harmony node_modules/.bin/istanbul cover node_modules/.bin/_mocha --report lcovonly -- -r co-mocha -t 20000 test/*.test.js",
     "jshint": "jshint .",
     "autod": "autod -w --prefix '~'",
     "cnpm": "npm install --registry=https://registry.npm.taobao.org",
     "contributors": "contributors -f plain -o AUTHORS"
   },
   "dependencies": {
     "debug": "~2.0.0",
-    "restful-client": "~1.0.0"
+    "native-or-bluebird": "~1.1.1",
+    "restful-client": "~1.0.0",
+    "thunkify-wrap": "~1.0.2"
   },
   "devDependencies": {
     "autod": "*",
     "contributors": "*",
-    "istanbul": "*",
+    "istanbul-harmony": "*",
     "mocha": "*",
+    "co-mocha": "*",
     "pedding": "~1.0.0",
     "should": "~4.0.4"
   },

test/client.js

@@ -15,8 +15,9 @@
  */
 
 var gitlab = require('../');
+var config = require('./config');
 
-var client = gitlab.create(require('./config'));
+var client = gitlab.create(config);
 
 client.createProject = function (callback) {
   client._list(function (err) {
@@ -63,4 +64,7 @@ client.removeProject = function (callback) {
   }, callback);
 };
 
+client.promise = gitlab.createPromise(config);
+client.thunk = gitlab.createThunk(config);
+
 module.exports = client;

test/gitlab.test.js

@@ -14,11 +14,10 @@
  * Module dependencies.
  */
 
-var client = require('./client');
 var should = require('should');
+var client = require('./client');
 
 describe('gitlab.test.js', function () {
-
   describe('Client.request()', function () {
     it('should request success', function (done) {
       client.request('get', '/projects', {}, function (err, projects) {
@@ -28,6 +27,20 @@ describe('gitlab.test.js', function () {
       });
     });
 
+    it('should request with promise way success', function (done) {
+      client.promise.request('get', '/projects', {})
+        .then(function (projects) {
+          projects.length.should.above(0);
+          done();
+        })
+        .catch(done);
+    });
+
+    it('should request with thunk way success', function* () {
+      var projects = yield client.thunk.request('get', '/projects', {});
+      projects.length.should.above(0);
+    });
+
     it('should request 404 error', function (done) {
       client.request('get', '/projects/:id/milestones', {id: 99999999}, function (err, milestones) {
         should.exists(err);
@@ -58,7 +71,5 @@ describe('gitlab.test.js', function () {
         done();
       });
     });
-
   });
-
 });

test/issue.test.js

@@ -33,6 +33,7 @@ describe('issue.test.js', function () {
   });
 
   after(client.removeProject);
+
   describe('client.issues.get()', function () {
     it('should return a issue', function (done) {
       client.issues.get({id: client.id, issue_id: issueId}, function (err, row) {
@@ -44,6 +45,26 @@ describe('issue.test.js', function () {
         done();
       });
     });
+
+    it('should return issue with promise way', function (done) {
+      client.promise.issues.get({id: client.id, issue_id: issueId})
+      .then(function (row) {
+        row.id.should.equal(issueId);
+        row.should.have.keys('id', 'iid', 'project_id', 'title', 'description', 'labels',
+          'milestone', 'assignee', 'author', 'state',
+          'updated_at', 'created_at');
+        done();
+      })
+      .catch(done);
+    });
+
+    it('should return issue with thunk way', function* () {
+      var row = yield client.thunk.issues.get({id: client.id, issue_id: issueId});
+      row.id.should.equal(issueId);
+      row.should.have.keys('id', 'iid', 'project_id', 'title', 'description', 'labels',
+        'milestone', 'assignee', 'author', 'state',
+        'updated_at', 'created_at');
+    });
   });
 
   describe('client.issues.list()', function () {
@@ -110,7 +131,6 @@ describe('issue.test.js', function () {
         });
       });
     });
-
   });
 
   describe('client.issues.listNotes()', function () {
@@ -123,6 +143,13 @@ describe('issue.test.js', function () {
         done();
       });
     });
+
+    it('should return issue\'s notes in thunk way', function* () {
+      var rows = yield client.thunk.issues.listNotes({id: client.id, issue_id: issueId});
+      rows.length.should.above(0);
+      var row = rows[0];
+      row.should.have.keys('id', 'body', 'author', 'created_at', 'attachment');
+    });
   });
 
   describe('client.issues.createNote()', function () {