Goodbye rustc_serialize, Hello serde_json (#192)

Author: kyeah

Cargo.toml

@@ -1,36 +1,43 @@
 [package]
-name = "mongodb"
-version = "0.2.2"
-authors = ["Kevin Yeh <[email protected]>",
-           "Saghm Rossi <[email protected]>",
-           "Valeri Karpov <[email protected]>"]
-
+authors = ["Kevin Yeh <[email protected]>", "Saghm Rossi <[email protected]>", "Valeri Karpov <[email protected]>"]
 description = "A native MongoDB driver developed under MongoDB labs."
-repository = "https://github.com/mongodb-labs/mongo-rust-driver-prototype"
 documentation = "https://docs.rs/mongodb"
-readme = "README.md"
 keywords = ["mongo", "mongodb", "database", "bson", "nosql"]
 license = "Apache-2.0"
-
-[features]
-default = []
-ssl = ["openssl"]
+name = "mongodb"
+readme = "README.md"
+repository = "https://github.com/mongodb-labs/mongo-rust-driver-prototype"
+version = "0.2.2"
 
 [dependencies]
 bitflags = "0.7.0"
-bson = "0.4.1"
+bson = "0.4.3"
 bufstream = "0.1.1"
 byteorder = "0.5.3"
 chrono = "0.2.25"
-openssl = { version = "0.9.3", optional = true }
+data-encoding = "1.2.0"
 rand = "0.3.14"
 rust-crypto = "0.2.31"
-rustc-serialize = "0.3.19"
 scan_fmt = "0.1.0"
 semver = "0.5.0"
 separator = "0.3.1"
-textnonce = { version = "0.4.1", default-features = false }
 time = "0.1.35"
 
+[dependencies.openssl]
+optional = true
+version = "0.9.3"
+
+[dependencies.textnonce]
+default-features = false
+version = "0.4.1"
+
 [dev-dependencies]
 nalgebra = "0.10.1"
+
+[dev-dependencies.serde_json]
+features = ["preserve_order"]
+version = "0.9.8"
+
+[features]
+default = []
+ssl = ["openssl"]

src/auth.rs

@@ -9,20 +9,13 @@ use crypto::mac::Mac;
 use crypto::md5::Md5;
 use crypto::pbkdf2;
 use crypto::sha1::Sha1;
+use data_encoding::base64;
 use db::{Database, ThreadedDatabase};
 use error::Error::{DefaultError, MaliciousServerError, ResponseError};
 use error::MaliciousServerErrorType;
 use error::Result;
-use rustc_serialize::base64::{self, FromBase64, ToBase64};
 use textnonce::TextNonce;
 
-const B64_CONFIG: base64::Config = base64::Config {
-    char_set: base64::CharacterSet::Standard,
-    newline: base64::Newline::LF,
-    pad: true,
-    line_length: None,
-};
-
 /// Handles SCRAM-SHA-1 authentication logic.
 pub struct Authenticator {
     db: Database,
@@ -108,31 +101,22 @@ impl Authenticator {
                                                       String,
                                                       u32);
 
-        let rnonce_b64 = match rnonce_opt {
-            Some(val) => val,
-            None => return Err(ResponseError(String::from("Invalid rnonce returned"))),
-        };
+        let rnonce_b64 = rnonce_opt
+            .ok_or_else(|| ResponseError(String::from("Invalid rnonce returned")))?;
 
         // Validate rnonce to make sure server isn't malicious
         if !rnonce_b64.starts_with(&initial_data.nonce[..]) {
             return Err(MaliciousServerError(MaliciousServerErrorType::InvalidRnonce));
         }
 
-        let salt_b64 = match salt_opt {
-            Some(val) => val,
-            None => return Err(ResponseError(String::from("Invalid salt returned"))),
-        };
-
-        let salt = match salt_b64.from_base64() {
-            Ok(val) => val,
-            Err(_) => return Err(ResponseError(String::from("Invalid base64 salt returned"))),
-        };
+        let salt_b64 = salt_opt
+            .ok_or_else(|| ResponseError(String::from("Invalid salt returned")))?;
 
+        let salt = base64::decode(salt_b64.as_bytes())
+            .or_else(|e| Err(ResponseError(format!("Invalid base64 salt returned: {}", e))))?;
 
-        let i = match i_opt {
-            Some(val) => val,
-            None => return Err(ResponseError(String::from("Invalid iteration count returned"))),
-        };
+        let i = i_opt
+            .ok_or_else(|| ResponseError(String::from("Invalid iteration count returned")))?;
 
         // Hash password
         let mut md5 = Md5::new();
@@ -181,7 +165,7 @@ impl Authenticator {
         }
 
         // Encode proof and produce the message to send to the server
-        let b64_proof = proof.to_base64(B64_CONFIG);
+        let b64_proof = base64::encode(&proof);
         let final_message = format!("{},p={}", without_proof, b64_proof);
         let binary = Binary(Generic, final_message.into_bytes());
 
@@ -238,7 +222,7 @@ impl Authenticator {
                 };
 
                 // Check that the signature is valid
-                if verifier.ne(&server_signature.to_base64(B64_CONFIG)[..]) {
+                if verifier.ne(&base64::encode(&server_signature)[..]) {
                     return Err(
                         MaliciousServerError(MaliciousServerErrorType::InvalidServerSignature));
                 }

src/error.rs

@@ -1,7 +1,7 @@
 //! MongoDB Errors and Error Codes.
 use bson::{self, oid};
 use coll::error::{WriteException, BulkWriteException};
-use rustc_serialize::hex;
+use data_encoding;
 use std::{error, fmt, io, result, sync};
 
 /// A type for results generated by MongoDB related functions, where the Err type is
@@ -43,7 +43,7 @@ pub enum Error {
     /// An ObjectId could not be generated.
     OIDError(oid::Error),
     /// A hexadecimal string could not be converted to bytes.
-    FromHexError(hex::FromHexError),
+    FromHexError(data_encoding::decode::Error),
     /// A single-write operation failed.
     WriteError(WriteException),
     /// A bulk-write operation failed due to one or more lower-level write-related errors.
@@ -121,8 +121,8 @@ impl From<oid::Error> for Error {
     }
 }
 
-impl From<hex::FromHexError> for Error {
-    fn from(err: hex::FromHexError) -> Error {
+impl From<data_encoding::decode::Error> for Error {
+    fn from(err: data_encoding::decode::Error) -> Error {
         Error::FromHexError(err)
     }
 }

src/lib.rs

@@ -96,10 +96,10 @@ extern crate bufstream;
 extern crate byteorder;
 extern crate chrono;
 extern crate crypto;
+extern crate data_encoding;
 #[cfg(feature = "ssl")]
 extern crate openssl;
 extern crate rand;
-extern crate rustc_serialize;
 #[macro_use]
 extern crate scan_fmt;
 extern crate semver;

tests/client/crud_spec/framework.rs

@@ -243,7 +243,7 @@ macro_rules! run_update_test {
 #[macro_export]
 macro_rules! run_suite {
     ( $file:expr, $coll:expr ) => {{
-        let json = Json::from_file($file).unwrap();
+        let json = Value::from_file($file).unwrap();
         let suite = json.get_suite().unwrap();
         let client =  Client::connect("localhost", 27017).unwrap();
         let db = client.db("test");

tests/client/crud_spec/read.rs

@@ -5,7 +5,7 @@ use json::eq::{self, NumEq};
 use mongodb::{Client, ThreadedClient};
 use mongodb::coll::options::{InsertManyOptions, ReplaceOptions, UpdateOptions};
 use mongodb::db::ThreadedDatabase;
-use rustc_serialize::json::Json;
+use serde_json::Value;
 
 #[test]
 fn aggregate() {

tests/client/crud_spec/write.rs

@@ -5,7 +5,7 @@ use json::eq::{self, NumEq};
 use mongodb::{Client, ThreadedClient};
 use mongodb::coll::options::{InsertManyOptions, ReplaceOptions, UpdateOptions};
 use mongodb::db::ThreadedDatabase;
-use rustc_serialize::json::Json;
+use serde_json::Value;
 
 #[test]
 fn delete_many() {

tests/json/arguments.rs

@@ -1,8 +1,8 @@
 use bson::{Bson, Document};
-use json::options::FromJson;
+use json::options::FromValue;
 use mongodb::coll::options::{AggregateOptions, CountOptions, FindOneAndDeleteOptions,
                              FindOneAndUpdateOptions, FindOptions};
-use rustc_serialize::json::Object;
+use serde_json::Map;
 
 pub enum Arguments {
     Aggregate {
@@ -53,7 +53,7 @@ pub enum Arguments {
 }
 
 impl Arguments {
-    pub fn aggregate_from_json(object: &Object) -> Result<Arguments, String> {
+    pub fn aggregate_from_json(object: &Map<String, Value>) -> Result<Arguments, String> {
         let options = AggregateOptions::from_json(object);
 
         let f = |x| Some(Bson::from_json(x));
@@ -84,7 +84,7 @@ impl Arguments {
         })
     }
 
-    pub fn count_from_json(object: &Object) -> Arguments {
+    pub fn count_from_json(object: &Map<String, Value>) -> Arguments {
         let options = CountOptions::from_json(object);
 
         let f = |x| Some(Bson::from_json(x));
@@ -99,7 +99,7 @@ impl Arguments {
         }
     }
 
-    pub fn delete_from_json(object: &Object, many: bool) -> Result<Arguments, String> {
+    pub fn delete_from_json(object: &Map<String, Value>, many: bool) -> Result<Arguments, String> {
         let f = |x| Some(Bson::from_json(x));
         let document = val_or_err!(object.get("filter").and_then(f),
                                    Some(Bson::Document(doc)) => doc,
@@ -111,7 +111,7 @@ impl Arguments {
         })
     }
 
-    pub fn distinct_from_json(object: &Object) -> Result<Arguments, String> {
+    pub fn distinct_from_json(object: &Map<String, Value>) -> Result<Arguments, String> {
         let f = |x| Some(Bson::from_json(x));
         let field_name = val_or_err!(object.get("fieldName").and_then(f),
                                      Some(Bson::String(ref s)) => s.to_owned(),
@@ -129,7 +129,7 @@ impl Arguments {
         })
     }
 
-    pub fn find_from_json(object: &Object) -> Arguments {
+    pub fn find_from_json(object: &Map<String, Value>) -> Arguments {
         let options = FindOptions::from_json(object);
 
         let f = |x| Some(Bson::from_json(x));
@@ -144,7 +144,7 @@ impl Arguments {
         }
     }
 
-    pub fn find_one_and_delete_from_json(object: &Object) -> Result<Arguments, String> {
+    pub fn find_one_and_delete_from_json(object: &Map<String, Value>) -> Result<Arguments, String> {
         let options = FindOneAndDeleteOptions::from_json(object);
 
         let f = |x| Some(Bson::from_json(x));
@@ -158,7 +158,7 @@ impl Arguments {
         })
     }
 
-    pub fn find_one_and_replace_from_json(object: &Object) -> Result<Arguments, String> {
+    pub fn find_one_and_replace_from_json(object: &Map<String, Value>) -> Result<Arguments, String> {
         let options = FindOneAndUpdateOptions::from_json(object);
 
         let f = |x| Some(Bson::from_json(x));
@@ -178,7 +178,7 @@ impl Arguments {
         })
     }
 
-    pub fn find_one_and_update_from_json(object: &Object) -> Result<Arguments, String> {
+    pub fn find_one_and_update_from_json(object: &Map<String, Value>) -> Result<Arguments, String> {
         let options = FindOneAndUpdateOptions::from_json(object);
 
         let f = |x| Some(Bson::from_json(x));
@@ -198,7 +198,7 @@ impl Arguments {
         })
     }
 
-    pub fn insert_many_from_json(object: &Object) -> Result<Arguments, String> {
+    pub fn insert_many_from_json(object: &Map<String, Value>) -> Result<Arguments, String> {
         let f = |x| Some(Bson::from_json(x));
 
         let bsons = val_or_err!(object.get("documents").and_then(f),
@@ -217,7 +217,7 @@ impl Arguments {
         Ok(Arguments::InsertMany { documents: docs })
     }
 
-    pub fn insert_one_from_json(object: &Object) -> Result<Arguments, String> {
+    pub fn insert_one_from_json(object: &Map<String, Value>) -> Result<Arguments, String> {
         let f = |x| Some(Bson::from_json(x));
         let document = val_or_err!(object.get("document").and_then(f),
                                    Some(Bson::Document(doc)) => doc,
@@ -226,7 +226,7 @@ impl Arguments {
         Ok(Arguments::InsertOne { document: document })
     }
 
-    pub fn replace_one_from_json(object: &Object) -> Result<Arguments, String> {
+    pub fn replace_one_from_json(object: &Map<String, Value>) -> Result<Arguments, String> {
         let f = |x| Some(Bson::from_json(x));
         let filter = val_or_err!(object.get("filter").and_then(f),
                                  Some(Bson::Document(doc)) => doc,
@@ -248,7 +248,7 @@ impl Arguments {
         })
     }
 
-    pub fn update_from_json(object: &Object, many: bool) -> Result<Arguments, String> {
+    pub fn update_from_json(object: &Map<String, Value>, many: bool) -> Result<Arguments, String> {
         let f = |x| Some(Bson::from_json(x));
         let filter = val_or_err!(object.get("filter").and_then(f),
                                  Some(Bson::Document(doc)) => doc,