Fixed ga

fmt

Author: DeffoNotMrG

.github/workflows/rust.yml

@@ -23,6 +23,7 @@ jobs:
         profile: minimal
         toolchain: stable
         override: true
+        components: rustfmt, clippy
 
     - name: Cache dependencies
       uses: actions/cache@v3
@@ -39,7 +40,10 @@ jobs:
         echo "PORT=8080" >> .env
         cargo test -- --nocapture
     
-    - name: Check formatting
+    - name: Format code
+      run: cargo fmt
+      
+    - name: Verify formatting
       run: cargo fmt -- --check
 
     - name: Run clippy

src/main.rs

@@ -1,16 +1,17 @@
-#[macro_use] extern crate rocket;
+#[macro_use]
+extern crate rocket;
 
-use rocket::response::content::RawXml;
-use rocket::http::{Status, Header};
-use rocket::request::{FromRequest, Outcome, Request};
+use log::{error, info};
+use qrcode::render::svg;
+use qrcode::QrCode;
 use rocket::config::Config;
-use rocket::{Response};
 use rocket::fairing::{Fairing, Info, Kind};
-use qrcode::QrCode;
-use qrcode::render::svg;
+use rocket::http::{Header, Status};
+use rocket::request::{FromRequest, Outcome, Request};
+use rocket::response::content::RawXml;
+use rocket::Response;
 use std::env;
 use std::net::IpAddr;
-use log::{info, error};
 
 #[cfg(test)]
 mod tests;
@@ -47,12 +48,13 @@ impl<'r> FromRequest<'r> for ApiKey<'r> {
 fn generate_qr(_api_key: ApiKey<'_>, url: String) -> RawXml<String> {
     info!("Generating QR code for URL: {}", url);
     let code = QrCode::new(url).unwrap();
-    let svg = code.render()
+    let svg = code
+        .render()
         .min_dimensions(200, 200)
         .dark_color(svg::Color("#000000"))
         .light_color(svg::Color("#ffffff"))
         .build();
-    
+
     RawXml(svg)
 }
 
@@ -69,14 +71,20 @@ impl Fairing for CORS {
     fn info(&self) -> Info {
         Info {
             name: "Add CORS headers to responses",
-            kind: Kind::Response
+            kind: Kind::Response,
         }
     }
 
     async fn on_response<'r>(&self, _request: &'r Request<'_>, response: &mut Response<'r>) {
         response.set_header(Header::new("Access-Control-Allow-Origin", "*"));
-        response.set_header(Header::new("Access-Control-Allow-Methods", "GET, POST, OPTIONS"));
-        response.set_header(Header::new("Access-Control-Allow-Headers", "Content-Type, X-API-Key"));
+        response.set_header(Header::new(
+            "Access-Control-Allow-Methods",
+            "GET, POST, OPTIONS",
+        ));
+        response.set_header(Header::new(
+            "Access-Control-Allow-Headers",
+            "Content-Type, X-API-Key",
+        ));
     }
 }
 
@@ -90,7 +98,7 @@ fn rocket() -> _ {
     if std::env::var("RUST_LOG").is_err() {
         env_logger::init();
     }
-    
+
     dotenv::dotenv().ok();
 
     let port = env::var("PORT").unwrap_or_else(|_| "8080".to_string());
@@ -109,4 +117,4 @@ fn rocket() -> _ {
     rocket::custom(config)
         .mount("/", routes![generate_qr, hello, all_options])
         .attach(CORS)
-}
+}

src/tests.rs

@@ -1,6 +1,6 @@
 use super::*;
-use rocket::local::blocking::Client;
 use rocket::http::{Header, Status};
+use rocket::local::blocking::Client;
 use std::sync::Once;
 
 static INIT: Once = Once::new();
@@ -16,15 +16,15 @@ fn setup() {
 
 fn create_test_client() -> Client {
     setup();
-    
+
     // Clean environment before setting test values
     std::env::remove_var("API_KEY");
     std::env::remove_var("PORT");
-    
+
     // Set up test environment
     std::env::set_var("API_KEY", "test_key");
     std::env::set_var("PORT", "8080");
-    
+
     match Client::tracked(rocket()) {
         Ok(client) => client,
         Err(e) => panic!("Failed to create test client: {:?}", e),
@@ -46,18 +46,16 @@ fn test_generate_qr_with_valid_api_key() {
         .get("/generate?url=https://ghurmy.xyz")
         .header(Header::new("X-API-Key", "test_key"))
         .dispatch();
-    
+
     assert_eq!(response.status(), Status::Ok);
     assert!(response.into_string().unwrap().contains("<svg"));
 }
 
 #[test]
 fn test_generate_qr_without_api_key() {
     let client = create_test_client();
-    let response = client
-            .get("/generate?url=https://example.com")
-            .dispatch();
-    
+    let response = client.get("/generate?url=https://example.com").dispatch();
+
     assert_eq!(response.status(), Status::BadRequest);
 }
 
@@ -68,15 +66,15 @@ fn test_generate_qr_with_invalid_api_key() {
         .get("/generate?url=https://ghurmy.xyz")
         .header(Header::new("X-API-Key", "wrong_key"))
         .dispatch();
-    
+
     assert_eq!(response.status(), Status::Unauthorized);
 }
 
 #[test]
 fn test_cors_headers() {
     let client = create_test_client();
     let response = client.get("/").dispatch();
-    
+
     assert_eq!(
         response.headers().get_one("Access-Control-Allow-Origin"),
         Some("*")
@@ -95,7 +93,7 @@ fn test_cors_headers() {
 fn test_options_request() {
     let client = create_test_client();
     let response = client.options("/").dispatch();
-    
+
     assert_eq!(response.status(), Status::Ok);
 }
 
@@ -106,8 +104,8 @@ fn test_generate_qr_with_invalid_url() {
         .get("/generate?url=not_a_url")
         .header(Header::new("X-API-Key", "test_key"))
         .dispatch();
-    
+
     // The QR code library should still generate a QR code even for invalid URLs
     assert_eq!(response.status(), Status::Ok);
     assert!(response.into_string().unwrap().contains("<svg"));
-} 
+}