introduced BubbleConfig & config_from_string; refactored accordingly

this is in preparation for
- introducing configuring the bubble
- fixing right bubble alignment

src/bubbles.rs

@@ -1,10 +1,131 @@
 use voca_rs::*;
 
-pub fn bubble_from_text(text: &str, bubble_anchor: usize, max_length: usize) -> String {
+// carry's information about the anchor point for a bubble, what column to wrap words at, and what the bubbles border looks like
-    bubble_from_lines(wrap_block(text, max_length), bubble_anchor)
+pub struct BubbleConfig {
+    anchor: usize,
+    wrap: usize,
+
+    top: String,
+    left: String,
+    right: String,
+    bottom: String,
+    top_left: String,
+    top_right: String,
+    bottom_left: String,
+    bottom_right: String,
+    middle_left: String,
+    middle_right: String,
 }
 
-fn bubble_from_lines(lines: Vec<String>, min_length: usize) -> String {
+impl BubbleConfig {
+    // assembles a config from critical information, attempting to use sensible defaults where possible
+    pub fn config_from_string(anchor: usize, wrap: usize, border: Option<String>) -> BubbleConfig {
+        if let Some(border) = border {
+            let chars = split::graphemes(&border);
+            let top = if let Some(item) = chars.get(0) {
+                item.to_string()
+            } else {
+                // Some("") results in the default like None
+                return BubbleConfig {
+                    anchor,
+                    wrap,
+
+                    top: "_".to_string(),
+                    left: "<".to_string(),
+                    right: ">".to_string(),
+                    bottom: "-".to_string(),
+                    top_left: "/".to_string(),
+                    top_right: "\\".to_string(),
+                    bottom_left: "\\".to_string(),
+                    bottom_right: "/".to_string(),
+                    middle_left: "|".to_string(),
+                    middle_right: "|".to_string(),
+                };
+            };
+            let left = if let Some(item) = chars.get(1) {
+                item.to_string()
+            } else {
+                top.clone()
+            };
+            let right = if let Some(item) = chars.get(2) {
+                item.to_string()
+            } else {
+                left.clone()
+            };
+            let bottom = if let Some(item) = chars.get(3) {
+                item.to_string()
+            } else {
+                top.clone()
+            };
+            let top_left = if let Some(item) = chars.get(4) {
+                item.to_string()
+            } else {
+                left.clone()
+            };
+            let top_right = if let Some(item) = chars.get(5) {
+                item.to_string()
+            } else {
+                right.clone()
+            };
+            let bottom_left = if let Some(item) = chars.get(6) {
+                item.to_string()
+            } else {
+                left.clone()
+            };
+            let bottom_right = if let Some(item) = chars.get(7) {
+                item.to_string()
+            } else {
+                right.clone()
+            };
+            let middle_left = if let Some(item) = chars.get(8) {
+                item.to_string()
+            } else {
+                left.clone()
+            };
+            let middle_right = if let Some(item) = chars.get(9) {
+                item.to_string()
+            } else {
+                right.clone()
+            };
+            BubbleConfig {
+                anchor,
+                wrap,
+
+                top,
+                left,
+                right,
+                bottom,
+                top_left,
+                top_right,
+                bottom_left,
+                bottom_right,
+                middle_left,
+                middle_right,
+            }
+        } else {
+            BubbleConfig {
+                anchor,
+                wrap,
+
+                top: "_".to_string(),
+                left: "<".to_string(),
+                right: ">".to_string(),
+                bottom: "-".to_string(),
+                top_left: "/".to_string(),
+                top_right: "\\".to_string(),
+                bottom_left: "\\".to_string(),
+                bottom_right: "/".to_string(),
+                middle_left: "|".to_string(),
+                middle_right: "|".to_string(),
+            }
+        }
+    }
+
+    pub fn text(&self, text: &str) -> String {
+        self.bubble_from_lines(wrap_block(text, self.wrap))
+    }
+
+    fn bubble_from_lines(&self, lines: Vec<String>) -> String {
         let longest_length: usize;
         let lengths: Vec<(&String, usize)> = lines
             .iter()
@@ -17,8 +138,8 @@ fn bubble_from_lines(lines: Vec<String>, min_length: usize) -> String {
 
         // let line_length = cmp::max(longest_length, min_length);
         let line_length = longest_length;
-    let left_pad_length = if longest_length < min_length {
+        let left_pad_length = if longest_length < self.anchor {
-        min_length + (longest_length / 2) + 2
+            self.anchor + (longest_length / 2) + 2
         } else {
             0
         };
@@ -68,6 +189,7 @@ fn bubble_from_lines(lines: Vec<String>, min_length: usize) -> String {
             }
         }
     }
+}
 
 fn wrap_once(text: &str, max_length: usize) -> (String, Option<String>) {
     let whitespace_not_newline = |c: char| c.is_whitespace() && c != '\n';

src/main.rs

@@ -10,7 +10,9 @@ mod bubbles;
 mod critters;
 mod kule;
 
+use bubbles::*;
 use clap::Parser;
+use critters::*;
 use kule::Formats;
 use kule::FourBit;
 use std::io;
@@ -19,7 +21,7 @@ use voca_rs::*;
 fn main() {
     let cli = Args::parse();
     let mut text = String::new();
-    let config = cli.config_from_arguments();
+    let (critter_config, bubble_config) = cli.configs_from_arguments();
 
     if !cli.text.is_empty() {
         text = cli.text.join(" ")
@@ -28,7 +30,7 @@ fn main() {
             .read_to_string(&mut text)
             .expect("failed to read input");
     }
-    output(&text, config);
+    output(&text, critter_config, bubble_config);
 }
 
 #[derive(Parser, Debug)]
@@ -88,7 +90,7 @@ struct Args {
 }
 
 impl Args {
-    fn config_from_arguments(&self) -> critters::CritterConfig {
+    fn configs_from_arguments(&self) -> (CritterConfig, BubbleConfig) {
         let mut eyes = self.lukin.clone();
         let mut tongue = self.uta.clone();
         let mut line = self.palisa.clone();
@@ -182,23 +184,21 @@ impl Args {
                 _ => String::new(),
             })
         }
-        critters::CritterConfig::config_from_string(
+        let critter_config =
-            &eyes,
+            CritterConfig::config_from_string(&eyes, &tongue, &line, &object, &Some(format), &name);
-            &tongue,
+        let bubble_config = BubbleConfig::config_from_string(
-            &line,
+            critter_config.template.anchor,
-            &object,
+            DEFAULT_MAXIMUM_LINE_LENGTH,
-            &Some(format),
+            None,
-            &name,
+        );
-        )
+
+        (critter_config, bubble_config)
     }
 }
 
-fn output(text: &str, config: critters::CritterConfig) -> () {
+fn output(text: &str, critter_config: CritterConfig, bubble_config: BubbleConfig) -> () {
-    print!(
+    print!("{}", bubble_config.text(text));
-        "{}",
+    println!("{}", critter_config.format_critter())
-        bubbles::bubble_from_text(text, config.template.anchor, DEFAULT_MAXIMUM_LINE_LENGTH)
-    );
-    println!("{}", config.format_critter())
 }
 
 const DEFAULT_MAXIMUM_LINE_LENGTH: usize = 40;