Separate builder.rs from lib.rs

Author: soedirgo

examples/test.rs

@@ -1,13 +1,13 @@
-use postgrest::PostgrestClient;
+use postgrest::Postgrest;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let client = PostgrestClient::new("https://hacks.soedirgo.dev/postgrest");
+    let client = Postgrest::new("https://hacks.soedirgo.dev/postgrest");
     let resp = client
         .from("todos")
         .select("*")
         .execute()
         .await?;
-    println!("{}", resp);
+    println!("{}", resp.text().await?);
     Ok(())
 }

src/builder.rs

@@ -0,0 +1,41 @@
+use reqwest::{Client, Error, Method, Response};
+
+pub struct Builder {
+    method: Option<Method>,
+    url: String,
+    queries: Vec<(String, String)>,
+    headers: Vec<(String, String)>,
+}
+
+impl Builder {
+    pub fn new(url: &str) -> Self {
+        Builder {
+            method: None,
+            url: url.to_string(),
+            queries: Vec::new(),
+            headers: Vec::new(),
+        }
+    }
+
+    pub fn select(mut self, column: &str) -> Self {
+        self.method = Some(Method::GET);
+        self.queries.push(("select".to_string(), column.to_string()));
+        self
+    }
+
+    pub async fn execute(self) -> Result<Response, Error> {
+        let mut req = Client::new().request(
+            self.method.unwrap(),
+            &self.url,
+        );
+        for (k, v) in &self.headers {
+            req = req.header(k, v);
+        }
+        req = req.query(&self.queries);
+
+        let resp = req.send()
+           .await?;
+
+        Ok(resp)
+    }
+}

src/lib.rs

@@ -1,48 +1,21 @@
-use reqwest::Method;
+use builder::Builder;
 
-pub struct Request {
-    method: Option<Method>,
-    url: String,
-}
-
-impl Request {
-    pub fn new(url: &str) -> Request {
-        Request {
-            method: None,
-            url: url.to_owned(),
-        }
-    }
-
-    pub fn select(mut self, column_query: &str) -> Request {
-        self.method = Some(Method::GET);
-        self.url.push_str(&format!("?select={}", column_query));
-        self
-    }
-
-    pub async fn execute(self) -> Result<String, Box<dyn std::error::Error>> {
-        let resp = reqwest::get(&self.url)
-            .await?
-            .text()
-            .await?;
-        Ok(resp)
-    }
-}
+mod builder;
 
-pub struct PostgrestClient {
+pub struct Postgrest {
     rest_url: String,
 }
 
-impl PostgrestClient {
-    pub fn new(rest_url: &str) -> PostgrestClient {
-        PostgrestClient {
-            rest_url: rest_url.to_owned(),
+impl Postgrest {
+    pub fn new(rest_url: &str) -> Postgrest {
+        Postgrest {
+            rest_url: rest_url.to_string(),
         }
     }
 
-    pub fn from(&self, table: &str) -> Request {
+    pub fn from(&self, table: &str) -> Builder {
         let mut url = self.rest_url.clone();
-        url.push('/');
-        url.push_str(table);
-        Request::new(&url)
+        url = format!("{}/{}", url, table);
+        Builder::new(&url)
     }
 }