support url parameters

Author: Stephan Dilly

rest-api/readme.md

@@ -15,9 +15,9 @@ Support as many flavours and special cases out there in different Rest APIs with
 ## todo
 
 - [x] proof of concept
+- [x] support url parameters
 - [ ] string results
 - [ ] define base url in attribute
-- [ ] support url parameters
 - [ ] support query parameters
 - [ ] support post using json
 - [ ] allow serializable types in api

rest-api/src/lib.rs

@@ -65,23 +65,44 @@ fn get_impl_item(trait_item: syn::TraitItem) -> syn::ImplItemMethod {
 fn get_impl_method(trait_item: syn::TraitItemMethod) -> syn::ImplItemMethod {
     let name = trait_item.clone().sig.ident;
     // find the endpoint attribute defining the url postfix to use
-    let endpoint_name = match get_endpoint_attr(trait_item) {
+    let endpoint_name = match get_endpoint_attr(trait_item.clone()) {
         Some(s) => s,
         None => name.to_string().clone(),
     };
 
+    let args: Vec<syn::Ident> = trait_item
+        .clone()
+        .sig
+        .inputs
+        .into_iter()
+        .filter_map(|a| match a {
+            syn::FnArg::Typed(arg) => Some(*arg.pat),
+            _ => None,
+        })
+        .filter_map(|pat| match pat {
+            syn::Pat::Ident(ident) => Some(ident.ident),
+            _ => None,
+        })
+        .collect();
+
+    let path: syn::Expr = syn::parse2(quote! {&format!(#endpoint_name, #(#args),*)}).unwrap();
+
     // build the method
-    syn::parse2(quote! {
+    let mut method_impl: syn::ImplItemMethod = syn::parse2(quote! {
         fn #name(&self) -> Result<serde_json::Value, Box<dyn std::error::Error>> {
-            let url = self.base_url.clone() + #endpoint_name;
+            let url = self.base_url.clone() + #path;
             let mut builder = reqwest::Client::new().get(url.as_str());
             builder = self.add_headers(builder);
             let json: serde_json::Value = builder.send()?.json()?;
 
             Ok(json)
         }
     })
-    .unwrap()
+    .unwrap();
+
+    method_impl.sig = trait_item.clone().sig;
+
+    method_impl
 }
 
 fn get_endpoint_attr(trait_item: syn::TraitItemMethod) -> Option<String> {

src/main.rs

@@ -9,9 +9,10 @@ trait AlpacaApi {
     fn get_account(&self) -> Result<serde_json::Value, Box<dyn std::error::Error>>;
 
     /// see https://docs.alpaca.markets/api-documentation/api-v2/account-activities/
-    #[endpoint("account/activities/FILL")]
+    #[endpoint("account/activities/{}")]
     fn account_activities(
-        &self, //activity_type: String,
+        &self,
+        activity_type: &str,
     ) -> Result<serde_json::Value, Box<dyn std::error::Error>>;
 
     /// see https://docs.alpaca.markets/api-documentation/api-v2/clock/
@@ -36,14 +37,11 @@ fn main() {
     };
 
     let acc = api.get_account().unwrap();
+    println!("account:\n{:#?}\n", acc);
 
-    println!("{:#?}", acc);
-
-    let act = api.account_activities().unwrap();
-
-    println!("{:#?}", act);
+    let act = api.account_activities("FILL").unwrap();
+    println!("activities:\n{:#?}\n", act);
 
     let clc = api.clock().unwrap();
-
-    println!("{:#?}", clc);
+    println!("clock:\n{:#?}\n", clc);
 }