Add remaining tag tests, along with some fixes

Author: Byron

git-object/src/borrowed/tag.rs

@@ -73,10 +73,7 @@ pub(crate) fn parse_message(i: &[u8]) -> IResult<&[u8], (&BStr, Option<&BStr>),
 
     let (i, _) = tag(NL)(i)?;
     if i.is_empty() {
-        return Err(nom::Err::Error(Error::NomDetail(
-            i.into(),
-            "Missing tag message",
-        )));
+        return Ok((i, (i.as_bstr(), None)));
     }
     fn all_but_trailing_newline(i: &[u8]) -> IResult<&[u8], (&[u8], &[u8]), Error> {
         if i.len() < 2 {
@@ -85,11 +82,11 @@ pub(crate) fn parse_message(i: &[u8]) -> IResult<&[u8], (&BStr, Option<&BStr>),
                 "tag message is missing",
             )));
         }
-        let (i, _) = tag(NL)(&i[i.len() - 1..])
+        let (x, _) = tag(NL)(&i[i.len() - 1..])
             .map_err(Error::context("tag message must end with newline"))?;
         // an empty signature message signals that there is none - the function signature is needed
         // to work with 'alt(…)'. PGP signatures are never empty
-        Ok((i, (&i[..i.len() - 1], &[])))
+        Ok((x, (&i[..i.len() - 1], &[])))
     }
     let (i, (message, signature)) = alt((
         tuple((

git-object/src/tests/borrowed/tag.rs

@@ -19,15 +19,90 @@ mod method {
 }
 
 mod parse_tag {
-    use crate::borrowed::tag::parse_tag;
-    use crate::tests::borrowed::fixture_bytes;
-    use crate::tests::borrowed::tag::tag_fixture;
+    use crate::{
+        borrowed::{tag::parse_tag, Signature, Tag},
+        tests::{borrowed::fixture_bytes, borrowed::tag::tag_fixture},
+        Kind, Sign, Time,
+    };
+    use bstr::ByteSlice;
 
     #[test]
     fn signed() {
         let fixture = fixture_bytes("signed.txt");
         assert_eq!(parse_tag(&fixture).unwrap().1, tag_fixture(9000));
     }
+
+    #[test]
+    fn empty() {
+        let fixture = fixture_bytes("empty.txt");
+        assert_eq!(
+            parse_tag(&fixture).unwrap().1,
+            Tag {
+                target: b"01dd4e2a978a9f5bd773dae6da7aa4a5ac1cdbbc".as_bstr(),
+                name: b"empty".as_bstr(),
+                target_kind: Kind::Commit,
+                message: b"".as_bstr(),
+                signature: Signature {
+                    name: b"Sebastian Thiel".as_bstr(),
+                    email: b"sebastian.thiel@icloud.com".as_bstr(),
+                    time: Time {
+                        time: 1592381636,
+                        offset: 28800,
+                        sign: Sign::Plus,
+                    },
+                },
+                pgp_signature: None
+            }
+        );
+    }
+
+    #[test]
+    fn with_newlines() {
+        let fixture = fixture_bytes("with-newlines.txt");
+        assert_eq!(
+            parse_tag(&fixture).unwrap().1,
+            Tag {
+                target: b"ebdf205038b66108c0331aa590388431427493b7".as_bstr(),
+                name: b"baz".as_bstr(),
+                target_kind: Kind::Commit,
+                message: b"hello\n\nworld".as_bstr(),
+                signature: Signature {
+                    name: b"Sebastian Thiel".as_bstr(),
+                    email: b"sebastian.thiel@icloud.com".as_bstr(),
+                    time: Time {
+                        time: 1592311808,
+                        offset: 28800,
+                        sign: Sign::Plus,
+                    },
+                },
+                pgp_signature: None
+            }
+        );
+    }
+
+    #[test]
+    fn whitespace() {
+        let fixture = fixture_bytes("whitespace.txt");
+        assert_eq!(
+            parse_tag(&fixture).unwrap().1,
+            Tag {
+                target: b"01dd4e2a978a9f5bd773dae6da7aa4a5ac1cdbbc".as_bstr(),
+                name: b"whitespace".as_bstr(),
+                target_kind: Kind::Commit,
+                message: b" \ttab\nnewline\n\nlast-with-trailer\n".as_bstr(), // odd, was created with \n\n actually
+                signature: Signature {
+                    name: b"Sebastian Thiel".as_bstr(),
+                    email: b"sebastian.thiel@icloud.com".as_bstr(),
+                    time: Time {
+                        time: 1592382888,
+                        offset: 28800,
+                        sign: Sign::Plus,
+                    },
+                },
+                pgp_signature: None
+            }
+        );
+    }
 }
 
 fn tag_fixture(offset: i32) -> Tag<'static> {

git-object/src/tests/fixtures/tag/empty.txt

@@ -0,0 +1,5 @@
+object 01dd4e2a978a9f5bd773dae6da7aa4a5ac1cdbbc
+type commit
+tag empty
+tagger Sebastian Thiel <sebastian.thiel@icloud.com> 1592381636 +0800
+

git-object/src/tests/fixtures/tag/whitespace.txt

@@ -0,0 +1,10 @@
+object 01dd4e2a978a9f5bd773dae6da7aa4a5ac1cdbbc
+type commit
+tag whitespace
+tagger Sebastian Thiel <sebastian.thiel@icloud.com> 1592382888 +0800
+
+ 	tab
+newline
+
+last-with-trailer
+

git-object/src/tests/fixtures/tag/with-newlines.txt

@@ -0,0 +1,8 @@
+object ebdf205038b66108c0331aa590388431427493b7
+type commit
+tag baz
+tagger Sebastian Thiel <sebastian.thiel@icloud.com> 1592311808 +0800
+
+hello
+
+world

tasks.md

@@ -7,5 +7,5 @@
 * [x] make parser tests unit tests that are close to the code they test
 * [x] parser tests handle binary strings nicely
 * [x] switch parsing to nom (binary only)
-* [ ] test tags without signature
+* [x] test tags without signature
 * [ ] Review loose object parsing, but don't use Nom for that