feat: Support Id's which contain dashes (like uuid's) and dots (like …

…file names)
outmoded · Nov 29, 2016 · 1a46e0d · 1a46e0d
1 parent 1ecddca
commit 1a46e0d
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 1 deletion.
diff --git a/lib/batch.js b/lib/batch.js
@@ -164,7 +164,7 @@ internals.buildPath = function (resultsData, pos, parts) {
             break;
         }
 
-        if (!/^[\w:]+$/.test(value)) {
+        if (!/^([\w:](-?|\.?))+$/.test(value)) {
             error = new Error('Reference value includes illegal characters');
             break;
         }
@@ -173,6 +173,7 @@ internals.buildPath = function (resultsData, pos, parts) {
 
     }
 
+    //console.log("built path:", error ? error : path);
     return error ? error : path;
 };
 

diff --git a/test/batch.js b/test/batch.js
@@ -203,6 +203,39 @@ describe('Batch', () => {
         });
     });
 
+    it('supports piping Id\'s with "-" (like a uuid) into the next request', (done) => {
+
+        Internals.makeRequest(server, '{ "requests": [ {"method": "get", "path": "/interestingIds"}, {"method": "get", "path": "/item/$0.idWithDash"}] }', (res) => {
+
+            expect(res.length).to.equal(2);
+            expect(res[0].idWithDash).to.equal('55cf-687663-55cf687663');
+            expect(res[1].id).to.equal('55cf-687663-55cf687663');
+            done();
+        });
+    });
+
+    it('supports piping interesting Ids with "." (like a filename) into the next request', (done) => {
+
+        Internals.makeRequest(server, '{ "requests": [ {"method": "get", "path": "/interestingIds"}, {"method": "get", "path": "/item/$0.idLikeFilename"}] }', (res) => {
+
+            expect(res.length).to.equal(2);
+            expect(res[0].idLikeFilename).to.equal('55cf687663.png');
+            expect(res[1].id).to.equal('55cf687663.png');
+            done();
+        });
+    });
+
+    it('supports piping interesting Ids with "-" and "." (like a filename) into the next request', (done) => {
+
+        Internals.makeRequest(server, '{ "requests": [ {"method": "get", "path": "/interestingIds"}, {"method": "get", "path": "/item/$0.idLikeFileNameWithDash"}] }', (res) => {
+
+            expect(res.length).to.equal(2);
+            expect(res[0].idLikeFileNameWithDash).to.equal('55cf-687663-55cf687663.png');
+            expect(res[1].id).to.equal('55cf-687663-55cf687663.png');
+            done();
+        });
+    });
+
     it('supports piping a deep response into the next request', (done) => {
 
         Internals.makeRequest(server, '{ "requests": [ {"method": "get", "path": "/deepItem"}, {"method": "post", "path": "/echo", "payload": "$0.inner.name"}, {"method": "post", "path": "/echo", "payload": "$0.inner.inner.name"}, {"method": "post", "path": "/echo", "payload": "$0.inner.inner.inner.name"}] }', (res) => {

diff --git a/test/internals.js b/test/internals.js
@@ -122,6 +122,15 @@ const redirectHandler = function (request, reply) {
     return reply().redirect('/profile');
 };
 
+const interestingIdsHandler = function (request, reply) {
+
+    return reply({
+        'idWithDash': '55cf-687663-55cf687663',
+        'idLikeFilename': '55cf687663.png',
+        'idLikeFileNameWithDash': '55cf-687663-55cf687663.png'
+    });
+};
+
 const fetch1 = function (request, next) {
 
     next('Hello');
@@ -182,6 +191,7 @@ module.exports.setupServer = function (done) {
         { method: 'GET', path: '/int', handler: integerHandler },
         { method: 'GET', path: '/int/{id}', handler: integerItemHandler },
         { method: 'GET', path: '/string', handler: stringItemHandler },
+        { method: 'GET', path: '/interestingIds', handler: interestingIdsHandler },
         { method: 'GET', path: '/error', handler: errorHandler },
         { method: 'GET', path: '/badchar', handler: badCharHandler },
         { method: 'GET', path: '/badvalue', handler: badValueHandler },