From 6522b25cf026e5e72bdba941c36831bdced70c23 Mon Sep 17 00:00:00 2001 From: David Purdum Date: Fri, 8 Oct 2021 08:07:20 -0400 Subject: [PATCH] Remove words.rs --- src/lib.rs | 62 +++++++++++++++++++++++++++++++++++++++++++++------- src/words.rs | 39 --------------------------------- 2 files changed, 54 insertions(+), 47 deletions(-) delete mode 100644 src/words.rs diff --git a/src/lib.rs b/src/lib.rs index f824c32..df9f0f5 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -108,14 +108,12 @@ //! construction in the [Case enum](enum.Case.html). mod case; -mod words; mod pattern; mod boundary; pub use boundary::Boundary; pub use pattern::Pattern; pub use case::Case; -use words::Words; fn possible_cases(s: &String) -> Vec { Case::deterministic_cases() @@ -134,7 +132,7 @@ pub trait Casing { /// Creates a `Converter` struct, which saves information about /// how to parse `self` before converting to a case. - fn from_case(&self, case: Case) -> Converter; + fn from_case(&self, case: Case) -> StateConverter; /// Determines if `self` is of the given case. fn is_case(&self, case: Case) -> bool; @@ -159,11 +157,11 @@ pub trait Casing { impl Casing for T where T: ToString { fn to_case(&self, case: Case) -> String { - Converter::new(self.to_string()).to_case(case) + StateConverter::new(self.to_string()).to_case(case) } - fn from_case(&self, case: Case) -> Converter { - Converter::new_from_case(self.to_string(), case) + fn from_case(&self, case: Case) -> StateConverter { + StateConverter::new_from_case(self.to_string(), case) } fn is_case(&self, case: Case) -> bool { @@ -181,14 +179,17 @@ impl Casing for T where T: ToString { /// let title = "ninety-nine_problems".from_case(Case::Snake).to_case(Case::Title); /// assert_eq!("Ninety-nine Problems", title); /// ``` -pub struct Converter { +pub struct StateConverter { s: String, boundaries: Vec, pattern: Option, delim: String, + // delete the 3 above + + // conv: Converter } -impl Converter { +impl StateConverter { fn new(s: String) -> Self { use Boundary::*; let default_boundaries = vec![ @@ -235,6 +236,51 @@ impl Converter { } +/// Do something like this +pub struct Converter { + boundaries: Vec, + pattern: Option, + delim: String, +} + +impl Converter { + fn convert(&self, s: &String) -> String { + // convert the string! + String::new() + } + + fn add_boundary(&mut self, b: &Boundary) -> &mut Self { + self.boundaries.push(*b); + self + } + + fn add_boundaries(&mut self, bs: &Vec) -> &mut Self { + self.boundaries.extend(bs); + self + } + + fn set_delim(&mut self, d: String) -> &mut Self { + self.delim = d; + self + } + + fn remove_delim(&mut self) -> &mut Self { + self.delim = String::new(); + self + } + + fn set_pattern(&mut self, p: Pattern) -> &mut Self { + self.pattern = Some(p); + self + } + + fn remove_pattern(&mut self) -> &mut Self { + self.pattern = None; + self + } +} + + #[cfg(test)] mod test { use super::*; diff --git a/src/words.rs b/src/words.rs deleted file mode 100644 index 13d453f..0000000 --- a/src/words.rs +++ /dev/null @@ -1,39 +0,0 @@ -use crate::Case; -use crate::boundary; - -#[cfg(feature = "random")] -use rand::prelude::*; - -pub(super) struct Words { - words: Vec, -} - -impl Words { - pub fn new(name: &str) -> Self { - use boundary::Boundary::*; - let default_boundaries = vec![ - Underscore, Hyphen, Space, - LowerUpper, UpperDigit, DigitUpper, - DigitLower, LowerDigit, Acronyms, - ]; - - let words = boundary::split(name, &default_boundaries); - - Self { words } - } - - pub fn from_casing(name: &str, case: Case) -> Self { - let bs = case.boundaries(); - - let words = boundary::split(name, &bs); - - Self { words } - } - - pub fn into_case(self, case: Case) -> String { - let words = self.words; - let pattern = case.pattern(); - let delim = case.delim(); - pattern.mutate(&words).join(delim) - } -}