Fix / prefix match

ntex-router/CHANGES.txt

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.3.3] - 2020-04-11
+
+* Fix `/` prefix match
+
 ## [0.3.2] - 2020-04-06
 
 * Fix IdxSegment item for paths with no root

ntex-router/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-router"
-version = "0.3.2"
+version = "0.3.3"
 authors = ["Nikolay Kim <[email protected]>"]
 description = "Path router"
 keywords = ["ntex"]

ntex-router/src/resource.rs

@@ -761,6 +761,11 @@ mod tests {
 
     #[test]
     fn test_resource_prefix() {
+        let tree = Tree::new(&ResourceDef::prefix("/"), 1);
+        assert_eq!(tree.find(&mut Path::new("/")), Some(1));
+        assert_eq!(tree.find(&mut Path::new("/a")), Some(1));
+        assert_eq!(tree.find(&mut Path::new("/a/test/test")), Some(1));
+
         let tree = Tree::new(&ResourceDef::prefix("/name"), 1);
         assert_eq!(tree.find(&mut Path::new("/name")), Some(1));
         assert_eq!(tree.find(&mut Path::new("/name/")), Some(1));

ntex-router/src/tree.rs

@@ -208,7 +208,7 @@ impl Tree {
             if path == "/" {
                 for val in &self.value {
                     let v = match val {
-                        Value::Slesh(v) | Value::Prefix(v) => *v,
+                        Value::Slesh(v) | Value::Prefix(v) | Value::PrefixSlesh(v) => *v,
                         _ => continue,
                     };
                     if check(v, resource) {
@@ -225,6 +225,16 @@ impl Tree {
                         return Some(v);
                     }
                 }
+            } else {
+                for val in &self.value {
+                    let v = match val {
+                        Value::PrefixSlesh(v) => *v,
+                        _ => continue,
+                    };
+                    if check(v, resource) {
+                        return Some(v);
+                    }
+                }
             }
 
             let path = if path.starts_with('/') {