Merge pull request #5 from kyeah/master

ObjectId container and generator

Author: zonyitoo

Cargo.toml

@@ -11,6 +11,10 @@ homepage = "https://github.com/zonyitoo/bson-rs"
 name = "bson"
 
 [dependencies]
-chrono = "*"
-byteorder = "*"
-rustc-serialize = "*"
+byteorder = "0.3"
+chrono = "0.2"
+libc = "0.1"
+rand = "0.3"
+rust-crypto = "0.2.31"
+rustc-serialize = "0.3"
+time = "0.1"

examples/encode.rs

@@ -2,7 +2,7 @@ extern crate bson;
 extern crate chrono;
 
 use std::io::Cursor;
-use bson::{Bson, Document, Array, encode_document, decode_document};
+use bson::{Bson, Document, Array, encode_document, decode_document, oid};
 
 fn main() {
     let mut doc = Document::new();
@@ -11,7 +11,7 @@ fn main() {
     let mut arr = Array::new();
     arr.push(Bson::String("blah".to_string()));
     arr.push(Bson::UtcDatetime(chrono::UTC::now()));
-    arr.push(Bson::ObjectId([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]));
+    arr.push(Bson::ObjectId(oid::ObjectId::with_bytes([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12])));
 
     doc.insert("array".to_string(), Bson::Array(arr));
 

src/bson.rs

@@ -27,6 +27,7 @@ use rustc_serialize::hex::ToHex;
 
 use ordered::OrderedDocument;
 use spec::{ElementType, BinarySubtype};
+use oid;
 
 /// Possible BSON value types.
 #[derive(Debug, Clone)]
@@ -44,7 +45,7 @@ pub enum Bson {
     I64(i64),
     TimeStamp(i64),
     Binary(BinarySubtype, Vec<u8>),
-    ObjectId([u8; 12]),
+    ObjectId(oid::ObjectId),
     UtcDatetime(DateTime<UTC>),
 }
 
@@ -124,7 +125,13 @@ impl From<i64> for Bson {
 
 impl From<[u8; 12]> for Bson {
     fn from(a: [u8; 12]) -> Bson {
-        Bson::ObjectId(a)
+        Bson::ObjectId(oid::ObjectId::with_bytes(a))
+    }
+}
+
+impl From<oid::ObjectId> for Bson {
+    fn from(a: oid::ObjectId) -> Bson {
+        Bson::ObjectId(a.to_owned())
     }
 }
 
@@ -197,7 +204,7 @@ impl Bson {
 
                 json::Json::Object(obj)
             },
-            &Bson::ObjectId(v) => json::Json::String(v.to_hex()),
+            &Bson::ObjectId(ref v) => json::Json::String(v.bytes().to_hex()),
             &Bson::UtcDatetime(ref v) => json::Json::String(v.to_string()),
         }
     }

src/decoder.rs

@@ -29,6 +29,7 @@ use chrono::{DateTime, NaiveDateTime, UTC};
 
 use spec::{self, BinarySubtype};
 use bson::{Bson, Array, Document};
+use oid;
 
 /// Possible errors that can arise during decoding.
 #[derive(Debug)]
@@ -194,7 +195,7 @@ fn decode_bson<R: Read + ?Sized>(reader: &mut R, tag: u8) -> DecoderResult<Bson>
             for x in &mut objid {
                 *x = try!(reader.read_u8());
             }
-            Ok(Bson::ObjectId(objid))
+            Ok(Bson::ObjectId(oid::ObjectId::with_bytes(objid)))
         }
         Some(Boolean) => Ok(Bson::Boolean(try!(reader.read_u8()) != 0)),
         Some(NullValue) => Ok(Bson::Null),

src/encoder.rs

@@ -145,7 +145,7 @@ fn encode_bson<W: Write + ?Sized>(writer: &mut W, key: &str, val: &Bson) -> Enco
             write_cstring(writer, opt)
         },
         &Bson::JavaScriptCode(ref code) => write_string(writer, &code),
-        &Bson::ObjectId(id) => writer.write_all(&id).map_err(From::from),
+        &Bson::ObjectId(ref id) => writer.write_all(&id.bytes()).map_err(From::from),
         &Bson::JavaScriptCodeWithScope(ref code, ref scope) => {
             let mut buf = Vec::new();
             try!(write_string(&mut buf, code));

src/lib.rs

@@ -42,15 +42,20 @@
 //! }
 //! ```
 
-extern crate rustc_serialize;
-extern crate chrono;
 extern crate byteorder;
+extern crate chrono;
+extern crate crypto;
+extern crate libc;
+extern crate rand;
+extern crate rustc_serialize;
+extern crate time;
 
 pub use self::bson::{Bson, Document, Array};
 pub use self::encoder::{encode_document, EncoderResult, EncoderError};
 pub use self::decoder::{decode_document, DecoderResult, DecoderError};
 
 pub mod spec;
+pub mod oid;
 mod bson;
 mod encoder;
 mod decoder;