Merge d8d4f95 into 45d56c9

wolf4ood · Sep 25, 2020 · c0987e0 · c0987e0
2 parents 45d56c9 + d8d4f95
commit c0987e0
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 6 deletions.
diff --git a/gremlin-cli/src/actions/fallback.rs b/gremlin-cli/src/actions/fallback.rs
@@ -27,10 +27,9 @@ impl Action for FallbackAction {
     ) -> Vec<crate::command::Command> {
         if cmd.trim().starts_with(&ctx.alias) {
             match ctx.client {
-                Some(ref client) => vec![Command::Exec(Box::new(execute_query(
-                    client.clone(),
-                    cmd,
-                )))],
+                Some(ref client) => {
+                    vec![Command::Exec(Box::new(execute_query(client.clone(), cmd)))]
+                }
                 None => vec![Command::Print(Some(String::from("Not connected!")))],
             }
         } else {

diff --git a/gremlin-cli/src/print/glist.rs b/gremlin-cli/src/print/glist.rs
@@ -7,7 +7,7 @@ pub fn fmt(list: &List) -> Result<String> {
     Ok(format!(
         "[{}]",
         list.iter()
-            .map(|value|  print::fmt(value))
+            .map(|value| print::fmt(value))
             .collect::<Result<Vec<String>>>()?
             .join(",")
     ))

diff --git a/gremlin-cli/src/print/mod.rs b/gremlin-cli/src/print/mod.rs
@@ -12,7 +12,7 @@ pub fn fmt(value: &GValue) -> Result<String> {
     let result = match value {
         GValue::Vertex(v) => vertex::fmt(v),
         GValue::Edge(e) => edge::fmt(e),
-        GValue::Map(map) =>  map::fmt(map)?,
+        GValue::Map(map) => map::fmt(map)?,
         GValue::List(list) => glist::fmt(list)?,
         GValue::Int32(n) => n.to_string(),
         GValue::Int64(n) => n.to_string(),

diff --git a/gremlin-client/src/process/traversal/builder.rs b/gremlin-client/src/process/traversal/builder.rs
@@ -86,6 +86,20 @@ impl TraversalBuilder {
         self
     }
 
+    pub fn property_many<A>(mut self, values: Vec<(String, A)>) -> Self
+    where
+        A: Into<GValue>,
+    {
+        for property in values {
+            self.bytecode.add_step(
+                String::from("property"),
+                vec![property.0.into(), property.1.into()],
+            )
+        }
+
+        self
+    }
+
     pub fn property_with_cardinality<A>(
         mut self,
         cardinality: Cardinality,

diff --git a/gremlin-client/src/structure/value.rs b/gremlin-client/src/structure/value.rs
@@ -361,6 +361,20 @@ impl std::convert::TryFrom<GValue> for Date {
     }
 }
 
+impl std::convert::TryFrom<GValue> for bool {
+    type Error = crate::GremlinError;
+
+    fn try_from(value: GValue) -> GremlinResult<Self> {
+        match value {
+            GValue::Bool(val) => Ok(val),
+            _ => Err(GremlinError::Cast(format!(
+                "Cannot cast {:?} to bool",
+                value
+            ))),
+        }
+    }
+}
+
 fn from_list<T>(glist: List) -> GremlinResult<T>
 where
     T: std::convert::TryFrom<GValue, Error = GremlinError>,