From 21803f9e2fbfef3c3435bb56c332094df1f9e9e3 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Fri, 11 Sep 2020 13:11:46 +0600
Subject: [PATCH] Allow nested prefixed resources

---
 ntex-router/CHANGES.txt     |  4 ++++
 ntex-router/Cargo.toml      |  2 +-
 ntex-router/src/resource.rs | 14 ++++++++++++++
 ntex-router/src/tree.rs     | 27 ++++++++++++++++++++++++++-
 ntex/src/lib.rs             |  2 +-
 5 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/ntex-router/CHANGES.txt b/ntex-router/CHANGES.txt
index 122efd22..ba12bb4e 100644
--- a/ntex-router/CHANGES.txt
+++ b/ntex-router/CHANGES.txt
@@ -1,5 +1,9 @@
 # Changes
 
+## [0.3.6] - 2020-09-11
+
+* Allow nested prefixed resources
+
 ## [0.3.5] - 2020-05-09
 
 * Handle non-prefix and prefix resources combinations
diff --git a/ntex-router/Cargo.toml b/ntex-router/Cargo.toml
index 79368e5c..9308457e 100644
--- a/ntex-router/Cargo.toml
+++ b/ntex-router/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ntex-router"
-version = "0.3.5"
+version = "0.3.6"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "Path router"
 keywords = ["ntex"]
diff --git a/ntex-router/src/resource.rs b/ntex-router/src/resource.rs
index 2736e937..c9f27502 100644
--- a/ntex-router/src/resource.rs
+++ b/ntex-router/src/resource.rs
@@ -852,6 +852,20 @@ mod tests {
         assert_eq!(&resource["name"], "test2");
         assert_eq!(&resource[0], "test2");
         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);
+
+        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("/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));
     }
 
     #[test]
diff --git a/ntex-router/src/tree.rs b/ntex-router/src/tree.rs
index ad1db445..1c54b5d3 100644
--- a/ntex-router/src/tree.rs
+++ b/ntex-router/src/tree.rs
@@ -361,7 +361,6 @@ impl Tree {
             } else {
                 false
             };
-
             // check segment match
             let is_match = match key[0] {
                 Segment::Static(ref pattern) => {
@@ -471,6 +470,32 @@ impl Tree {
                             }
                             Value::Prefix(v) => {
                                 if p == PathState::Slesh || p == PathState::Tail {
+                                    if !self.children.is_empty() {
+                                        let p = if path.len() != 1 {
+                                            &path[1..]
+                                        } else {
+                                            path
+                                        };
+                                        if let Some(res) = self
+                                            .children
+                                            .iter()
+                                            .map(|x| {
+                                                x.find_inner2(
+                                                    p,
+                                                    resource,
+                                                    check,
+                                                    skip,
+                                                    segments,
+                                                    insensitive,
+                                                    base_skip,
+                                                )
+                                            })
+                                            .filter_map(|x| x)
+                                            .next()
+                                        {
+                                            return Some(res);
+                                        }
+                                    }
                                     *v
                                 } else {
                                     continue;
diff --git a/ntex/src/lib.rs b/ntex/src/lib.rs
index 411b36fe..f7d88d52 100644
--- a/ntex/src/lib.rs
+++ b/ntex/src/lib.rs
@@ -43,4 +43,4 @@ pub mod util;
 pub mod web;
 pub mod ws;
 
-pub use self::service::*;
\ No newline at end of file
+pub use self::service::*;