actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2024-11-24 07:53:00 +01:00
Code Issues Releases Wiki Activity

drop tail path pattern

Browse Source
This commit is contained in:
Nikolay Kim 2017-12-04 13:34:55 -08:00
parent 3bf3738e65
commit a163e75318
1 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/recognizer.rs
View File

@ -314,7 +314,6 @@ pub(crate) fn check_pattern(path: &str) {
fn parse(pattern: &str) -> String { fn parse(pattern: &str) -> String {
const DEFAULT_PATTERN: &str = "[^/]+"; const DEFAULT_PATTERN: &str = "[^/]+";
let mut hard_stop = false;
let mut re = String::from("^/"); let mut re = String::from("^/");
let mut in_param = false; let mut in_param = false;
let mut in_param_pattern = false; let mut in_param_pattern = false;
@ -327,20 +326,10 @@ fn parse(pattern: &str) -> String {
continue; continue;
} }
if hard_stop {
panic!("Tail '*' section has to be last lection of pattern");
}
if in_param { if in_param {
// In parameter segment: `{....}` // In parameter segment: `{....}`
if ch == '}' { if ch == '}' {
if param_pattern == "*" { re.push_str(&format!(r"(?P<{}>{})", &param_name, &param_pattern));
hard_stop = true;
re.push_str(
&format!(r"(?P<{}>[%/[:word:][:punct:][:space:]]+)", &param_name));
} else {
re.push_str(&format!(r"(?P<{}>{})", &param_name, &param_pattern));
}
param_name.clear(); param_name.clear();
param_pattern = String::from(DEFAULT_PATTERN); param_pattern = String::from(DEFAULT_PATTERN);
@ -398,7 +387,7 @@ mod tests {
("/name/{val}", 2), ("/name/{val}", 2),
("/name/{val}/index.html", 3), ("/name/{val}/index.html", 3),
("/v{val}/{val2}/index.html", 4), ("/v{val}/{val2}/index.html", 4),
("/v/{tail:*}", 5), ("/v/{tail:.*}", 5),
]; ];
rec.set_routes(routes); rec.set_routes(routes);
@ -489,25 +478,4 @@ mod tests {
assert_eq!(captures.name("version").unwrap().as_str(), "151"); assert_eq!(captures.name("version").unwrap().as_str(), "151");
assert_eq!(captures.name("id").unwrap().as_str(), "adahg32"); assert_eq!(captures.name("id").unwrap().as_str(), "adahg32");
} }
#[test]
fn test_tail_param() {
let re = assert_parse("/user/{tail:*}",
r"^/user/(?P<tail>[%/[:word:][:punct:][:space:]]+)$");
assert!(re.is_match("/user/profile"));
assert!(re.is_match("/user/2345"));
assert!(re.is_match("/user/2345/"));
assert!(re.is_match("/user/2345/sdg"));
assert!(re.is_match("/user/2345/sd-_g/"));
assert!(re.is_match("/user/2345/sdg/asddsasd/index.html"));
let re = assert_parse("/user/v{tail:*}",
r"^/user/v(?P<tail>[%/[:word:][:punct:][:space:]]+)$");
assert!(!re.is_match("/user/2345/"));
assert!(re.is_match("/user/vprofile"));
assert!(re.is_match("/user/v_2345"));
assert!(re.is_match("/user/v2345/sdg"));
assert!(re.is_match("/user/v2345/sd-_g/test.html"));
assert!(re.is_match("/user/v/sdg/asddsasd/index.html"));
}
} }