Add IntoPatterns trait

router/CHANGES.txt

@@ -2,6 +2,8 @@
 
 ## [0.2.1] - 2019-12-xx
 
+* Add `IntoPatterns` trait
+
 * Add multi-pattern resources
 
 ## [0.2.0] - 2019-12-07

router/src/lib.rs

@@ -35,6 +35,44 @@ impl ResourcePath for bytestring::ByteString {
     }
 }
 
+/// Helper trait for type that could be converted to path pattern
+pub trait IntoPatterns {
+    /// Signle patter
+    fn is_single(&self) -> bool;
+
+    fn patterns(&self) -> Vec<String>;
+}
+
+impl IntoPatterns for String {
+    fn is_single(&self) -> bool {
+        true
+    }
+
+    fn patterns(&self) -> Vec<String> {
+        vec![self.clone()]
+    }
+}
+
+impl<'a> IntoPatterns for &'a str {
+    fn is_single(&self) -> bool {
+        true
+    }
+
+    fn patterns(&self) -> Vec<String> {
+        vec![self.to_string()]
+    }
+}
+
+impl<T: AsRef<str>> IntoPatterns for Vec<T> {
+    fn is_single(&self) -> bool {
+        self.len() == 1
+    }
+
+    fn patterns(&self) -> Vec<String> {
+        self.into_iter().map(|v| v.as_ref().to_string()).collect()
+    }
+}
+
 #[cfg(feature = "http")]
 mod url;
 

router/src/resource.rs

@@ -5,7 +5,7 @@ use std::rc::Rc;
 use regex::{escape, Regex, RegexSet};
 
 use crate::path::{Path, PathItem};
-use crate::{Resource, ResourcePath};
+use crate::{IntoPatterns, Resource, ResourcePath};
 
 const MAX_DYNAMIC_SEGMENTS: usize = 16;
 
@@ -39,41 +39,50 @@ impl ResourceDef {
     /// Parse path pattern and create new `Pattern` instance.
     ///
     /// Panics if path pattern is malformed.
-    pub fn new(path: &str) -> Self {
-        ResourceDef::with_prefix(path, false)
+    pub fn new<T: IntoPatterns>(path: T) -> Self {
+        if path.is_single() {
+            let patterns = path.patterns();
+            ResourceDef::with_prefix(&patterns[0], false)
+        } else {
+            ResourceDef::new_set(path)
+        }
     }
 
     /// Parse path pattern and create new `Pattern` instance.
     ///
     /// Panics if any of paths pattern is malformed. Every set element
     /// must contain same set of capture elements.
-    pub fn new_set<T: Iterator<Item = U>, U: AsRef<str>>(set: T) -> Self {
-        let mut data = Vec::new();
-        let mut re_set = Vec::new();
+    pub fn new_set<T: IntoPatterns>(set: T) -> Self {
+        if set.is_single() {
+            ResourceDef::new(set)
+        } else {
+            let set = set.patterns();
+            let mut data = Vec::new();
+            let mut re_set = Vec::new();
 
-        for item in set {
-            let path = item.as_ref().to_owned();
-            let (pattern, _, _, len) = ResourceDef::parse(&path, false);
+            for path in set {
+                let (pattern, _, _, len) = ResourceDef::parse(&path, false);
 
-            let re = match Regex::new(&pattern) {
-                Ok(re) => re,
-                Err(err) => panic!("Wrong path pattern: \"{}\" {}", path, err),
-            };
-            // actix creates one router per thread
-            let names: Vec<_> = re
-                .capture_names()
-                .filter_map(|name| name.map(|name| Rc::new(name.to_owned())))
-                .collect();
-            data.push((re, names, len));
-            re_set.push(pattern);
-        }
+                let re = match Regex::new(&pattern) {
+                    Ok(re) => re,
+                    Err(err) => panic!("Wrong path pattern: \"{}\" {}", path, err),
+                };
+                // actix creates one router per thread
+                let names: Vec<_> = re
+                    .capture_names()
+                    .filter_map(|name| name.map(|name| Rc::new(name.to_owned())))
+                    .collect();
+                data.push((re, names, len));
+                re_set.push(pattern);
+            }
 
-        ResourceDef {
-            id: 0,
-            tp: PatternType::DynamicSet(RegexSet::new(re_set).unwrap(), data),
-            elements: Vec::new(),
-            name: String::new(),
-            pattern: "".to_owned(),
+            ResourceDef {
+                id: 0,
+                tp: PatternType::DynamicSet(RegexSet::new(re_set).unwrap(), data),
+                elements: Vec::new(),
+                name: String::new(),
+                pattern: "".to_owned(),
+            }
         }
     }
 
@@ -616,7 +625,7 @@ impl<'a> From<&'a str> for ResourceDef {
 
 impl From<String> for ResourceDef {
     fn from(path: String) -> ResourceDef {
-        ResourceDef::new(&path)
+        ResourceDef::new(path)
     }
 }
 
@@ -700,14 +709,11 @@ mod tests {
 
     #[test]
     fn test_dynamic_set() {
-        let re = ResourceDef::new_set(
-            vec![
-                "/user/{id}",
-                "/v{version}/resource/{id}",
-                "/{id:[[:digit:]]{6}}",
-            ]
-            .iter(),
-        );
+        let re = ResourceDef::new_set(vec![
+            "/user/{id}",
+            "/v{version}/resource/{id}",
+            "/{id:[[:digit:]]{6}}",
+        ]);
         assert!(re.is_match("/user/profile"));
         assert!(re.is_match("/user/2345"));
         assert!(!re.is_match("/user/2345/"));