From 2a31c81ee7601e4ff74c57e544a235c93edfe070 Mon Sep 17 00:00:00 2001 From: adnanioricce Date: Sat, 28 Dec 2024 12:47:30 -0300 Subject: [PATCH] [minigrep] - Adding library and automated tests --- minigrep/src/lib.rs | 86 ++++++++++++++++++++++++++++++++++++++++++++ minigrep/src/main.rs | 25 ++----------- 2 files changed, 88 insertions(+), 23 deletions(-) create mode 100644 minigrep/src/lib.rs diff --git a/minigrep/src/lib.rs b/minigrep/src/lib.rs new file mode 100644 index 0000000..82a03ae --- /dev/null +++ b/minigrep/src/lib.rs @@ -0,0 +1,86 @@ +use std::env; +use std::error::Error; +use std::fs; +pub struct Config { + pub query: String, + pub file_path: String, + pub ignore_case: bool, +} +impl Config { + pub fn build(args: &[String]) -> Result { + if args.len() < 3 { + return Err("not enough arguments"); + } + let query = args[1].clone(); + let file_path = args[2].clone(); + let ignore_case = env::var("IGNORE_CASE").is_ok(); + Ok(Config { + query, + file_path, + ignore_case, + }) + } +} +pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> { + let mut results = Vec::new(); + for line in contents.lines() { + if line.contains(query) { + results.push(line); + } + } + results +} +pub fn search_case_insensitive<'a>(query: &str, contents: &'a str) -> Vec<&'a str> { + let query = query.to_lowercase(); + let mut results = Vec::new(); + for line in contents.lines() { + if line.to_lowercase().contains(&query) { + results.push(line); + } + } + results +} +pub fn run(config: Config) -> Result<(), Box> { + let contents = fs::read_to_string(config.file_path)?; + let results = if config.ignore_case { + search_case_insensitive(&config.query, &contents) + } else { + search(&config.query, &contents) + }; + + for line in results { + println!("{line}"); + } + + Ok(()) +} + +#[cfg(test)] +mod tests { + use super::*; + #[test] + fn case_sensitive() { + let query = "duct"; + let contents = "\ +Rust: +safe, fast, productive. +Pick three. +Duct tape."; + assert_eq!(vec!["safe, fast, productive."], search(query, contents)); + } + + #[test] + fn case_insensitive() { + let query = "rUsT"; + let contents = "\ +Rust: +safe, fast, productive. +Pick three. +Trust me."; + + assert_eq!( + vec!["Rust:", "Trust me."], + search_case_insensitive(query, contents) + ); + } +} diff --git a/minigrep/src/main.rs b/minigrep/src/main.rs index 8e6d553..644c07b 100644 --- a/minigrep/src/main.rs +++ b/minigrep/src/main.rs @@ -1,26 +1,5 @@ +use minigrep::Config; use std::env; -use std::error::Error; -use std::fs; -struct Config { - query: String, - file_path: String, -} -impl Config { - fn build(args: &[String]) -> Result { - if args.len() < 3 { - return Err("not enough arguments"); - } - let query = args[1].clone(); - let file_path = args[2].clone(); - Ok(Config { query, file_path }) - } -} -fn run(config: Config) -> Result<(), Box> { - let contents = fs::read_to_string(config.file_path)?; - println!("With text:\n {contents}"); - - Ok(()) -} fn main() { let args: Vec = env::args().collect(); let config = Config::build(&args).unwrap_or_else(|err| { @@ -31,7 +10,7 @@ fn main() { println!("Searching for {}", config.query); println!("In file {}", config.file_path); - if let Err(e) = run(config) { + if let Err(e) = minigrep::run(config) { println!("Application error: {e}"); std::process::exit(1); }