Merge pull request #43 from mihaigalos/fix/ip/regex-lazy-matching

fix: IP - Regex lazy matchin

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "url-parse"
-version = "1.0.7"
+version = "1.0.8"
 description = "🔗 A Rust library for parsing URLs."
 
 categories = ["parser-implementations", "web-programming", "encoding"]

src/core/domain.rs

@@ -66,7 +66,7 @@ impl Parser {
 
     /// Mixes out the ip v4 into a Domain structure.
     fn domain_ipv4<'a>(&self, input: &'a str) -> Option<Domain<'a>> {
-        let re = Regex::new(r"([0-9]+?)\.([0-9]+?)\.([0-9]+?)\.([0-9]+?)").unwrap();
+        let re = Regex::new(r"([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)").unwrap();
         let caps = re.captures(input);
         caps.as_ref()?;
         return Some(Domain {
@@ -95,6 +95,19 @@ mod tests {
 
     #[test]
     fn test_domain_ipv4_when_typical() {
+        let input = "https://192.168.178.242/dir";
+        let expected = Domain {
+            subdomain: None,
+            domain: Some("192.168.178.242"),
+            top_level_domain: None,
+        };
+        let result = Parser::new(None).domain_ipv4(input).unwrap();
+
+        assert_eq!(result, expected);
+    }
+
+    #[test]
+    fn test_domain_ipv4_when_port() {
         let input = "https://1.2.3.4:443/blog/article/search?docid=720&hl=en#dayone";
         let expected = Domain {
             subdomain: None,

src/core/mod.rs

@@ -243,4 +243,26 @@ mod tests {
             }
         );
     }
+
+    #[test]
+    fn test_parse_works_when_ip() {
+        let input = "ftp://192.168.178.242/dir";
+        let result = Parser::new(None).parse(input).unwrap();
+        assert_eq!(
+            result,
+            Url {
+                scheme: Some("ftp".to_string()),
+                user_pass: (None, None),
+                subdomain: None,
+                domain: Some("192.168.178.242".to_string()),
+                top_level_domain: None,
+                port: Some(21),
+                path: Some(vec![
+                    "dir".to_string(),
+                ]),
+                query: None,
+                anchor: None,
+            }
+        );
+    }
 }

src/url.rs

@@ -163,7 +163,7 @@ impl Url {
         }
 
         if self.path.is_some() {
-            for (_, segment) in self.path_segments().unwrap().iter().enumerate() {
+            for segment in self.path_segments().unwrap().iter() {
                 result += "/";
                 result += segment;
             }

src/utils.rs

@@ -140,7 +140,7 @@ impl Utils {
         let mut result = parser
             .scheme(input)
             .map(|s| s.0.to_string() + &<SchemeSeparator as Into<String>>::into(s.1))
-            .unwrap_or_else(|| "".to_string());
+            .unwrap_or_default();
 
         let subpath = Self::trim_leading_slash(subpath);
         let (similarity, input_splits) = Utils::compute_similarity(parser, input, subpath);