Refactor formatting and improve code consistency

This commit refactors code for improved formatting, readability, and consistency across multiple modules. It includes reordering imports, expanding multi-line expressions, improving error handling, updating function signatures, and enhancing test assertions. No functional changes are introduced.

Author: Tuntii

.gitignore

@@ -6,3 +6,4 @@
 
 assets/myadam.jpg
 .github/copilot-instructions.md
+docs/UPDATE_SUMMARIES.md

crates/cargo-rustapi/src/cli.rs

@@ -1,7 +1,7 @@
 //! CLI argument parsing
 
+use crate::commands::{self, GenerateArgs, NewArgs, RunArgs};
 use clap::{Parser, Subcommand};
-use crate::commands::{self, NewArgs, RunArgs, GenerateArgs};
 
 /// RustAPI CLI - Project scaffolding and development utilities
 #[derive(Parser, Debug)]

crates/cargo-rustapi/src/commands/docs.rs

@@ -6,33 +6,32 @@ use console::style;
 /// Open API documentation in browser
 pub async fn open_docs(port: u16) -> Result<()> {
     let url = format!("http://localhost:{}/docs", port);
-    
+
     println!("Opening {} in browser...", style(&url).cyan());
-    
+
     // Try to open in browser
     #[cfg(target_os = "windows")]
     {
         tokio::process::Command::new("cmd")
             .args(["/C", "start", &url])
             .spawn()?;
     }
-    
+
     #[cfg(target_os = "macos")]
     {
-        tokio::process::Command::new("open")
-            .arg(&url)
-            .spawn()?;
+        tokio::process::Command::new("open").arg(&url).spawn()?;
     }
-    
+
     #[cfg(target_os = "linux")]
     {
-        tokio::process::Command::new("xdg-open")
-            .arg(&url)
-            .spawn()?;
+        tokio::process::Command::new("xdg-open").arg(&url).spawn()?;
     }
 
     println!();
-    println!("{}", style("Make sure your RustAPI server is running!").yellow());
+    println!(
+        "{}",
+        style("Make sure your RustAPI server is running!").yellow()
+    );
     println!("Start it with: {}", style("cargo rustapi run").cyan());
 
     Ok(())

crates/cargo-rustapi/src/commands/generate.rs

@@ -39,11 +39,11 @@ pub async fn generate(args: GenerateArgs) -> Result<()> {
 
 async fn generate_handler(name: &str) -> Result<()> {
     let handlers_dir = Path::new("src/handlers");
-    
+
     // Create handlers directory if it doesn't exist
     if !handlers_dir.exists() {
         fs::create_dir_all(handlers_dir).await?;
-        
+
         // Create mod.rs
         let mod_content = format!("pub mod {};\n", name);
         fs::write(handlers_dir.join("mod.rs"), mod_content).await?;
@@ -131,27 +131,50 @@ pub struct Update{type_name} {{
     let handler_path = handlers_dir.join(format!("{}.rs", name));
     fs::write(&handler_path, handler_content).await?;
 
-    println!("{} Generated handler: {}", style("✓").green(), handler_path.display());
+    println!(
+        "{} Generated handler: {}",
+        style("✓").green(),
+        handler_path.display()
+    );
     println!();
     println!("Don't forget to register the routes in main.rs:");
-    println!("  {}", style(format!(".mount(handlers::{}::list)", name)).cyan());
-    println!("  {}", style(format!(".mount(handlers::{}::get)", name)).cyan());
-    println!("  {}", style(format!(".mount(handlers::{}::create)", name)).cyan());
-    println!("  {}", style(format!(".mount(handlers::{}::update)", name)).cyan());
-    println!("  {}", style(format!(".mount(handlers::{}::delete)", name)).cyan());
+    println!(
+        "  {}",
+        style(format!(".mount(handlers::{}::list)", name)).cyan()
+    );
+    println!(
+        "  {}",
+        style(format!(".mount(handlers::{}::get)", name)).cyan()
+    );
+    println!(
+        "  {}",
+        style(format!(".mount(handlers::{}::create)", name)).cyan()
+    );
+    println!(
+        "  {}",
+        style(format!(".mount(handlers::{}::update)", name)).cyan()
+    );
+    println!(
+        "  {}",
+        style(format!(".mount(handlers::{}::delete)", name)).cyan()
+    );
 
     Ok(())
 }
 
 async fn generate_model(name: &str) -> Result<()> {
     let models_dir = Path::new("src/models");
-    
+
     // Create models directory if it doesn't exist
     if !models_dir.exists() {
         fs::create_dir_all(models_dir).await?;
-        
+
         // Create mod.rs
-        let mod_content = format!("mod {};\npub use {}::*;\n", name.to_lowercase(), name.to_lowercase());
+        let mod_content = format!(
+            "mod {};\npub use {}::*;\n",
+            name.to_lowercase(),
+            name.to_lowercase()
+        );
         fs::write(models_dir.join("mod.rs"), mod_content).await?;
     } else {
         // Append to existing mod.rs
@@ -160,7 +183,10 @@ async fn generate_model(name: &str) -> Result<()> {
             let mut content = fs::read_to_string(&mod_path).await?;
             let lower_name = name.to_lowercase();
             if !content.contains(&format!("mod {};", lower_name)) {
-                content.push_str(&format!("mod {};\npub use {}::*;\n", lower_name, lower_name));
+                content.push_str(&format!(
+                    "mod {};\npub use {}::*;\n",
+                    lower_name, lower_name
+                ));
                 fs::write(&mod_path, content).await?;
             }
         }
@@ -210,16 +236,23 @@ impl {} {{
     let model_path = models_dir.join(format!("{}.rs", name.to_lowercase()));
     fs::write(&model_path, model_content).await?;
 
-    println!("{} Generated model: {}", style("✓").green(), model_path.display());
+    println!(
+        "{} Generated model: {}",
+        style("✓").green(),
+        model_path.display()
+    );
 
     Ok(())
 }
 
 async fn generate_crud(name: &str) -> Result<()> {
     // Generate both handler and model
     let type_name = to_pascal_case(name);
-    
-    println!("{}", style(format!("Generating CRUD for '{}'...", name)).bold());
+
+    println!(
+        "{}",
+        style(format!("Generating CRUD for '{}'...", name)).bold()
+    );
     println!();
 
     generate_model(&type_name).await?;
@@ -238,16 +271,18 @@ fn capitalize(s: &str) -> String {
 }
 
 fn to_pascal_case(s: &str) -> String {
-    s.split(&['-', '_'][..])
-        .map(capitalize)
-        .collect()
+    s.split(&['-', '_'][..]).map(capitalize).collect()
 }
 
 fn singularize(s: &str) -> String {
-    if s.ends_with("ies") {
-        format!("{}y", &s[..s.len() - 3])
-    } else if s.ends_with('s') && !s.ends_with("ss") {
-        s[..s.len() - 1].to_string()
+    if let Some(stripped) = s.strip_suffix("ies") {
+        format!("{}y", stripped)
+    } else if let Some(stripped) = s.strip_suffix('s') {
+        if !s.ends_with("ss") {
+            stripped.to_string()
+        } else {
+            s.to_string()
+        }
     } else {
         s.to_string()
     }

crates/cargo-rustapi/src/commands/mod.rs

@@ -1,11 +1,11 @@
 //! CLI commands
 
+mod docs;
+mod generate;
 mod new;
 mod run;
-mod generate;
-mod docs;
 
+pub use docs::open_docs;
+pub use generate::{generate, GenerateArgs};
 pub use new::{new_project, NewArgs};
 pub use run::{run_dev, RunArgs};
-pub use generate::{generate, GenerateArgs};
-pub use docs::open_docs;

crates/cargo-rustapi/src/commands/new.rs

@@ -63,7 +63,12 @@ pub async fn new_project(mut args: NewArgs) -> Result<()> {
     } else if args.yes {
         ProjectTemplate::Minimal
     } else {
-        let templates = ["minimal - Bare minimum app", "api - REST API with CRUD", "web - Web app with templates", "full - Full-featured app"];
+        let templates = [
+            "minimal - Bare minimum app",
+            "api - REST API with CRUD",
+            "web - Web app with templates",
+            "full - Full-featured app",
+        ];
         let selection = Select::with_theme(&theme)
             .with_prompt("Select a template")
             .items(&templates)
@@ -98,7 +103,10 @@ pub async fn new_project(mut args: NewArgs) -> Result<()> {
             .defaults(&defaults)
             .interact()?;
 
-        selections.iter().map(|&i| available[i].to_string()).collect()
+        selections
+            .iter()
+            .map(|&i| available[i].to_string())
+            .collect()
     };
 
     // Confirm
@@ -107,7 +115,15 @@ pub async fn new_project(mut args: NewArgs) -> Result<()> {
         println!("{}", style("Project configuration:").bold());
         println!("  Name:     {}", style(&name).cyan());
         println!("  Template: {}", style(format!("{:?}", template)).cyan());
-        println!("  Features: {}", style(if features.is_empty() { "none".to_string() } else { features.join(", ") }).cyan());
+        println!(
+            "  Features: {}",
+            style(if features.is_empty() {
+                "none".to_string()
+            } else {
+                features.join(", ")
+            })
+            .cyan()
+        );
         println!();
 
         if !Confirm::with_theme(&theme)
@@ -144,16 +160,25 @@ pub async fn new_project(mut args: NewArgs) -> Result<()> {
 
     // Success message
     println!();
-    println!("{}", style("✨ Project created successfully!").green().bold());
+    println!(
+        "{}",
+        style("✨ Project created successfully!").green().bold()
+    );
     println!();
     println!("Next steps:");
     println!("  {} {}", style("cd").cyan(), name);
-    println!("  {} {}", style("cargo").cyan(), "run");
+    println!("  {} run", style("cargo").cyan());
     println!();
-    println!("Then open {} in your browser.", style("http://localhost:8080").cyan());
-    
+    println!(
+        "Then open {} in your browser.",
+        style("http://localhost:8080").cyan()
+    );
+
     if features.iter().any(|f| f == "swagger-ui") || template == ProjectTemplate::Full {
-        println!("API docs available at {}", style("http://localhost:8080/docs").cyan());
+        println!(
+            "API docs available at {}",
+            style("http://localhost:8080/docs").cyan()
+        );
     }
 
     Ok(())
@@ -170,8 +195,13 @@ fn validate_project_name(name: &str) -> Result<()> {
     }
 
     // Check for valid Rust crate name characters
-    if !name.chars().all(|c| c.is_alphanumeric() || c == '-' || c == '_') {
-        anyhow::bail!("Project name can only contain alphanumeric characters, hyphens, and underscores");
+    if !name
+        .chars()
+        .all(|c| c.is_alphanumeric() || c == '-' || c == '_')
+    {
+        anyhow::bail!(
+            "Project name can only contain alphanumeric characters, hyphens, and underscores"
+        );
     }
 
     if name.starts_with('-') || name.starts_with('_') {

crates/cargo-rustapi/src/commands/run.rs

@@ -77,14 +77,17 @@ async fn run_with_watch(args: &RunArgs) -> Result<()> {
 
     if check.is_err() || !check.unwrap().status.success() {
         println!("{}", style("cargo-watch not found. Installing...").yellow());
-        
+
         let install = Command::new("cargo")
             .args(["install", "cargo-watch"])
             .status()
             .await?;
 
         if !install.success() {
-            println!("{}", style("Failed to install cargo-watch. Running without watch mode.").yellow());
+            println!(
+                "{}",
+                style("Failed to install cargo-watch. Running without watch mode.").yellow()
+            );
             return run_cargo(args).await;
         }
     }

crates/cargo-rustapi/src/templates/full.rs

@@ -12,7 +12,7 @@ pub async fn generate(name: &str, features: &[String]) -> Result<()> {
         "rate-limit".to_string(),
         "config".to_string(),
     ];
-    
+
     // Add user-specified features
     for f in features {
         if !all_features.contains(f) {
@@ -417,10 +417,7 @@ RUST_LOG=info
     fs::write(format!("{name}/.env.example"), env_example).await?;
 
     // Copy .env.example to .env for development
-    fs::copy(
-        format!("{name}/.env.example"),
-        format!("{name}/.env"),
-    ).await?;
+    fs::copy(format!("{name}/.env.example"), format!("{name}/.env")).await?;
 
     // .gitignore
     common::generate_gitignore(name).await?;

crates/cargo-rustapi/src/templates/mod.rs

@@ -1,9 +1,9 @@
 //! Project templates
 
-mod minimal;
 mod api;
-mod web;
 mod full;
+mod minimal;
+mod web;
 
 use anyhow::Result;
 use clap::ValueEnum;
@@ -91,8 +91,14 @@ RUST_LOG=info
         if features.is_empty() {
             String::new()
         } else {
-            format!(", features = [{}]", 
-                features.iter().map(|f| format!("\"{}\"", f)).collect::<Vec<_>>().join(", "))
+            format!(
+                ", features = [{}]",
+                features
+                    .iter()
+                    .map(|f| format!("\"{}\"", f))
+                    .collect::<Vec<_>>()
+                    .join(", ")
+            )
         }
     }
 }

crates/rustapi-core/src/app.rs

@@ -468,9 +468,7 @@ impl RustApi {
                 let path = req.uri().path().to_string();
 
                 Box::pin(async move {
-                    let relative_path = path
-                        .strip_prefix(&config.prefix)
-                        .unwrap_or(&path);
+                    let relative_path = path.strip_prefix(&config.prefix).unwrap_or(&path);
 
                     match crate::static_files::StaticFile::serve(relative_path, &config).await {
                         Ok(response) => response,