refactor: Parameter constructor

Author: ghztomash

examples/apikey.rs

@@ -3,10 +3,13 @@ use std::{env, error::Error};
 
 fn main() -> Result<(), Box<dyn Error>> {
     // read the API key from the environment variables
-    let key = env::var("ABSTRACT_APIKEY").ok();
+    let key = env::var("ABSTRACT_APIKEY")?;
     let provider = LookupProvider::AbstractApi;
-    let parameters = Parameters::new(key);
+    // set the API key as a parameter
+    let parameters = Some(Parameters::new(key));
+    // create a lookup service
     let service = LookupService::new(provider, parameters);
+    // lookup own public IP address
     let result = service.lookup(None)?;
     println!("{}", result);
     Ok(())

src/lib.rs

@@ -100,7 +100,7 @@ pub fn perform_lookup(target: Option<IpAddr>) -> Result<LookupResponse> {
 ///
 /// let providers = vec![
 ///     // List of providers to use for the lookup
-///     // (LookupProvider::IpWhoIs, Parameters::new(apikey))
+///     // (LookupProvider::IpWhoIs, Some(Parameters::new(apikey)))
 /// ];
 ///
 /// match public_ip_address::perform_lookup_with(providers, None) {
@@ -168,7 +168,7 @@ pub fn perform_lookup_with(
 ///
 /// let providers = vec![
 ///     // List of providers to use for the lookup
-///     // (LookupProvider::IpWhoIs, Parameters::new(apikey))
+///     // (LookupProvider::IpWhoIs, Some(Parameters::new(apikey)))
 /// ];
 /// let expire_time = Some(60); // Cache expires after 60 seconds
 /// let flush = false; // Do not force cache flush

src/lookup/mod.rs

@@ -192,7 +192,10 @@ impl LookupProvider {
             .ok_or(LookupError::GenericError("No provider given".to_string()))?;
         let provider = p.parse::<LookupProvider>()?;
         // get the key if it exists
-        let key = Parameters::new(s.get(1).cloned());
+        let key = match s.get(1) {
+            Some(key) => Some(Parameters::new(key.to_owned())),
+            None => None,
+        };
         Ok((provider, key))
     }
 }
@@ -205,8 +208,8 @@ pub struct Parameters {
 }
 
 impl Parameters {
-    pub fn new(api_key: Option<String>) -> Option<Self> {
-        api_key.map(|api_key| Parameters { api_key })
+    pub fn new(api_key: String) -> Self {
+        Self { api_key }
     }
 }