use restful-client

Author: fengmk2

index.js

@@ -1 +1 @@
-module.exports = process.env.GITLAB_COV ? require('./lib-cov/gitlab') : require('./lib/gitlab');
+module.exports = require('./lib/gitlab');

lib/gitlab.js

@@ -11,7 +11,8 @@
  */
 
 var debug = require('debug')('gitlab');
-var urllib = require('urllib');
+var restful = require('restful-client');
+var util = require('util');
 var Milestone = require('./milestone');
 var Project = require('./project');
 var Member = require('./member');
@@ -27,82 +28,32 @@ var Repository = require('./repository');
  *  - {String} api, api root url, e.g.: 'http://gitlab.com/api/v3'
  *  - {String} privateToken, You can find or reset your private token in your profile.
  */
-function Client(options) {
-  this.api = options.api;
+function Gitlab(options) {
+  options = options || {};
+  options.api = options.api || 'https://gitlab.com/api/v3';
+  this.constructor.super_.call(this, options);
+
   this.privateToken = options.privateToken;
 
   this.milestones = new Milestone(this);
-  this.projects = new Project(this);
   this.members = new Member(this);
   this.hooks = new Hook(this);
   this.issues = new Issue(this);
   this.users = new User(this);
-  this.repository = new Repository(this);
+
+  this.addResources({
+    projects: Project,
+    repository: Repository,
+  });
 }
 
-Client.prototype.request = function (method, pathname, data, callback) {
-  var dataType = data.dataType || 'json';
-  delete data.dataType;
+util.inherits(Gitlab, restful.RESTFulClient);
 
-  var keys = pathname.match(/\:\w+/g);
-  if (keys) {
-    for (var i = 0; i < keys.length; i++) {
-      var key = keys[i];
-      var k = key.substring(1);
-      var val = data[k];
-      if (val !== undefined) {
-        pathname = pathname.replace(key, val);
-        delete data[k];
-      }
-    }
-  }
-  // support custom token
-  if (data.private_token === undefined) {
-    data.private_token = this.privateToken;
-  }
-  var url = this.api + pathname;
-  urllib.request(url, {
-    type: method, 
-    dataType: dataType,
-    data: data,
-  }, function (err, result, res) {
-    // debug('%s %s %j: status: %s, result: %j, err: %j', method, url, data, res.statusCode, result, err);
-    if (err) {
-      if (err.name === 'SyntaxError') {
-        err.name = 'Gitlab' + res.statusCode + 'Error';
-        if (res) {
-          err.message = res.headers.status || 'Unknow Error ' + res.statusCode;
-        }
-      } else {
-        err.name = 'Gitlab' + err.name;
-      }
-      err.headers = res && res.headers;
-      if (Buffer.isBuffer(result)) {
-        result = result.toString();
-      }
-      err.data = { resBody: result, requestData: data };
-      err.statusCode = res && res.statusCode;
-      err.method = method;
-      err.url = url;
-      return callback(err);
-    }
-    if (res.statusCode !== 200 && res.statusCode !== 201) {
-      err = new Error(result && result.message ? result.message : 'Unknow Error ' + res.statusCode);
-      err.name = 'Gitlab' + res.statusCode + 'Error';
-      if (Buffer.isBuffer(result)) {
-        result = result.toString();
-      }
-      err.data = { resBody: result, requestData: data };
-      err.headers = res.headers;
-      err.statusCode = res.statusCode;
-      err.method = method;
-      err.url = url;
-      return callback(err);
-    }
-    callback(null, result);
-  });
+Gitlab.prototype.setAuthentication = function (req) {
+  req.params.data.private_token = req.params.data.private_token || this.privateToken;
+  return req;
 };
 
 exports.create = function (options) {
-  return new Client(options);
+  return new Gitlab(options);
 };

lib/hook.js

@@ -11,11 +11,11 @@
  */
 
 var util = require('util');
-var Resource = require('./resource');
+var restful = require('restful-client');
 
 function Hook(client) {
-  Resource.call(this, client, '/projects/:id/hooks', 'hook_id');
+  this.constructor.super_.call(this, client, '/projects/:id/hooks', 'hook_id');
 }
-util.inherits(Hook, Resource);
+util.inherits(Hook, restful.RESTFulResource);
 
 module.exports = Hook;

lib/issue.js

@@ -11,12 +11,12 @@
  */
 
 var util = require('util');
-var Resource = require('./resource');
+var restful = require('restful-client');
 
 function Issue(client) {
-  Resource.call(this, client, '/projects/:id/issues', 'issue_id');
+  this.constructor.super_.call(this, client, '/projects/:id/issues', 'issue_id');
 }
-util.inherits(Issue, Resource);
+util.inherits(Issue, restful.RESTFulResource);
 
 module.exports = Issue;
 

lib/member.js

@@ -11,11 +11,11 @@
  */
 
 var util = require('util');
-var Resource = require('./resource');
+var restful = require('restful-client');
 
 function Member(client) {
-  Resource.call(this, client, '/projects/:id/members', 'user_id');
+  this.constructor.super_.call(this, client, '/projects/:id/members', 'user_id');
 }
-util.inherits(Member, Resource);
+util.inherits(Member, restful.RESTFulResource);
 
 module.exports = Member;

lib/milestone.js

@@ -11,11 +11,11 @@
  */
 
 var util = require('util');
-var Resource = require('./resource');
+var restful = require('restful-client');
 
 function Milestone(client) {
-  Resource.call(this, client, '/projects/:id/milestones', 'milestone_id');
+  this.constructor.super_.call(this, client, '/projects/:id/milestones', 'milestone_id');
 }
-util.inherits(Milestone, Resource);
+util.inherits(Milestone, restful.RESTFulResource);
 
 module.exports = Milestone;

lib/project.js

@@ -11,12 +11,12 @@
  */
 
 var util = require('util');
-var Resource = require('./resource');
+var restful = require('restful-client');
 
 function Project(client) {
-  Resource.call(this, client, '/projects', 'id');
+  this.constructor.super_.call(this, client, '/projects', 'id');
 }
-util.inherits(Project, Resource);
+util.inherits(Project, restful.RESTFulResource);
 
 module.exports = Project;
 

lib/repository.js

@@ -11,12 +11,12 @@
  */
 
 var util = require('util');
-var Resource = require('./resource');
+var restful = require('restful-client');
 
 function Repository(client) {
-  Resource.call(this, client, '/projects/:id/repository/:type', 'branch');
+  this.constructor.super_.call(this, client, '/projects/:id/repository/:type', 'branch');
 }
-util.inherits(Repository, Resource);
+util.inherits(Repository, restful.RESTFulResource);
 
 module.exports = Repository;
 
@@ -125,6 +125,6 @@ Repository.prototype.getTree = function (params, callback) {
  */
 Repository.prototype.getBlob = function (params, callback) {
   params.type = 'commits';
-  params.dataType = 'buffer';
+  params.contentType = 'buffer';
   this.client.request('get', this.path + '/:sha/blob', params, callback);
 };

lib/resource.js

@@ -11,11 +11,11 @@
  */
 
 var util = require('util');
-var Resource = require('./resource');
+var restful = require('restful-client');
 
 function User(client) {
-  Resource.call(this, client, '/users', 'user_id');
+  this.constructor.super_.call(this, client, '/users', 'user_id');
 }
-util.inherits(User, Resource);
+util.inherits(User, restful.RESTFulResource);
 
 module.exports = User;