From 56ab65a24da96887b79270404b6a3cbee37a5d72 Mon Sep 17 00:00:00 2001
From: Theodore Ni <tni@linkedin.com>
Date: Thu, 4 Aug 2016 09:21:52 -0700
Subject: [PATCH] Build up specificity for nested routes.

When adding an array of routes, each route will increase the
specificity instead of using only that of the last route.
---
 lib/route-recognizer.js   | 11 +++--------
 tests/recognizer-tests.js | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/lib/route-recognizer.js b/lib/route-recognizer.js
index db9e09e..7ea7b34 100644
--- a/lib/route-recognizer.js
+++ b/lib/route-recognizer.js
@@ -125,10 +125,7 @@ function parse(route, names, specificity, shouldDecodes) {
   // `x`, irrespective of the other parts.
   // Because of this similarity, we assign each type of segment a number value written as a
   // string. We can find the specificity of compound routes by concatenating these strings
-  // together, from left to right. After we have looped through all of the segments,
-  // we convert the string to a number.
-  specificity.val = '';
-
+  // together, from left to right.
   for (var i=0; i<segments.length; i++) {
     var segment = segments[i], match;
 
@@ -151,8 +148,6 @@ function parse(route, names, specificity, shouldDecodes) {
     }
   }
 
-  specificity.val = +specificity.val;
-
   return results;
 }
 
@@ -253,7 +248,7 @@ State.prototype = {
 // Sort the routes by specificity
 function sortSolutions(states) {
   return states.sort(function(a, b) {
-    return b.specificity.val - a.specificity.val;
+    return (b.specificity.val < a.specificity.val) ? -1 : (b.specificity.val === a.specificity.val) ? 0 : 1;
   });
 }
 
@@ -341,7 +336,7 @@ var RouteRecognizer = function() {
 RouteRecognizer.prototype = {
   add: function(routes, options) {
     var currentState = this.rootState, regex = "^",
-        specificity = {},
+        specificity = { val: '' },
         handlers = new Array(routes.length), allSegments = [], name;
 
     var isEmpty = true;
diff --git a/tests/recognizer-tests.js b/tests/recognizer-tests.js
index 0ea0c9a..ad9adf9 100644
--- a/tests/recognizer-tests.js
+++ b/tests/recognizer-tests.js
@@ -889,3 +889,17 @@ test("Getting a handler for an invalid named route raises", function() {
         router.handlersFor("nope");
     }, /There is no route named nope/);
 });
+
+test("Matches the route with the longer static prefix", function() {
+  var handler1 = { handler: 1 };
+  var handler2 = { handler: 2 };
+  var router = new RouteRecognizer();
+
+  router.add([{ path: "/static", handler: handler2 }, { path: "/", handler: handler2 }]);
+  router.add([{ path: "/:dynamic", handler: handler1 }, { path: "/", handler: handler1 }]);
+
+  resultsMatch(router.recognize("/static"), [
+    { handler: handler2, params: { }, isDynamic: false },
+    { handler: handler2, params: { }, isDynamic: false }
+  ]);
+});