Merge pull request #51 from gwicke/wildcard_listings

Pchelolo · web-flow · commit eb79f705e6aa · 2016-11-17T15:16:48.000-08:00
Fix handling of wildcard route requests ending in slash; v0.5.4
diff --git a/lib/node.js b/lib/node.js
@@ -67,9 +67,8 @@ class Node {
         if (segment.constructor === String) {
             // Fast path
             let res = this._children[_keyPrefix + segment];
-            if (!res && segment !== '') {
-                // Fall back to the wildcard match, but only if the segment is
-                // non-empty.
+            if (!res) {
+                // Fall back to the wildcard match.
                 res = this._children['*'];
                 if (!res && this._children['**']) {
                     res = this._children['**'];
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swagger-router",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "An efficient swagger 2 based router with support for multiple APIs. For use in RESTBase.",
   "main": "index.js",
   "scripts": {
diff --git a/test/features/router.js b/test/features/router.js
@@ -262,9 +262,10 @@ var expectations = {
     '/en.wikipedia.org/v1/optional/': {
         params: {
             domain: 'en.wikipedia.org',
+            path: '',
             _ls: []
         },
-        value: null,
+        value: '/optional/{+path}',
         permissions: [],
         filters: []
     },
@@ -277,6 +278,16 @@ var expectations = {
         permissions: [],
         filters: []
     },
+    '/en.wikipedia.org/v1/optional/path/': {
+        value: '/optional/{+path}',
+        params: {
+            domain: 'en.wikipedia.org',
+            path: 'path/',
+            _ls: []
+        },
+        permissions: [],
+        filters: []
+    },
     '/en.wikipedia.org/v1/optional/path/bits': {
         value: '/optional/{+path}',
         params: {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "swagger-router",`
`3`		`- "version": "0.5.3",`
	`3`	`+ "version": "0.5.4",`
`4`	`4`	`"description": "An efficient swagger 2 based router with support for multiple APIs. For use in RESTBase.",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`