From 536e404fdf2791615ac314c563ca02a7d927b5de Mon Sep 17 00:00:00 2001
From: Emi Tatsuo <emi@alchemi.dev>
Date: Fri, 20 Nov 2020 13:54:24 -0500
Subject: [PATCH] Make RoutingNode generic

---
 src/lib.rs     |  6 +++---
 src/routing.rs | 36 ++++++++++++++++++++----------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 2aa41e0..e957262 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -35,14 +35,14 @@ pub use types::*;
 pub const REQUEST_URI_MAX_LEN: usize = 1024;
 pub const GEMINI_PORT: u16 = 1965;
 
-pub (crate) type Handler = Arc<dyn Fn(Request) -> HandlerResponse + Send + Sync>;
+type Handler = Arc<dyn Fn(Request) -> HandlerResponse + Send + Sync>;
 pub (crate) type HandlerResponse = BoxFuture<'static, Result<Response>>;
 
 #[derive(Clone)]
 pub struct Server {
     tls_acceptor: TlsAcceptor,
     listener: Arc<TcpListener>,
-    routes: Arc<RoutingNode>,
+    routes: Arc<RoutingNode<Handler>>,
     timeout: Duration,
     complex_timeout: Option<Duration>,
 }
@@ -172,7 +172,7 @@ pub struct Builder<A> {
     key_path: PathBuf,
     timeout: Duration,
     complex_body_timeout_override: Option<Duration>,
-    routes: RoutingNode,
+    routes: RoutingNode<Handler>,
 }
 
 impl<A: ToSocketAddrs> Builder<A> {
diff --git a/src/routing.rs b/src/routing.rs
index 1179601..20708f7 100644
--- a/src/routing.rs
+++ b/src/routing.rs
@@ -7,16 +7,14 @@ use uriparse::path::{Path, Segment};
 use std::collections::HashMap;
 use std::convert::TryInto;
 
-use crate::Handler;
 use crate::types::Request;
 
-#[derive(Default)]
-/// A node for routing requests
+/// A node for linking values to routes
 ///
 /// Routing is processed by a tree, with each child being a single path segment.  For
-/// example, if a handler existed at "/trans/rights", then the root-level node would have
+/// example, if an entry existed at "/trans/rights", then the root-level node would have
 /// a child "trans", which would have a child "rights".  "rights" would have no children,
-/// but would have an attached handler.
+/// but would have an attached entry.
 ///
 /// If one route is shorter than another, say "/trans/rights" and
 /// "/trans/rights/r/human", then the longer route always matches first, so a request for
@@ -25,21 +23,21 @@ use crate::types::Request;
 ///
 /// Routing is only performed on normalized paths, so "/endpoint" and "/endpoint/" are
 /// considered to be the same route.
-pub struct RoutingNode(Option<Handler>, HashMap<String, Self>);
+pub struct RoutingNode<T>(Option<T>, HashMap<String, Self>);
 
-impl RoutingNode {
-    /// Attempt to identify a handler based on path segments
+impl<T> RoutingNode<T> {
+    /// Attempt to find and entry based on path segments
     ///
     /// This searches the network of routing nodes attempting to match a specific request,
     /// represented as a sequence of path segments.  For example, "/dir/image.png?text"
     /// should be represented as `&["dir", "image.png"]`.
     ///
     /// If a match is found, it is returned, along with the segments of the path trailing
-    /// the handler.  For example, a route `/foo` recieving a request to `/foo/bar` would
-    /// receive `vec!["bar"]`
+    /// the subpath matcing the route.  For example, a route `/foo` recieving a request to
+    /// `/foo/bar` would produce `vec!["bar"]`
     ///
     /// See [`RoutingNode`] for details on how routes are matched.
-    pub fn match_path<I,S>(&self, path: I) -> Option<(Vec<S>, &Handler)>
+    pub fn match_path<I,S>(&self, path: I) -> Option<(Vec<S>, &T)>
     where
         I: IntoIterator<Item=S>,
         S: AsRef<str>,
@@ -81,7 +79,7 @@ impl RoutingNode {
     /// Attempt to identify a route for a given [`Request`]
     ///
     /// See [`RoutingNode::match_path()`] for more information
-    pub fn match_request(&self, req: &Request) -> Option<(Vec<String>, &Handler)> {
+    pub fn match_request(&self, req: &Request) -> Option<(Vec<String>, &T)> {
         let mut path = req.path().to_borrowed();
         path.normalize(false);
         self.match_path(path.segments())
@@ -101,9 +99,9 @@ impl RoutingNode {
     /// static strings.  If you would like to add a string dynamically, please use
     /// [`RoutingNode::add_route_by_path()`] in order to appropriately deal with any
     /// errors that might arise.
-    pub fn add_route(&mut self, path: &'static str, handler: Handler) {
+    pub fn add_route(&mut self, path: &'static str, data: T) {
         let path: Path = path.try_into().expect("Malformed path route received");
-        self.add_route_by_path(path, handler).unwrap();
+        self.add_route_by_path(path, data).unwrap();
     }
 
     /// Add a route to the network
@@ -112,7 +110,7 @@ impl RoutingNode {
     /// this method.
     ///
     /// For information about how routes work, see [`RoutingNode::match_path()`]
-    pub fn add_route_by_path(&mut self, mut path: Path, handler: Handler) -> Result<(), ConflictingRouteError>{
+    pub fn add_route_by_path(&mut self, mut path: Path, data: T) -> Result<(), ConflictingRouteError>{
         debug_assert!(path.is_absolute());
         path.normalize(false);
 
@@ -126,7 +124,7 @@ impl RoutingNode {
         if node.0.is_some() {
             Err(ConflictingRouteError())
         } else {
-            node.0 = Some(handler);
+            node.0 = Some(data);
             Ok(())
         }
     }
@@ -141,6 +139,12 @@ impl RoutingNode {
     }
 }
 
+impl<T> Default for RoutingNode<T> {
+    fn default() -> Self {
+        Self(None, HashMap::default())
+    }
+}
+
 #[derive(Debug, Clone, Copy)]
 pub struct ConflictingRouteError();