Move remap code to remap; add tests

lychee-lib/src/client.rs

@@ -413,17 +413,10 @@ impl Client {
     /// Remap URI using the client-defined remap patterns
     #[must_use]
     pub fn remap(&self, uri: Uri) -> Result<Uri> {
-        let remaps = match self.remaps {
-            Some(ref remaps) => remaps,
-            None => return Ok(uri),
-        };
-        let mut uri = uri;
-        for (pattern, new_url) in remaps {
-            if pattern.is_match(uri.as_str()) {
-                uri = Uri::try_from(new_url.to_owned())?
-            }
+        match self.remaps {
+            Some(ref remaps) => remaps.remap(uri),
+            None => Ok(uri),
         }
-        Ok(uri)
     }
 
     /// Returns whether the given `uri` should be ignored from checking.

lychee-lib/src/remap.rs

@@ -1,6 +1,11 @@
+use std::ops::Index;
+
+use crate::Result;
 use regex::Regex;
 use reqwest::Url;
 
+use crate::Uri;
+
 /// Remaps allow mapping from a URI pattern to a different URI
 ///
 /// Some use-cases are
@@ -11,4 +16,66 @@ use reqwest::Url;
 /// large set of regular expressions has a performance impact. Also there are no
 /// constraints on the URI mapping, so the rules might contradict with each
 /// other.
-pub type Remaps = Vec<(Regex, Url)>;
+#[derive(Debug, Clone)]
+pub struct Remaps(Vec<(Regex, Url)>);
+
+impl Remaps {
+    /// Create a new remapper
+    pub fn new(patterns: Vec<(Regex, Url)>) -> Self {
+        Self(patterns)
+    }
+
+    /// Remap URI using the client-defined remap patterns
+    #[must_use]
+    pub fn remap(&self, uri: Uri) -> Result<Uri> {
+        let mut uri = uri;
+        for (pattern, new_url) in &self.0 {
+            if pattern.is_match(uri.as_str()) {
+                uri = Uri::try_from(new_url.to_owned())?
+            }
+        }
+        Ok(uri)
+    }
+
+    /// Get the number of defined remap rules
+    pub fn len(&self) -> usize {
+        self.0.len()
+    }
+}
+
+impl Index<usize> for Remaps {
+    type Output = (Regex, Url);
+
+    fn index(&self, index: usize) -> &(regex::Regex, url::Url) {
+        &self.0[index]
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_remap() {
+        let pattern = Regex::new("https://example.com").unwrap();
+        let uri = Uri::try_from("http://127.0.0.1:8080").unwrap();
+        let remaps = Remaps::new(vec![(pattern, uri.clone().url)]);
+
+        let input = Uri::try_from("https://example.com").unwrap();
+        let remapped = remaps.remap(input).unwrap();
+
+        assert_eq!(remapped, uri);
+    }
+
+    #[test]
+    fn test_remap_path() {
+        let pattern = Regex::new("../../issues").unwrap();
+        let uri = Uri::try_from("https://example.com").unwrap();
+        let remaps = Remaps::new(vec![(pattern, uri.clone().url)]);
+
+        let input = Uri::try_from("../../issues").unwrap();
+        let remapped = remaps.remap(input).unwrap();
+
+        assert_eq!(remapped, uri);
+    }
+}