Add singleton class (#18)

* Add singleton class

* fix path implementation template

Author: Christopher Hock

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "thanix"
 authors = ["Christopher Hock <christopher-hock@protonmail.com>"]
-version = "0.1.0-alpha.2"
+version = "0.1.0-alpha.3"
 publish = true
 edition = "2021"
 description = "A yaml-to-rust code generator for generating Rust code from yaml config files e.g. as found in openAPI."

Cargo.toml

@@ -49,18 +49,16 @@ cargo run -- --input-file $PATH_TO_YOUR_YAML --uri $URI_TO_YOUR_API
 This may look like this:
 
 ```bash
-cargo run -- --input-file ./api_config.yaml --uri https://demo.netbox.dev
+cargo run -- --input-file ./api_config.yaml
 ```
 
-> **NOTE:** Make sure that you **do not end your URI with a slash (/)**. As this would mangle the API paths.
-
 This step will result in your `thanix_client` being generated.
 
 To view the next steps please scroll **down to the Usage section**.
 
 Optional:
 
-3. Install Thanix using `cargo install`.
+1. Install Thanix using `cargo install`.
 
 You can also install the crate on your system, so you always have it available.
 To do so, run this command while in the Thanix project directory:
@@ -92,10 +90,8 @@ We will update you as soon as we have news.
 After you have installed Thanix in a way you see fit, you use it by passing it **two mandatory parameters** like this:
 
 ```bash
-thanix --input-file $YOUR_API_YAML --uri $YOUR_API_URI
+thanix --input-file $YOUR_API_YAML
 ```
 
 - The `--input-file` parameter is a path to your `.yaml`-file you want to use as an input. This is usually the API
   schema file your want to generate a client for.
-- The `--uri` is the URI to your API in a format like this: `https://demo.netbox.dev`.
-  **Make sure this URI does not end with a `/`**

README.md

@@ -288,7 +288,7 @@ fn if_some<F: FnOnce(&T), T>(this: Option<T>, func: F) {
 }
 
 /// Generates the Rust bindings from a file.
-pub fn gen(input_path: impl AsRef<std::path::Path>, url: String) {
+pub fn gen(input_path: impl AsRef<std::path::Path>) {
     // Parse the schema.
     let input = std::fs::read_to_string(input_path).unwrap();
     let yaml: Schema = serde_yaml::from_str(&input).unwrap();
@@ -405,7 +405,7 @@ pub fn gen(input_path: impl AsRef<std::path::Path>, url: String) {
     }
     fs::write(
         "thanix_client/util.rs",
-        format!(include_str!("templates/util.rs.template"), url).as_bytes(),
+        include_str!("templates/util.rs.template").as_bytes(),
     )
     .unwrap();
     create_lib_dir("thanix_client").unwrap();

src/bindgen.rs

@@ -9,9 +9,6 @@ struct Args {
     /// Path to a YAML schema file.
     #[arg(short, long)]
     input_file: Option<String>,
-    /// URI of your netbox instance
-    #[arg(long)]
-    uri: String,
 }
 
 fn main() {
@@ -35,7 +32,7 @@ fn main() {
     );
 
     match args.input_file {
-        Some(file) => bindgen::gen(file, args.uri),
+        Some(file) => bindgen::gen(file),
         None => println!("Error: You need to provide a YAML schema to generate from."),
     }
 }

src/main.rs

@@ -1,6 +1,7 @@
 {}
 {}
 pub fn {}(query: {}{}) -> Result<reqwest::blocking::Response, reqwest::Error> {{
-    return REQWEST_CLIENT.lock().unwrap().as_ref().unwrap().{}(format!("{{}}{}?{{}}", REQWEST_BASE_URL, serde_qs::to_string(&query).unwrap())).send();
+    let binding = THANIX_CLIENT.lock().unwrap();
+    let state = binding.as_ref().unwrap();
+    return state.client.{}(format!("{{}}{}?{{}}", state.base_url, serde_qs::to_string(&query).unwrap())).header("Authorization", format!("Token {{}}", state.authentication_token)).send();
 }}
-

src/templates/path.template

@@ -1,4 +1,3 @@
 use serde_qs;
 use reqwest::Url;
-use crate::util::{REQWEST_BASE_URL, REQWEST_CLIENT};
-
+use crate::util::THANIX_CLIENT;

src/templates/usings.template

@@ -1,4 +1,9 @@
 use std::sync::Mutex;
 
-pub static REQWEST_CLIENT: Mutex<Option<reqwest::blocking::Client>> = Mutex::new(None);
-pub static REQWEST_BASE_URL: &str = "{}";
+pub struct ThanixClient {
+    pub client: reqwest::blocking::Client,
+    pub base_url: String,
+    pub authentication_token: String,
+}
+
+pub static THANIX_CLIENT: Mutex<Option<ThanixClient>> = Mutex::new(None);