Use IntoPattern for prefix resources

ntex-router/CHANGES.txt

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.4.2] - 2021-03-16
+
+* Use `IntoPattern` for prefix resources
+
 ## [0.4.1] - 2021-02-26
 
 * Fix: partial matches keep garbage in segments

ntex-router/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-router"
-version = "0.4.1"
+version = "0.4.2"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "Path router"
 keywords = ["ntex"]
@@ -17,12 +17,12 @@ path = "src/lib.rs"
 default = ["http"]
 
 [dependencies]
-regex = "1.4.1"
+regex = "1.4"
-serde = "1.0.116"
+serde = "1.0"
 bytestring = "1.0"
-log = "0.4.8"
+log = "0.4"
-http = { version = "0.2.1", optional = true }
+http = { version = "0.2", optional = true }
 
 [dev-dependencies]
-http = "0.2.1"
+http = "0.2"
 serde_derive = "1.0"

ntex-router/src/resource.rs

@@ -122,16 +122,22 @@ impl ResourceDef {
     /// Use `prefix` type instead of `static`.
     ///
     /// Panics if path regex pattern is malformed.
-    pub fn prefix(path: &str) -> Self {
+    pub fn prefix<T: IntoPattern>(path: T) -> Self {
-        ResourceDef::with_prefix(path, true)
+        ResourceDef::with_prefix(path)
     }
 
     /// Parse path pattern and create new `ResourceDef` instance.
     /// Inserts `/` to the start of the pattern.
     ///
     /// Panics if path regex pattern is malformed.
-    pub fn root_prefix(path: &str) -> Self {
+    pub fn root_prefix<T: IntoPattern>(path: T) -> Self {
-        ResourceDef::with_prefix(&insert_slash(path), true)
+        let mut patterns = path.patterns();
+        for path in &mut patterns {
+            let p = insert_slash(path.as_str());
+            *path = p
+        }
+
+        ResourceDef::with_prefix(patterns)
     }
 
     /// Resource id
@@ -145,17 +151,27 @@ impl ResourceDef {
     }
 
     /// Parse path pattern and create new `Pattern` instance with custom prefix
-    fn with_prefix(path: &str, for_prefix: bool) -> Self {
+    fn with_prefix<T: IntoPattern>(path: T) -> Self {
-        let path = path.to_owned();
+        let patterns = path.patterns();
-        let (tp, elements) = ResourceDef::parse(&path);
+
+        let mut p = String::new();
+        let mut tp = Vec::new();
+        let mut elements = Vec::new();
+
+        for path in patterns {
+            p = path.clone();
+            let (pelems, elems) = ResourceDef::parse(&path);
+            tp.push(pelems);
+            elements = elems;
+        }
 
         ResourceDef {
+            tp,
             elements,
             id: 0,
-            tp: vec![tp],
             name: String::new(),
-            pattern: path,
+            pattern: p,
-            prefix: for_prefix,
+            prefix: true,
         }
     }
 
@@ -806,12 +822,28 @@ mod tests {
         assert_eq!(tree.find(&mut Path::new("/name")), None);
         assert_eq!(tree.find(&mut Path::new("/name1")), None);
 
+        let tree = Tree::new(&ResourceDef::prefix(vec!["/name/", "/name2/"]), 1);
+        assert_eq!(tree.find(&mut Path::new("/name/")), Some(1));
+        assert_eq!(tree.find(&mut Path::new("/name/test/test")), Some(1));
+        assert_eq!(tree.find(&mut Path::new("/name2/")), Some(1));
+        assert_eq!(tree.find(&mut Path::new("/name2/test/test")), Some(1));
+        assert_eq!(tree.find(&mut Path::new("/name")), None);
+        assert_eq!(tree.find(&mut Path::new("/name1")), None);
+
         let tree = Tree::new(&ResourceDef::root_prefix("name/"), 1);
         assert_eq!(tree.find(&mut Path::new("/name/")), Some(1));
         assert_eq!(tree.find(&mut Path::new("/name/test/test")), Some(1));
         assert_eq!(tree.find(&mut Path::new("/name")), None);
         assert_eq!(tree.find(&mut Path::new("/name1")), None);
 
+        let tree = Tree::new(&ResourceDef::root_prefix(vec!["name/", "name2/"]), 1);
+        assert_eq!(tree.find(&mut Path::new("/name/")), Some(1));
+        assert_eq!(tree.find(&mut Path::new("/name/test/test")), Some(1));
+        assert_eq!(tree.find(&mut Path::new("/name2/")), Some(1));
+        assert_eq!(tree.find(&mut Path::new("/name2/test/test")), Some(1));
+        assert_eq!(tree.find(&mut Path::new("/name")), None);
+        assert_eq!(tree.find(&mut Path::new("/name1")), None);
+
         let mut resource = Path::new("/name/subpath1/subpath2/index.html");
         assert_eq!(tree.find(&mut resource), Some(1));
         assert_eq!(resource.path(), "/subpath1/subpath2/index.html");
@@ -844,12 +876,30 @@ mod tests {
         assert_eq!(tree.find(&mut Path::new("/name1")), Some(1));
         assert_eq!(tree.find(&mut Path::new("/name~")), Some(1));
 
-        let mut resource = Path::new("/test2/subpath1/subpath2/index.html");
+        let tree = Tree::new(&ResourceDef::prefix(vec!["/1/{name}/", "/2/{name}/"]), 1);
+        assert_eq!(tree.find(&mut Path::new("/1/name/")), Some(1));
+        assert_eq!(tree.find(&mut Path::new("/1/name/test/test")), Some(1));
+        assert_eq!(tree.find(&mut Path::new("/2/name/")), Some(1));
+        assert_eq!(tree.find(&mut Path::new("/2/name/test/test")), Some(1));
+        assert_eq!(tree.find(&mut Path::new("/1/name")), None);
+        assert_eq!(tree.find(&mut Path::new("/1/name1")), None);
+        assert_eq!(tree.find(&mut Path::new("/1/name~")), None);
+        assert_eq!(tree.find(&mut Path::new("/2/name")), None);
+        assert_eq!(tree.find(&mut Path::new("/2/name1")), None);
+        assert_eq!(tree.find(&mut Path::new("/2/name~")), None);
+
+        let mut resource = Path::new("/1/test2/subpath1/subpath2/index.html");
         assert_eq!(tree.find(&mut resource), Some(1));
         assert_eq!(&resource["name"], "test2");
         assert_eq!(&resource[0], "test2");
         assert_eq!(resource.path(), "/subpath1/subpath2/index.html");
 
+        let mut resource = Path::new("/2/test3/subpath1/subpath2/index.html");
+        assert_eq!(tree.find(&mut resource), Some(1));
+        assert_eq!(&resource["name"], "test3");
+        assert_eq!(&resource[0], "test3");
+        assert_eq!(resource.path(), "/subpath1/subpath2/index.html");
+
         // nested
         let mut tree = Tree::new(&ResourceDef::prefix("/prefix/{v1}/second/{v2}"), 1);
         tree.insert(&ResourceDef::prefix("/prefix/{v1}"), 2);
@@ -863,6 +913,37 @@ mod tests {
         assert_eq!(tree.find(&mut resource), Some(2));
         assert_eq!(&resource["v1"], "1");
         assert_eq!(tree.find(&mut Path::new("/prefix/1")), Some(2));
+
+        // nested
+        let mut tree = Tree::new(
+            &ResourceDef::prefix(vec![
+                "/prefix/{v1}/second/{v2}",
+                "/prefix2/{v1}/second/{v2}",
+            ]),
+            1,
+        );
+        tree.insert(&ResourceDef::prefix("/prefix/{v1}"), 2);
+        tree.insert(&ResourceDef::prefix("/prefix2/{v1}"), 3);
+
+        let mut resource = Path::new("/prefix/1/second/2");
+        assert_eq!(tree.find(&mut resource), Some(1));
+        assert_eq!(&resource["v1"], "1");
+        assert_eq!(&resource["v2"], "2");
+
+        let mut resource = Path::new("/prefix2/1/second/2");
+        assert_eq!(tree.find(&mut resource), Some(1));
+        assert_eq!(&resource["v1"], "1");
+        assert_eq!(&resource["v2"], "2");
+
+        let mut resource = Path::new("/prefix/1/second");
+        assert_eq!(tree.find(&mut resource), Some(2));
+        assert_eq!(&resource["v1"], "1");
+        assert_eq!(tree.find(&mut Path::new("/prefix/1")), Some(2));
+
+        let mut resource = Path::new("/prefix2/1/second");
+        assert_eq!(tree.find(&mut resource), Some(3));
+        assert_eq!(&resource["v1"], "1");
+        assert_eq!(tree.find(&mut Path::new("/prefix2/1")), Some(3));
     }
 
     #[test]