add Select and Ping commands

Author: fafhrd91

CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.2.1] - 2021-08-20
+
+* cmd: Add Select and Ping commands
+
 ## [0.2.0] - 2021-06-27
 
 * upgrade to ntex-0.4

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-redis"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["ntex contributors <[email protected]>"]
 description = "Redis client"
 documentation = "https://docs.rs/ntex-redis"
@@ -21,12 +21,12 @@ openssl = ["ntex/openssl"]
 rustls = ["ntex/rustls"]
 
 [dependencies]
-ntex = "0.4.0-b.1"
+ntex = "0.4.0-b.2"
 itoa = "0.4.5"
 btoi = "0.4.2"
 log = "0.4"
 derive_more = "0.99"
 
 [dev-dependencies]
 rand = "0.8"
-env_logger = "0.8"
+env_logger = "0.9"

src/cmd/connection.rs

@@ -0,0 +1,90 @@
+use ntex::util::ByteString;
+
+use super::{Command, CommandError};
+use crate::codec::{Request, Response};
+
+/// SELECT redis command
+///
+/// Select the Redis logical database having the specified zero-based
+/// numeric index.
+///
+/// ```rust
+/// use ntex_redis::{cmd, RedisConnector};
+///
+/// #[ntex::main]
+/// async fn main() -> Result<(), Box<dyn std::error::Error>> {
+///     let redis = RedisConnector::new("127.0.0.1:6379").connect().await?;
+///
+///     // select db for current connection
+///     let success = redis.exec(cmd::Select(1)).await?;
+///
+///     assert!(success);
+///
+///     Ok(())
+/// }
+/// ```
+pub fn Select(db: u32) -> SelectCommand {
+    SelectCommand(Request::Array(vec![
+        Request::from_static("SELECT"),
+        Request::BulkInteger(db as i64),
+    ]))
+}
+
+pub struct SelectCommand(Request);
+
+impl Command for SelectCommand {
+    type Output = bool;
+
+    fn to_request(self) -> Request {
+        self.0
+    }
+
+    fn to_output(val: Response) -> Result<Self::Output, CommandError> {
+        match val {
+            Response::String(val) => Ok(val == "OK"),
+            _ => Ok(false),
+        }
+    }
+}
+
+/// PING redis command
+///
+/// This command is often used to test if a connection is still alive,
+/// or to measure latency.
+///
+/// ```rust
+/// use ntex_redis::{cmd, RedisConnector};
+///
+/// #[ntex::main]
+/// async fn main() -> Result<(), Box<dyn std::error::Error>> {
+///     let redis = RedisConnector::new("127.0.0.1:6379").connect().await?;
+///
+///     // ping connection
+///     let response = redis.exec(cmd::Ping()).await?;
+///
+///     assert_eq!(&response, "PONG");
+///
+///     Ok(())
+/// }
+/// ```
+pub fn Ping() -> PingCommand {
+    PingCommand(Request::Array(vec![Request::from_static("PING")]))
+}
+
+pub struct PingCommand(Request);
+
+impl Command for PingCommand {
+    type Output = ByteString;
+
+    fn to_request(self) -> Request {
+        self.0
+    }
+
+    fn to_output(val: Response) -> Result<Self::Output, CommandError> {
+        match val {
+            Response::String(val) => Ok(val),
+            Response::Error(val) => Err(CommandError::Error(val)),
+            _ => Err(CommandError::Output("Unknown response", val)),
+        }
+    }
+}

src/cmd/hashes.rs

@@ -128,16 +128,6 @@ impl HSetCommand {
         self.0.push(field.into());
         self.0.push(value.into());
     }
-
-    #[doc(hidden)]
-    #[deprecated(since = "0.1.3", note = "Please use the `entry` function instead")]
-    /// Insert field to a redis hashmap
-    pub fn insert<K, V>(self, field: K, value: V) -> Self
-    where
-        BulkString: From<K> + From<V>,
-    {
-        self.entry(field, value)
-    }
 }
 
 impl Command for HSetCommand {

src/cmd/mod.rs

@@ -5,13 +5,15 @@ use super::codec::{Request, Response};
 use super::errors::CommandError;
 
 mod auth;
+mod connection;
 mod hashes;
 mod keys;
 mod lists;
 mod strings;
 mod utils;
 
 pub use self::auth::Auth;
+pub use self::connection::{Ping, Select};
 pub use self::hashes::{HDel, HGet, HGetAll, HIncrBy, HLen, HSet};
 pub use self::keys::{Del, Exists, Expire, ExpireAt, Ttl, TtlResult};
 pub use self::lists::{LIndex, LPop, LPush, RPop, RPush};

tests/test_redis.rs

@@ -160,7 +160,7 @@ async fn test_hashes() {
     let key = new_key();
 
     let result = redis
-        .exec(cmd::HSet(&key, "field1", "1").insert("field2", "2"))
+        .exec(cmd::HSet(&key, "field1", "1").entry("field2", "2"))
         .await
         .unwrap();
     assert_eq!(result, 2);
@@ -189,3 +189,14 @@ async fn test_hashes() {
     let result = redis.exec(cmd::HGetAll(&key)).await.unwrap();
     assert!(result.is_empty());
 }
+
+#[ntex::test]
+async fn test_connection() {
+    let redis = connect().await;
+
+    let result = redis.exec(cmd::Ping()).await.unwrap();
+    assert_eq!(result, "PONG");
+
+    let result = redis.exec(cmd::Select(1)).await.unwrap();
+    assert!(result);
+}