Merge pull request #74 from Jackymancs4-Fork/feature/random-endpoint

Feature: Random endpoint

Author: rylnd

README.md

@@ -41,6 +41,10 @@ Assuming your server lives at `myserver.com`, and you've configured the middlewa
     * e.g. `myserver.com/myAvatars/face/eyes1/nose2/mouth4/DEADBF/300`
 * `myserver.com/myAvatars/list`
     * returns JSON of all valid parts for the custom endpoint above
+  * `myserver.com/myAvatars/:size?/random`
+      * returns a random avatar, different each time
+      * e.g. `myserver.com/myAvatars/300/random`
+
 
 ## Development
 If you're developing locally, you'll first need to bootstrap (assumes [nvm](https://github.com/creationix/nvm)):

package-lock.json

@@ -23,7 +23,8 @@
     "find-port": "^1.0.0",
     "gm": "^1.16.0",
     "serve-favicon": "^2.0.1",
-    "underscore": "^1.6.0"
+    "underscore": "^1.6.0",
+    "uuid": "^3.2.1"
   },
   "repository": {
     "type": "git",

package.json

@@ -1,9 +1,7 @@
 import Router from 'express';
+import uuid from 'uuid';
 
-import {
-  allNames,
-  pathFor,
-} from '../lib/imageFiles';
+import { allNames, pathFor } from '../lib/imageFiles';
 import common from './common';
 import { combine } from '../lib/imager';
 import potato from '../lib/potato';
@@ -30,13 +28,17 @@ router.get('/list', function(req, res) {
   return res.set('Content-Type', 'application/json').send(response);
 });
 
-router.get('/:id', function(req, res, next) {
-  return combine(req.faceParts, false, function(err, stdout) {
-    return common.sendImage(err, stdout, req, res, next);
+router.get('/:size?/random', function(req, res) {
+  var faceParts;
+  faceParts = potato.parts(uuid.v4());
+  req.faceParts = faceParts;
+
+  return combine(faceParts, req.params.size, function(err, stdout) {
+    return common.sendImage(err, stdout, req, res);
   });
 });
 
-router.get('/:size/:id', function(req, res, next) {
+router.get('/:size?/:id', function(req, res, next) {
   return combine(req.faceParts, req.params.size, function(err, stdout) {
     return common.sendImage(err, stdout, req, res, next);
   });

src/routes/avatars.js

@@ -72,4 +72,39 @@ describe('routing', function() {
       });
     });
   });
+
+  describe('v2 avatar random requests', function() {
+    it('can randomly generate a new avatar', function(done) {
+      const getRandom = () => request
+          .get('/avatars/random')
+          .expect(200)
+          .expect('Content-Type', /image/)
+          .parse(parseImage);
+
+      getRandom().end((_, r1) => {
+        getRandom().end((_, r2) => {
+          im(r1.body).identify('%#', (_, id1) => {
+            im(r2.body).identify('%#', (_, id2) => {
+              expect(id1).not.to.equal(id2);
+              done();
+            });
+          });
+        });
+      });
+    });
+
+    it('supports a custom size parameter', function(done) {
+      request
+        .get('/avatars/50/random')
+        .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();
+          });
+        });
+    });
+  });
 });