Add misc methods and bump version

Author: ohsayan

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All changes in this project will be noted in this file.
 
+### 0.8.3
+
+Added the following implementations:
+- `FromResponse` for `Row`
+- `FromValue` for `Value` (this was erroneously missing)
+- Added the `Value::parse` and `Value::parse_cloned` member methods
+- Added `Row::into_first` and `Row::into_first_as` member methods
+
 ### 0.8.2
 
 Support deriving queries and responses.

Cargo.toml

@@ -9,18 +9,18 @@ license = "Apache-2.0"
 name = "skytable"
 readme = "README.md"
 repository = "https://github.com/skytable/client-rust"
-version = "0.8.2"
+version = "0.8.3"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
 # internal deps
 sky-derive = "0.2.0"
 # external deps
-tokio = { version = "1.34.0", features = ["full"] }
+tokio = { version = "1.35.1", features = ["full"] }
 native-tls = "0.2.11"
 tokio-native-tls = "0.3.1"
 rand = "0.8.5"
 r2d2 = "0.8.10"
-async-trait = "0.1.74"
+async-trait = "0.1.77"
 bb8 = "0.8.1"
-itoa = "1.0.9"
+itoa = "1.0.10"

src/error.rs

@@ -24,6 +24,7 @@
 
 use {crate::protocol::ProtocolError, core::fmt};
 
+/// A [`Result`] type alias for the client driver
 pub type ClientResult<T> = Result<T, Error>;
 
 #[derive(Debug)]

src/lib.rs

@@ -118,11 +118,11 @@ pub mod pool;
 pub mod query;
 pub mod response;
 pub mod syncio;
-// re-exports
 /// The `Query` derive macro enables you to directly pass complex types as parameters into queries
 pub use sky_derive::Query;
 /// The `Response` derive macro enables you to directly pass complex types as parameters into queries
 pub use sky_derive::Response;
+// re-exports
 pub use {
     aio::{ConnectionAsync, ConnectionTlsAsync},
     config::Config,

src/pool.rs

@@ -45,10 +45,7 @@
 //! as a string.
 //!
 
-use {
-    crate::{error::Error, Config, Connection, ConnectionAsync, ConnectionTls, ConnectionTlsAsync},
-    r2d2::ManageConnection,
-};
+use crate::{error::Error, Config, Connection, ConnectionAsync, ConnectionTls, ConnectionTlsAsync};
 
 const QUERY_SYSCTL_STATUS: &str = "sysctl report status";
 
@@ -97,7 +94,7 @@ impl ConnectionMgrTcp {
     }
 }
 
-impl ManageConnection for ConnectionMgrTcp {
+impl r2d2::ManageConnection for ConnectionMgrTcp {
     type Connection = Connection;
     type Error = Error;
     fn connect(&self) -> Result<Self::Connection, Self::Error> {
@@ -143,7 +140,7 @@ impl ConnectionMgrTls {
     }
 }
 
-impl ManageConnection for ConnectionMgrTls {
+impl r2d2::ManageConnection for ConnectionMgrTls {
     type Connection = ConnectionTls;
     type Error = Error;
     fn connect(&self) -> Result<Self::Connection, Self::Error> {

src/response.rs

@@ -69,6 +69,23 @@ pub enum Value {
     List(Vec<Self>),
 }
 
+impl FromValue for Value {
+    fn from_value(v: Value) -> ClientResult<Self> {
+        Ok(v)
+    }
+}
+
+impl Value {
+    /// Attempt to parse this value into a different type
+    pub fn parse<T: FromValue>(self) -> ClientResult<T> {
+        T::from_value(self)
+    }
+    /// Attempt to parse this value into a different type, by cloning the value first
+    pub fn parse_cloned<T: FromValue>(&self) -> ClientResult<T> {
+        T::from_value(self.clone())
+    }
+}
+
 #[derive(Debug, PartialEq, Clone)]
 /// A row returned by the server
 pub struct Row {
@@ -87,6 +104,18 @@ impl Row {
     pub fn into_values(self) -> Vec<Value> {
         self.values
     }
+    /// Returns the first [`Value`] in the [`Row`] if present
+    pub fn into_first(mut self) -> ClientResult<Value> {
+        if self.values.is_empty() {
+            Err(Error::ParseError(ParseError::ResponseMismatch))
+        } else {
+            Ok(self.values.remove(0))
+        }
+    }
+    /// Returns the first [`Value`] in the [`Row`] if present, as the given type
+    pub fn into_first_as<T: FromValue>(self) -> ClientResult<T> {
+        self.into_first().and_then(FromValue::from_value)
+    }
 }
 
 #[derive(Debug, PartialEq, Clone)]
@@ -141,6 +170,7 @@ pub enum Response {
 /// assert_eq!(myuser.username, "bob");
 /// ```
 pub trait FromResponse: Sized {
+    /// Decode the target type from the [`Response`]
     fn from_response(resp: Response) -> ClientResult<Self>;
 }
 
@@ -268,3 +298,12 @@ from_response_row!(
     (A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y) as 25,
     (A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z) as 26,
 );
+
+impl FromResponse for Row {
+    fn from_response(resp: Response) -> ClientResult<Self> {
+        match resp {
+            Response::Row(r) => Ok(r),
+            _ => Err(Error::ParseError(ParseError::ResponseMismatch)),
+        }
+    }
+}