time serialization

Author: Byron

Cargo.lock

@@ -26,6 +26,7 @@ nom = { version = "6.0.0-alpha1", default-features = false, features = ["alloc"]
 smallvec = "1.4.0"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
 git-ref = { version = "0.1.0", path = "../git-ref" }
+itoa = "0.4.6"
 
 [dev-dependencies]
 pretty_assertions = "0.6.1"

git-object/Cargo.toml

@@ -29,7 +29,7 @@ pub mod signature {
             out.write_all(SPACE)?;
             out.write_all(&b"<"[..])?;
             out.write_all(validated_token(self.email.as_bstr())?)?;
-            out.write_all(&b">"[..])?;
+            out.write_all(&b"> "[..])?;
             self.time.write_to(out)?;
             Ok(())
         }

git-object/src/owned/object.rs

@@ -1,7 +1,7 @@
-use crate::ByteSlice;
+use crate::owned::SPACE;
+use bstr::ByteSlice;
 use quick_error::quick_error;
-use std::ops::Deref;
-use std::{fmt, io};
+use std::{fmt, io, ops::Deref};
 
 #[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone, Copy)]
 #[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
@@ -22,8 +22,30 @@ pub struct Time {
 }
 
 impl Time {
-    pub fn write_to(&self, out: impl io::Write) -> io::Result<()> {
-        unimplemented!("time write to")
+    pub fn write_to(&self, mut out: impl io::Write) -> io::Result<()> {
+        itoa::write(&mut out, self.time)?;
+        out.write_all(SPACE)?;
+        out.write_all(&[match self.sign {
+            Sign::Plus => b'+',
+            Sign::Minus => b'-',
+        }])?;
+
+        const ZERO: &[u8; 1] = b"0";
+
+        const SECONDS_PER_HOUR: i32 = 60 * 60;
+        let hours = self.offset / SECONDS_PER_HOUR;
+        assert!(hours < 25, "offset is more than a day: {}", hours);
+        let minutes = (self.offset - (hours * SECONDS_PER_HOUR)) / 60;
+
+        if hours < 10 {
+            out.write_all(ZERO)?;
+        }
+        itoa::write(&mut out, hours)?;
+
+        if minutes < 10 {
+            out.write_all(ZERO)?;
+        }
+        itoa::write(&mut out, minutes).map(|_| ())
     }
 }
 

git-object/src/types.rs

@@ -1,12 +1,50 @@
 mod object {
+    mod time {
+        use bstr::ByteSlice;
+        use git_object::{Sign, Time};
+
+        #[test]
+        fn write_to() {
+            for (time, expected) in &[
+                (
+                    Time {
+                        time: 500,
+                        offset: 9000,
+                        sign: Sign::Plus,
+                    },
+                    "500 +0230",
+                ),
+                (
+                    Time {
+                        time: 189009009,
+                        offset: 36000,
+                        sign: Sign::Minus,
+                    },
+                    "189009009 -1000",
+                ),
+                (
+                    Time {
+                        time: 0,
+                        offset: 0,
+                        sign: Sign::Minus,
+                    },
+                    "0 -0000",
+                ),
+            ] {
+                let mut output = Vec::new();
+                time.write_to(&mut output).unwrap();
+                assert_eq!(output.as_bstr(), expected);
+            }
+        }
+    }
+
     mod signature {
-        mod to_write {
-            use bstr::ByteSlice;
-            use git_object::{borrowed, owned};
+        use bstr::ByteSlice;
+        use git_object::{borrowed, owned};
 
-            #[test]
-            fn round_trip() {
-                let input = b"Sebastian Thiel <byronimo@gmail.com> 1528473343 +0230";
+        #[test]
+        fn round_trip() {
+            for input in &[&b"Sebastian Thiel <byronimo@gmail.com> 1528473343 +0230"[..]] {
                 let signature: owned::Signature = borrowed::Signature::from_bytes(input).unwrap().into();
                 let mut output = Vec::new();
                 signature.write_to(&mut output).unwrap();