Merge pull request #39 from abradley2/ordered-routes

Add routes in order of depth in 'on' method
krasimir · Sep 13, 2016 · de50192 · de50192
2 parents 0323016 + 21522b1
commit de50192
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 23 deletions.
diff --git a/lib/navigo.js b/lib/navigo.js
diff --git a/lib/navigo.js.map b/lib/navigo.js.map
diff --git a/lib/navigo.min.js b/lib/navigo.min.js
diff --git a/lib/navigo.min.js.map b/lib/navigo.min.js.map
diff --git a/src/index.js b/src/index.js
@@ -39,6 +39,14 @@ function replaceDynamicURLParts(route) {
   return { regexp, paramNames };
 }
 
+function getUrlDepth(url) {
+  return url.replace(/\/$/, '').split('/').length;
+}
+
+function compareUrlDepth(urlA, urlB) {
+  return getUrlDepth(urlA) < getUrlDepth(urlB);
+}
+
 function findMatchedRoutes(url, routes = []) {
   return routes
     .map(route => {
@@ -122,9 +130,11 @@ Navigo.prototype = {
     if (args.length >= 2) {
       this._add(args[0], args[1]);
     } else if (typeof args[0] === 'object') {
-      for (let route in args[0]) {
+      let orderedRoutes = Object.keys(args[0]).sort(compareUrlDepth);
+
+      orderedRoutes.forEach(route => {
         this._add(route, args[0][route]);
-      }
+      });
     } else if (typeof args[0] === 'function') {
       this._defaultHandler = args[0];
     }

diff --git a/test/Navigo.spec.js b/test/Navigo.spec.js
@@ -233,6 +233,20 @@ describe('Given an instance of Navigo', function () {
           .to.be.calledOnce
           .and.to.be.calledWith({ tripId: '42' });
       });
+      it('should set the routes in order of depth', function () {
+        var handler = sinon.spy();
+
+        router = new Navigo('http://site.com/', true);
+        router.on({
+          'products': { as: 'products', uses: handler },
+          'products/:productId': { as: 'products.id', uses: handler}
+        });
+        router.resolve('products/42');
+
+        expect(handler)
+          .to.be.calledOnce
+          .and.to.be.calledWith({ productId: '42' })
+      });
     });
   });