Merge pull request #26 from yajamon/builder_macro

Builder macroつくったった

Fix #25

Author: yajamon

src/builder.rs

@@ -0,0 +1,33 @@
+macro_rules! builder {
+    ( $src_name:ident => $dest_name:ident {
+        $($attr_name:ident : $attr_type:ty = $attr_default:expr),*
+    }) => {
+        pub struct $dest_name {
+            $( $attr_name : $attr_type ),*
+        }
+
+        pub struct $src_name {
+            $( $attr_name : $attr_type ),*
+        }
+        impl $src_name {
+            pub fn new() -> $src_name {
+                $src_name {
+                    $( $attr_name : $attr_default ),*
+                }
+            }
+
+            pub fn finalize(&self) -> $dest_name {
+                $dest_name {
+                    $( $attr_name : self.$attr_name.clone() ),*
+                }
+            }
+
+            $(
+                pub fn $attr_name(&mut self, value: $attr_type) -> &mut Self {
+                    self.$attr_name = value;
+                    self
+                }
+            )*
+        }
+    }
+}

src/lib.rs

@@ -1,4 +1,7 @@
+#[macro_use]
+mod builder;
 mod core;
+
 pub mod public_api;
 pub mod trade_api;
 

src/main.rs

@@ -9,24 +9,27 @@ use zaif_api::public_api::*;
 use zaif_api::trade_api::*;
 
 fn main() {
-    let api = CurrenciesBuilder::new().name("btc").finalize();
+    let api = CurrenciesBuilder::new().name("btc".to_string()).finalize();
     println!("{}", api.exec().unwrap());
 
     let api = CurrencyPairsBuilder::new().finalize();
     println!("{}", api.exec().unwrap());
 
-    let api = LastPriceBuilder::new().currency_pair("btc_jpy").finalize();
+    let api = LastPriceBuilder::new().currency_pair("btc_jpy".to_string()).finalize();
     println!("{}", api.exec().unwrap());
 
-    let api = DepthBuilder::new().currency_pair("btc_jpy").finalize();
+    let api = DepthBuilder::new().currency_pair("btc_jpy".to_string()).finalize();
     println!("{}", api.exec().unwrap());
 
     let access_key = AccessKey::new("YOUR_API_KEY", "YOUR_API_SECRET");
-    let api = GetInfo2Builder::new(access_key.clone()).finalize();
+    let api = GetInfo2Builder::new()
+        .access_key(access_key.clone())
+        .finalize();
     println!("{}", api.exec().unwrap());
 
-    let api = TradeBuilder::new(access_key.clone())
-        .currency_pair("zaif_jpy")
+    let api = TradeBuilder::new()
+        .access_key(access_key.clone())
+        .currency_pair("zaif_jpy".to_string())
         .action(TradeAction::Bid)
         .price(1.0)
         .amount(0.1)
@@ -36,9 +39,10 @@ fn main() {
             println!("{}", res);
             let json: Value = serde_json::from_str(res.as_str()).unwrap();
             let order_id = json["return"]["order_id"].as_u64().unwrap();
-            let api = CancelOrderBuilder::new(access_key.clone())
+            let api = CancelOrderBuilder::new()
+                .access_key(access_key.clone())
                 .order_id(order_id)
-                .currency_pair("zaif_jpy")
+                .currency_pair(Some("zaif_jpy".to_string()))
                 .finalize();
             let wait_time = time::Duration::from_secs(5);
             thread::sleep(wait_time);
@@ -47,8 +51,9 @@ fn main() {
         _ => return,
     }
 
-    let api = ActiveOrdersBuilder::new(access_key.clone())
-        .currency_pair("zaif_jpy")
+    let api = ActiveOrdersBuilder::new()
+        .access_key(access_key.clone())
+        .currency_pair(Some("zaif_jpy".to_string()))
         .finalize();
     println!("{}", api.exec().unwrap());
 }

src/public_api/currencies.rs

@@ -2,9 +2,9 @@ extern crate reqwest;
 
 use core::*;
 
-pub struct Currencies {
-    name: String,
-}
+builder!(CurrenciesBuilder => Currencies {
+    name: String = "all".to_string()
+});
 
 impl Currencies {
     pub fn exec(&self) -> reqwest::Result<String> {
@@ -17,20 +17,3 @@ impl Currencies {
         api.exec()
     }
 }
-
-pub struct CurrenciesBuilder {
-    name: String,
-}
-
-impl CurrenciesBuilder {
-    pub fn new() -> CurrenciesBuilder {
-        CurrenciesBuilder { name: "all".to_string() }
-    }
-    pub fn name(&mut self, name: &str) -> &mut CurrenciesBuilder {
-        self.name = name.to_string();
-        self
-    }
-    pub fn finalize(&self) -> Currencies {
-        Currencies { name: self.name.clone() }
-    }
-}

src/public_api/currency_pairs.rs

@@ -2,9 +2,9 @@ extern crate reqwest;
 
 use core::*;
 
-pub struct CurrencyPairs {
-    currency_pair: String,
-}
+builder!(CurrencyPairsBuilder => CurrencyPairs {
+    currency_pair: String = "all".to_string()
+});
 
 impl CurrencyPairs {
     pub fn exec(&self) -> reqwest::Result<String> {
@@ -21,19 +21,3 @@ impl CurrencyPairs {
     }
 }
 
-pub struct CurrencyPairsBuilder {
-    currency_pair: String,
-}
-
-impl CurrencyPairsBuilder {
-    pub fn new() -> CurrencyPairsBuilder {
-        CurrencyPairsBuilder { currency_pair: "all".to_string() }
-    }
-    pub fn currency_pair(&mut self, currency_pair: &str) -> &mut CurrencyPairsBuilder {
-        self.currency_pair = currency_pair.to_string();
-        self
-    }
-    pub fn finalize(&self) -> CurrencyPairs {
-        CurrencyPairs { currency_pair: self.currency_pair.clone() }
-    }
-}

src/public_api/depth.rs

@@ -2,9 +2,9 @@ extern crate reqwest;
 
 use core::*;
 
-pub struct Depth {
-    currency_pair: String,
-}
+builder!(DepthBuilder => Depth {
+    currency_pair: String = "btc_jpy".to_string()
+});
 
 impl Depth {
     pub fn exec(&self) -> reqwest::Result<String> {
@@ -18,19 +18,3 @@ impl Depth {
     }
 }
 
-pub struct DepthBuilder {
-    currency_pair: String,
-}
-
-impl DepthBuilder {
-    pub fn new() -> DepthBuilder {
-        DepthBuilder { currency_pair: "btc_jpy".to_string() }
-    }
-    pub fn currency_pair(&mut self, currency_pair: &str) -> &mut DepthBuilder {
-        self.currency_pair = currency_pair.to_string();
-        self
-    }
-    pub fn finalize(&self) -> Depth {
-        Depth { currency_pair: self.currency_pair.clone() }
-    }
-}

src/public_api/last_price.rs

@@ -2,9 +2,9 @@ extern crate reqwest;
 
 use core::*;
 
-pub struct LastPrice {
-    currency_pair: String,
-}
+builder!(LastPriceBuilder => LastPrice {
+    currency_pair: String = "btc_jpy".to_string()
+});
 
 impl LastPrice {
     pub fn exec(&self) -> reqwest::Result<String> {
@@ -21,19 +21,3 @@ impl LastPrice {
     }
 }
 
-pub struct LastPriceBuilder {
-    currency_pair: String,
-}
-
-impl LastPriceBuilder {
-    pub fn new() -> LastPriceBuilder {
-        LastPriceBuilder { currency_pair: "btc_jpy".to_string() }
-    }
-    pub fn currency_pair(&mut self, currency_pair: &str) -> &mut LastPriceBuilder {
-        self.currency_pair = currency_pair.to_string();
-        self
-    }
-    pub fn finalize(&self) -> LastPrice {
-        LastPrice { currency_pair: self.currency_pair.clone() }
-    }
-}

src/trade_api/active_orders.rs

@@ -4,10 +4,10 @@ use std::collections::HashMap;
 
 use core::*;
 
-pub struct ActiveOrders {
-    access_key: AccessKey,
-    currency_pair: Option<String>,
-}
+builder!(ActiveOrdersBuilder => ActiveOrders {
+    access_key: AccessKey = AccessKey::new("", ""),
+    currency_pair: Option<String> = None
+});
 
 impl ActiveOrders {
     pub fn exec(&self) -> reqwest::Result<String> {
@@ -31,26 +31,3 @@ impl ActiveOrders {
     }
 }
 
-pub struct ActiveOrdersBuilder {
-    access_key: AccessKey,
-    currency_pair: Option<String>,
-}
-
-impl ActiveOrdersBuilder {
-    pub fn new(access_key: AccessKey) -> ActiveOrdersBuilder {
-        ActiveOrdersBuilder {
-            access_key: access_key,
-            currency_pair: None,
-        }
-    }
-    pub fn currency_pair(&mut self, currency_pair: &str) -> &mut ActiveOrdersBuilder {
-        self.currency_pair = Some(currency_pair.to_string());
-        self
-    }
-    pub fn finalize(&self) -> ActiveOrders {
-        ActiveOrders {
-            access_key: self.access_key.clone(),
-            currency_pair: self.currency_pair.clone(),
-        }
-    }
-}

src/trade_api/cancel_order.rs

@@ -4,11 +4,11 @@ use std::collections::HashMap;
 
 use core::*;
 
-pub struct CancelOrder {
-    access_key: AccessKey,
-    order_id: u64,
-    currency_pair: Option<String>,
-}
+builder!(CancelOrderBuilder => CancelOrder {
+    access_key: AccessKey = AccessKey::new("", ""),
+    order_id: u64 = 0,
+    currency_pair: Option<String> = None
+});
 
 impl CancelOrder {
     pub fn exec(&self) -> reqwest::Result<String> {
@@ -33,33 +33,3 @@ impl CancelOrder {
     }
 }
 
-pub struct CancelOrderBuilder {
-    access_key: AccessKey,
-    order_id: Option<u64>,
-    currency_pair: Option<String>,
-}
-
-impl CancelOrderBuilder {
-    pub fn new(access_key: AccessKey) -> CancelOrderBuilder {
-        CancelOrderBuilder {
-            access_key: access_key,
-            order_id: None,
-            currency_pair: None,
-        }
-    }
-    pub fn order_id(&mut self, order_id: u64) -> &mut CancelOrderBuilder {
-        self.order_id = Some(order_id);
-        self
-    }
-    pub fn currency_pair(&mut self, currency_pair: &str) -> &mut CancelOrderBuilder {
-        self.currency_pair = Some(currency_pair.to_string());
-        self
-    }
-    pub fn finalize(&self) -> CancelOrder {
-        CancelOrder {
-            access_key: self.access_key.clone(),
-            order_id: self.order_id.unwrap(),
-            currency_pair: self.currency_pair.clone(),
-        }
-    }
-}

src/trade_api/get_info2.rs

@@ -4,9 +4,9 @@ use std::collections::HashMap;
 
 use core::*;
 
-pub struct GetInfo2 {
-    access_key: AccessKey,
-}
+builder!(GetInfo2Builder => GetInfo2 {
+    access_key: AccessKey = AccessKey::new("", "")
+});
 
 impl GetInfo2 {
     pub fn new(access_key: AccessKey) -> GetInfo2 {
@@ -27,15 +27,3 @@ impl GetInfo2 {
     }
 }
 
-pub struct GetInfo2Builder {
-    access_key: AccessKey,
-}
-
-impl GetInfo2Builder {
-    pub fn new(access_key: AccessKey) -> GetInfo2Builder {
-        GetInfo2Builder { access_key: access_key }
-    }
-    pub fn finalize(&self) -> GetInfo2 {
-        GetInfo2 { access_key: self.access_key.clone() }
-    }
-}