Merge branch 'feature/custom-size-endpoint' into develop

Author: Jackymancs4

src/lib/imager.js

@@ -22,9 +22,8 @@ const _parseSize = (size) => {
 };
 
 export const combine = (face, size, callback) => {
-  if (callback) { size = _parseSize(size); }
+  if (size) { size = _parseSize(size); }
   else {
-    callback = size;
     size = { width: maxSize, height: maxSize };
   }
 

src/routes/avatars.js

@@ -31,7 +31,7 @@ router.get('/list', function(req, res) {
 });
 
 router.get('/:id', function(req, res, next) {
-  return combine(req.faceParts, function(err, stdout) {
+  return combine(req.faceParts,false, function(err, stdout) {
     return common.sendImage(err, stdout, req, res, next);
   });
 });
@@ -42,7 +42,7 @@ router.get('/:size/:id', function(req, res, next) {
   });
 });
 
-router.get('/face/:eyes/:nose/:mouth/:color', function(req, res, next) {
+router.get('/face/:eyes/:nose/:mouth/:color/:size?', function(req, res, next) {
   let faceParts = { color: '#' + req.params.color };
 
   partTypes.forEach(function(type) {
@@ -61,7 +61,7 @@ router.get('/face/:eyes/:nose/:mouth/:color', function(req, res, next) {
     faceParts[type] = pathFor(type, fileName);
   });
 
-  return combine(faceParts, function(err, stdout) {
+  return combine(faceParts, req.params.size, function(err, stdout) {
     return common.sendImage(err, stdout, req, res, next);
   });
 });

test/integration.js

@@ -45,6 +45,18 @@ describe('routing', function() {
       .expect('Content-Type', /image/)
       .end(done);
     });
+
+    it('can manually compose an image with a custom size', function(done) {
+      request.get('/avatars/face/eyes1/nose4/mouth11/bbb/50')
+      .expect(200)
+      .expect('Content-Type', /image/)
+      .parse(parseImage).end(function(err, res) {
+        im(res.body).size(function(_, size) {
+          expect(size).to.eql({ height: 50, width: 50 });
+          done();
+        });
+      });
+    });
   });
 
   describe('v2 avatar list requests', function() {