Add support for bson::UtcDateTime (#585)

juniper/src/integrations/bson.rs

@@ -0,0 +1,84 @@
+use bson::{oid::ObjectId, UtcDateTime};
+use chrono::prelude::*;
+
+use crate::{
+    parser::{ParseError, ScalarToken, Token},
+    value::ParseScalarResult,
+    Value,
+};
+
+graphql_scalar!(ObjectId where Scalar = <S> {
+    description: "ObjectId"
+
+    resolve(&self) -> Value {
+        Value::scalar(self.to_hex())
+    }
+
+    from_input_value(v: &InputValue) -> Option<ObjectId> {
+        v.as_string_value()
+         .and_then(|s| ObjectId::with_string(s).ok())
+    }
+
+    from_str<'a>(value: ScalarToken<'a>) -> ParseScalarResult<'a, S> {
+        if let ScalarToken::String(value) = value {
+            Ok(S::from(value.to_owned()))
+        } else {
+            Err(ParseError::UnexpectedToken(Token::Scalar(value)))
+        }
+    }
+});
+
+graphql_scalar!(UtcDateTime where Scalar = <S> {
+    description: "UtcDateTime"
+
+    resolve(&self) -> Value {
+        Value::scalar((*self).to_rfc3339())
+    }
+
+    from_input_value(v: &InputValue) -> Option<UtcDateTime> {
+        v.as_string_value()
+         .and_then(|s| (s.parse::<DateTime<Utc>>().ok()))
+         .map(|d| UtcDateTime(d))
+    }
+
+    from_str<'a>(value: ScalarToken<'a>) -> ParseScalarResult<'a, S> {
+        if let ScalarToken::String(value) = value {
+            Ok(S::from(value.to_owned()))
+        } else {
+            Err(ParseError::UnexpectedToken(Token::Scalar(value)))
+        }
+    }
+});
+
+#[cfg(test)]
+mod test {
+    use crate::{value::DefaultScalarValue, InputValue};
+    use bson::{oid::ObjectId, UtcDateTime};
+    use chrono::prelude::*;
+
+    #[test]
+    fn objectid_from_input_value() {
+        let raw = "53e37d08776f724e42000000";
+        let input: InputValue<DefaultScalarValue> = InputValue::scalar(raw.to_string());
+
+        let parsed: ObjectId = crate::FromInputValue::from_input_value(&input).unwrap();
+        let id = ObjectId::with_string(raw).unwrap();
+
+        assert_eq!(parsed, id);
+    }
+
+    #[test]
+    fn utcdatetime_from_input_value() {
+        let raw = "2020-03-23T17:38:32.446+00:00";
+        let input: InputValue<DefaultScalarValue> = InputValue::scalar(raw.to_string());
+
+        let parsed: UtcDateTime = crate::FromInputValue::from_input_value(&input).unwrap();
+        let date_time = UtcDateTime(
+            DateTime::parse_from_rfc3339(raw)
+                .unwrap()
+                .with_timezone(&Utc),
+        );
+
+        assert_eq!(parsed, date_time);
+    }
+}

juniper/src/integrations/mod.rs

@@ -16,4 +16,4 @@ pub mod uuid;
 
 #[cfg(feature = "bson")]
 /// GraphQL support for [bson](https://github.com/mongodb/bson-rust) types.
-pub mod objectid;
+pub mod bson;

juniper/src/integrations/objectid.rs

@@ -1,45 +0,0 @@
-use bson::oid::ObjectId;
-
-use crate::{
-    parser::{ParseError, ScalarToken, Token},
-    value::ParseScalarResult,
-    Value,
-};
-
-graphql_scalar!(ObjectId where Scalar = <S> {
-    description: "ObjectId"
-
-    resolve(&self) -> Value {
-        Value::scalar(self.to_hex())
-    }
-
-    from_input_value(v: &InputValue) -> Option<ObjectId> {
-        v.as_string_value()
-         .and_then(|s| ObjectId::with_string(s).ok())
-    }
-
-    from_str<'a>(value: ScalarToken<'a>) -> ParseScalarResult<'a, S> {
-        if let ScalarToken::String(value) = value {
-            Ok(S::from(value.to_owned()))
-        } else {
-            Err(ParseError::UnexpectedToken(Token::Scalar(value)))
-        }
-    }
-});
-
-#[cfg(test)]
-mod test {
-    use crate::{value::DefaultScalarValue, InputValue};
-    use bson::oid::ObjectId;
-
-    #[test]
-    fn objectid_from_input_value() {
-        let raw = "53e37d08776f724e42000000";
-        let input: InputValue<DefaultScalarValue> = InputValue::scalar(raw.to_string());
-
-        let parsed: ObjectId = crate::FromInputValue::from_input_value(&input).unwrap();
-        let id = ObjectId::with_string(raw).unwrap();
-
-        assert_eq!(parsed, id);
-    }
-}