Merge pull request #27 from yajamon/response_structure

Public Apiのレスポンスを共通のTraitで実装したし、結果を構造体にパースして返すようにした

Author: yajamon

Cargo.toml

@@ -19,3 +19,5 @@ hyper-tls = "0.1.2"
 chrono = "0.4"
 openssl = "0.9"
 serde_json = "1.0.8"
+serde = "1.0"
+serde_derive = "1.0"

src/lib.rs

@@ -1,3 +1,6 @@
+#[macro_use]
+extern crate serde_derive;
+
 #[macro_use]
 mod builder;
 mod core;

src/main.rs

@@ -10,16 +10,33 @@ use zaif_api::trade_api::*;
 
 fn main() {
     let api = CurrenciesBuilder::new().name("btc".to_string()).finalize();
-    println!("{}", api.exec().unwrap());
+    for currency in api.exec().unwrap() {
+        println!("name: {} is_token: {}", currency.name, currency.is_token);
+    }
 
     let api = CurrencyPairsBuilder::new().finalize();
-    println!("{}", api.exec().unwrap());
+    for currency_pair in api.exec().unwrap() {
+        println!(
+            "name: {} description: {}",
+            currency_pair.name,
+            currency_pair.description
+        );
+    }
 
-    let api = LastPriceBuilder::new().currency_pair("btc_jpy".to_string()).finalize();
-    println!("{}", api.exec().unwrap());
+    let api = LastPriceBuilder::new()
+        .currency_pair("btc_jpy".to_string())
+        .finalize();
+    println!("last_price: {}", api.exec().unwrap().last_price);
 
-    let api = DepthBuilder::new().currency_pair("btc_jpy".to_string()).finalize();
-    println!("{}", api.exec().unwrap());
+    let api = DepthBuilder::new()
+        .currency_pair("btc_jpy".to_string())
+        .finalize();
+    for ask in api.exec().unwrap().asks {
+        println!("ask price: {} amount: {}", ask.price(), ask.amount());
+    }
+    for bid in api.exec().unwrap().bids {
+        println!("bid price: {} amount: {}", bid.price(), bid.amount());
+    }
 
     let access_key = AccessKey::new("YOUR_API_KEY", "YOUR_API_SECRET");
     let api = GetInfo2Builder::new()

src/public_api/currencies.rs

@@ -1,19 +1,29 @@
-extern crate reqwest;
+extern crate serde;
+extern crate serde_json;
 
-use core::*;
+use public_api::PublicApi;
 
 builder!(CurrenciesBuilder => Currencies {
     name: String = "all".to_string()
 });
 
 impl Currencies {
-    pub fn exec(&self) -> reqwest::Result<String> {
-        let api = ApiBuilder::new()
-            .uri(
-                format!("https://api.zaif.jp/api/1/currencies/{}", self.name).as_str(),
-            )
-            .finalize();
+    pub fn exec(&self) -> serde_json::Result<Vec<CurrenciesResponse>> {
+        serde_json::from_value(<Self as PublicApi>::exec(&self)?)
+    }
+}
 
-        api.exec()
+impl PublicApi for Currencies {
+    fn action(&self) -> &str {
+        "currencies"
+    }
+    fn parameter(&self) -> &str {
+        self.name.as_str()
     }
 }
+
+#[derive(Deserialize)]
+pub struct CurrenciesResponse {
+    pub name: String,
+    pub is_token: bool,
+}

src/public_api/currency_pairs.rs

@@ -1,23 +1,41 @@
-extern crate reqwest;
+extern crate serde;
+extern crate serde_json;
 
-use core::*;
+use public_api::PublicApi;
 
 builder!(CurrencyPairsBuilder => CurrencyPairs {
     currency_pair: String = "all".to_string()
 });
 
 impl CurrencyPairs {
-    pub fn exec(&self) -> reqwest::Result<String> {
-        let api = ApiBuilder::new()
-            .uri(
-                format!(
-                    "https://api.zaif.jp/api/1/currency_pairs/{}",
-                    self.currency_pair
-                ).as_str(),
-            )
-            .finalize();
+    pub fn exec(&self) -> serde_json::Result<Vec<CurrencyPairsResponse>> {
+        serde_json::from_value(<Self as PublicApi>::exec(&self)?)
+    }
+}
 
-        api.exec()
+impl PublicApi for CurrencyPairs {
+    fn action(&self) -> &str {
+        "currency_pairs"
+    }
+    fn parameter(&self) -> &str {
+        self.currency_pair.as_str()
     }
 }
 
+#[derive(Deserialize)]
+pub struct CurrencyPairsResponse {
+    pub name: String,
+    pub title: String,
+    pub currency_pair: String,
+    pub description: String,
+    pub is_token: bool,
+    pub event_number: i64,
+    pub seq: i64,
+    pub item_unit_min: f64,
+    pub item_unit_step: f64,
+    pub item_japanese: String,
+    pub aux_unit_min: f64,
+    pub aux_unit_step: f64,
+    pub aux_unit_point: i64,
+    pub aux_japanese: String,
+}

src/public_api/depth.rs

@@ -1,20 +1,40 @@
-extern crate reqwest;
+extern crate serde;
+extern crate serde_json;
 
-use core::*;
+use public_api::PublicApi;
 
 builder!(DepthBuilder => Depth {
     currency_pair: String = "btc_jpy".to_string()
 });
 
 impl Depth {
-    pub fn exec(&self) -> reqwest::Result<String> {
-        let api = ApiBuilder::new()
-            .uri(
-                format!("https://api.zaif.jp/api/1/depth/{}", self.currency_pair).as_str(),
-            )
-            .finalize();
+    pub fn exec(&self) -> serde_json::Result<DepthResponse> {
+        serde_json::from_value(<Self as PublicApi>::exec(&self)?)
+    }
+}
+
+impl PublicApi for Depth {
+    fn action(&self) -> &str {
+        "depth"
+    }
+    fn parameter(&self) -> &str {
+        self.currency_pair.as_str()
+    }
+}
 
-        api.exec()
+#[derive(Deserialize)]
+pub struct DepthItem(f64, f64);
+impl DepthItem {
+    pub fn price(&self) -> f64 {
+        self.0
+    }
+    pub fn amount(&self) -> f64 {
+        self.1
     }
 }
 
+#[derive(Deserialize)]
+pub struct DepthResponse {
+    pub asks: Vec<DepthItem>,
+    pub bids: Vec<DepthItem>,
+}

src/public_api/last_price.rs

@@ -1,23 +1,28 @@
-extern crate reqwest;
+extern crate serde;
+extern crate serde_json;
 
-use core::*;
+use public_api::PublicApi;
 
 builder!(LastPriceBuilder => LastPrice {
     currency_pair: String = "btc_jpy".to_string()
 });
 
 impl LastPrice {
-    pub fn exec(&self) -> reqwest::Result<String> {
-        let api = ApiBuilder::new()
-            .uri(
-                format!(
-                    "https://api.zaif.jp/api/1/last_price/{}",
-                    self.currency_pair
-                ).as_str(),
-            )
-            .finalize();
+    pub fn exec(&self) -> serde_json::Result<LastPriceResponse> {
+        serde_json::from_value(<Self as PublicApi>::exec(&self)?)
+    }
+}
 
-        api.exec()
+impl PublicApi for LastPrice {
+    fn action(&self) -> &str {
+        "last_price"
+    }
+    fn parameter(&self) -> &str {
+        self.currency_pair.as_str()
     }
 }
 
+#[derive(Deserialize)]
+pub struct LastPriceResponse {
+    pub last_price: f64,
+}

src/public_api/mod.rs

@@ -1,3 +1,10 @@
+extern crate reqwest;
+extern crate serde_json;
+
+use self::serde_json::Value;
+
+use core::*;
+
 pub use self::currencies::*;
 pub use self::currency_pairs::*;
 pub use self::last_price::*;
@@ -7,3 +14,23 @@ mod currencies;
 mod currency_pairs;
 mod last_price;
 mod depth;
+
+trait PublicApi {
+    fn action(&self) -> &str;
+    fn parameter(&self) -> &str;
+    fn exec(&self) -> serde_json::Result<Value> {
+        let endpoint = "https://api.zaif.jp/api/1";
+        let api = ApiBuilder::new()
+            .uri(
+                format!("{}/{}/{}", endpoint, self.action(), self.parameter()).as_str(),
+            )
+            .finalize();
+
+        let res = match api.exec() {
+            Ok(res) => res,
+            Err(e) => panic!("reqwest Error: {}", e),
+        };
+        serde_json::from_str(res.as_str())
+    }
+}
+