Merge branch 'xiaoqiang-master'

Author: fengmk2

lib/repository.js

@@ -22,7 +22,7 @@ module.exports = Repository;
 
 /**
  * Get a list of repository branches from a project, sorted by name alphabetically.
- * 
+ *
  * @param {Object} params
  *  - {String} id The ID of a project
  * @param {Function} callback
@@ -33,10 +33,10 @@ Repository.prototype.getBranches = function (params, callback) {
 };
 
 /**
- * Protects a single project repository branch. 
- * This is an idempotent function, protecting an already protected repository branch 
+ * Protects a single project repository branch.
+ * This is an idempotent function, protecting an already protected repository branch
  * still returns a 200 Ok status code.
- * 
+ *
  * @param {Object} params
  *  - {String} id The ID of a project
  *  - {String} branch The name of the branch
@@ -48,10 +48,10 @@ Repository.prototype.protectBranch = function (params, callback) {
 };
 
 /**
- * Unprotects a single project repository branch. 
- * This is an idempotent function, unprotecting an already unprotected repository branch 
+ * Unprotects a single project repository branch.
+ * This is an idempotent function, unprotecting an already unprotected repository branch
  * still returns a 200 Ok status code.
- * 
+ *
  * @param {Object} params
  *  - {String} id The ID of a project
  *  - {String} branch The name of the branch
@@ -64,7 +64,7 @@ Repository.prototype.unprotectBranch = function (params, callback) {
 
 /**
  * Get a single project repository branch.
- * 
+ *
  * @param {Object} params
  *  - {String} id The ID of a project
  *  - {String} branch The name of the branch
@@ -77,7 +77,7 @@ Repository.prototype.getBranch = function (params, callback) {
 
 /**
  * Get a list of repository tags from a project, sorted by name in reverse alphabetical order.
- * 
+ *
  * @param {Object} params
  *  - {String} id The ID of a project
  * @param {Function} callback
@@ -89,7 +89,7 @@ Repository.prototype.getTags = function (params, callback) {
 
 /**
  * Get a list of repository commits in a project.
- * 
+ *
  * @param {Object} params
  *  - {String} id The ID of a project
  *  - {String} [ref_name] The name of a repository branch or tag or if not given the default branch
@@ -102,7 +102,7 @@ Repository.prototype.getCommits = function (params, callback) {
 
 /**
  * Get a list of repository files and directories in a project.
- * 
+ *
  * @param {Object} params
  *  - {String} id The ID of a project
  *  - {String} [path] The path inside repository, default is '/'. Used to get contend of subdirectories. e.g.: `test`
@@ -116,7 +116,7 @@ Repository.prototype.getTree = function (params, callback) {
 
 /**
  * Get the raw file contents for a file.
- * 
+ *
  * @param {Object} params
  *  - {String} id The ID of a project
  *  - {String} sha The commit or branch name
@@ -128,3 +128,17 @@ Repository.prototype.getBlob = function (params, callback) {
   params.contentType = 'buffer';
   this.client.request('get', this.path + '/:sha/blob', params, callback);
 };
+
+/**
+ * Get the raw file contents for a blob by blob sha.
+ *
+ * @param {Object} params
+ *  - {String} id The ID of a project
+ *  - {String} sha The blob sha
+ * @param {Function} callback
+ */
+Repository.prototype.getRawBlob = function (params, callback) {
+  params.type = 'raw_blobs';
+  params.contentType = 'buffer';
+  this.client.request('get', this.path + '/:sha', params, callback);
+};

test/repository.test.js

@@ -116,7 +116,7 @@ describe('repository.test.js', function () {
         branch.should.have.keys('name', 'commit', 'protected');
         branch.name.should.equal('master');
         branch.protected.should.equal(true);
-        
+
         client.repository.protectBranch({ id: 441, branch: 'master' }, function (err, branch) {
           should.not.exists(err);
           should.exists(branch);
@@ -135,7 +135,7 @@ describe('repository.test.js', function () {
         branch.should.have.keys('name', 'commit', 'protected');
         branch.name.should.equal('master');
         branch.protected.should.equal(false);
-        
+
         client.repository.unprotectBranch({ id: 441, branch: 'master' }, function (err, branch) {
           should.not.exists(err);
           should.exists(branch);
@@ -222,4 +222,18 @@ describe('repository.test.js', function () {
     });
   });
 
-});
+  describe('client.repository.getRawBlob()', function () {
+    it('should return raw file content', function (done) {
+      client.repository.getRawBlob({id: 55045, sha: '946579807281bd26b75b91986c78f15ad0bd40f7'}, function (err, raw) {
+        should.not.exists(err);
+        should.exists(raw);
+        should.ok(Buffer.isBuffer(raw));
+        raw.should.be.a.Buffer;
+        raw.length.should.above(0);
+        raw.toString().should.include('gitlab-client-unittest\n=======\n\n');
+        done();
+      });
+    });
+  });
+
+});