Merge pull request #11 from matsimitsu/fix_datetime_encoding

Fix UtcDatetime en/decoding

Author: kyeah

src/decoder.rs

@@ -25,7 +25,8 @@ use std::io::{self, Read};
 use std::{str, error, fmt};
 
 use byteorder::{self, LittleEndian, ReadBytesExt};
-use chrono::{DateTime, NaiveDateTime, UTC};
+use chrono::{UTC};
+use chrono::offset::TimeZone;
 
 use spec::{self, BinarySubtype};
 use bson::{Bson, Array, Document};
@@ -215,7 +216,7 @@ fn decode_bson<R: Read + ?Sized>(reader: &mut R, tag: u8) -> DecoderResult<Bson>
         Some(TimeStamp) => read_i64(reader).map(Bson::TimeStamp),
         Some(UtcDatetime) => {
             let time = try!(read_i64(reader));
-            Ok(Bson::UtcDatetime(DateTime::from_utc(NaiveDateTime::from_timestamp(time, 0), UTC)))
+            Ok(Bson::UtcDatetime(UTC.timestamp(time / 1000, (time % 1000) as u32 * 1000000)))
         },
 	Some(Deprecated) |
         Some(Undefined) |

src/encoder.rs

@@ -24,6 +24,7 @@
 use std::io::{self, Write};
 use std::iter::IntoIterator;
 use std::{mem, error, fmt};
+use chrono::Timelike;
 
 use byteorder::{self, LittleEndian, WriteBytesExt};
 
@@ -162,7 +163,9 @@ fn encode_bson<W: Write + ?Sized>(writer: &mut W, key: &str, val: &Bson) -> Enco
             try!(writer.write_u8(From::from(subtype)));
             writer.write_all(data).map_err(From::from)
         },
-        &Bson::UtcDatetime(ref v) => write_i64(writer, v.timestamp()),
+        &Bson::UtcDatetime(ref v) => {
+            write_i64(writer, (v.timestamp() * 1000) + (v.nanosecond()  / 1000000)  as i64)
+        },
         &Bson::Null => Ok(())
     }
 }

tests/modules/encoder.rs

@@ -1,6 +1,9 @@
 extern crate bson;
+extern crate chrono;
 
 use bson::{Document, Bson, encode_document};
+use chrono::UTC;
+use chrono::offset::TimeZone;
 
 #[test]
 fn test_encode_floating_point() {
@@ -43,3 +46,16 @@ fn test_encode_array() {
 
     assert_eq!(&buf[..], &dst[..]);
 }
+#[test]
+fn test_encode_utc_date_time() {
+    let src = UTC.timestamp(1286705410, 0);
+    let dst = [18, 0, 0, 0, 9, 107, 101, 121, 0, 208, 111, 158, 149, 43, 1, 0, 0, 0];
+
+    let mut doc = Document::new();
+    doc.insert("key".to_owned(), Bson::UtcDatetime(src));
+
+    let mut buf = Vec::new();
+    encode_document(&mut buf, &doc).unwrap();
+
+    assert_eq!(&buf[..], &dst[..]);
+}