Improve parsing the first line of a request

This now correctly extracts spans, even if elements of the first line have multiple spaces between them

Author: kyleect

src/models/partial_request.rs

@@ -151,19 +151,25 @@ fn parse_first_line(
     Option<Range<usize>>,
     Option<Range<usize>>,
 ) {
-    let parts: Vec<_> = first_line.split_whitespace().collect();
-
-    let mut start = 0;
+    let mut parts = vec![];
+    let mut last_end = 0;
+
+    for (i, c) in first_line.char_indices() {
+        if c.is_whitespace() {
+            if i > last_end {
+                parts.push(last_end..i);
+            }
+            last_end = i + 1;
+        }
+    }
 
-    let mut get_span = |part: &str| {
-        let span = start..start + part.len();
-        start = span.end + 1;
-        span
-    };
+    if last_end < first_line.len() {
+        parts.push(last_end..first_line.len());
+    }
 
-    let method_span = parts.get(0).map(|&method| get_span(method));
-    let uri_span = parts.get(1).map(|&uri| get_span(uri));
-    let http_version_span = parts.get(2).map(|&version| get_span(version));
+    let method_span = parts.get(0).cloned();
+    let uri_span = parts.get(1).cloned();
+    let http_version_span = parts.get(2).cloned();
 
     (method_span, uri_span, http_version_span)
 }

tests/fixtures/get_with_multiple_spaces.request

@@ -0,0 +1 @@
+GET  https://example.com  HTTP/1.1

tests/parse_tests.rs

@@ -194,3 +194,36 @@ fn parse_post_with_body_request() {
         request
     );
 }
+
+#[test]
+fn parse_get_with_multiple_spaces_request() {
+    let content = fs::read_to_string("./tests/fixtures/get_with_multiple_spaces.request")
+        .expect("should read test fixture");
+
+    let partial = PartialHttpRequest::from_str(&content).expect("should be parsable");
+
+    assert_eq!(
+        PartialHttpRequest::new(
+            &content,
+            Some(5..24),
+            Some(0..3),
+            Some(26..34),
+            vec![],
+            None
+        ),
+        partial
+    );
+
+    let request: HttpRequest = partial.into();
+
+    assert_eq!(
+        HttpRequest {
+            uri: Uri::new("https://example.com"),
+            method: "GET".into(),
+            http_version: "HTTP/1.1".into(),
+            headers: vec![],
+            body: None
+        },
+        request
+    );
+}