Merge pull request #796 from TV2/hypermedia_multiple_sub_regex

Hypermedia API fails when paths have multiple patterns with sub-regexs

Author: yunong

lib/router.js

@@ -181,7 +181,7 @@ Router.prototype.render = function render(routeName, params, query) {
         return (null);
 
     var _path = route.spec.path;
-    var _url = _path.replace(/\/:([A-Za-z0-9_]+)(\([^\\]+\))?/g, pathItem);
+    var _url = _path.replace(/\/:([A-Za-z0-9_]+)(\([^\\]+?\))?/g, pathItem);
     var items = Object.keys(query || {}).map(queryItem);
     var queryString = items.length > 0 ? ('?' + items.join('&')) : '';
     return (_url + queryString);

test/router.test.js

@@ -86,6 +86,18 @@ test('GH #704: render route (with sub-regex param)', function (t) {
     t.end();
 });
 
+test('GH-796: render route (with multiple sub-regex param)', function (t) {
+
+    var server = restify.createServer();
+    server.get({
+        name: 'my-route',
+        path: '/countries/:code([A-Z]{2,3})/:area([0-9]+)'
+    }, mockResponse);
+
+    var link = server.router.render('my-route', {code: '111', area: 42});
+    t.equal(link, '/countries/111/42');
+    t.end();
+});
 
 test('render route (with encode)', function (t) {