Separate filter functionality from builder.rs

Author: soedirgo

src/builder.rs

@@ -3,24 +3,12 @@ use reqwest::{
     Client, Error, Method, Response,
 };
 
-macro_rules! filter {
-    ( $( $op:ident ),* ) => {
-        $(
-            pub fn $op(mut self, column: &str, param: &str) -> Self {
-                self.queries.push((column.to_string(),
-                                   format!("{}.{}", stringify!($op), param)));
-                self
-            }
-        )*
-    }
-}
-
 #[derive(Default)]
 pub struct Builder {
     method: Method,
     url: String,
     schema: Option<String>,
-    queries: Vec<(String, String)>,
+    pub(crate) queries: Vec<(String, String)>,
     headers: HeaderMap,
     body: Option<String>,
     is_rpc: bool,
@@ -150,19 +138,6 @@ impl Builder {
         self
     }
 
-    // It's unfortunate that `in` is a keyword, otherwise it'd belong in the
-    // collection of filters below
-    filter!(
-        eq, gt, gte, lt, lte, neq, like, ilike, is, fts, plfts, phfts, wfts, cs, cd, ov, sl, sr,
-        nxr, nxl, adj, not
-    );
-
-    pub fn in_(mut self, column: &str, param: &str) -> Self {
-        self.queries
-            .push((column.to_string(), format!("in.{}", param)));
-        self
-    }
-
     pub fn rpc(mut self, params: &str) -> Self {
         self.method = Method::POST;
         self.body = Some(params.to_string());

src/filter.rs

@@ -0,0 +1,28 @@
+use crate::Builder;
+
+macro_rules! filter {
+    ( $( $op:ident ),* ) => {
+        $(
+            pub fn $op(mut self, column: &str, param: &str) -> Self {
+                self.queries.push((column.to_string(),
+                                   format!("{}.{}", stringify!($op), param)));
+                self
+            }
+        )*
+    }
+}
+
+impl Builder {
+    // It's unfortunate that `in` is a keyword, otherwise it'd belong in the
+    // collection of filters below
+    filter!(
+        eq, gt, gte, lt, lte, neq, like, ilike, is, fts, plfts, phfts, wfts, cs, cd, ov, sl, sr,
+        nxr, nxl, adj, not
+    );
+
+    pub fn in_(mut self, column: &str, param: &str) -> Self {
+        self.queries
+            .push((column.to_string(), format!("in.{}", param)));
+        self
+    }
+}

src/lib.rs

@@ -1,4 +1,5 @@
 mod builder;
+mod filter;
 
 use builder::Builder;