From 99fee6ba76b87b5f168db639ba592bdfb5fed692 Mon Sep 17 00:00:00 2001
From: Joshua Blank <jwblank@calpoly.edu>
Date: Mon, 13 May 2024 10:47:12 -0700
Subject: [PATCH 1/2] Include extra message in output

---
 R/give_candygrams.R | 2 +-
 README.md           | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/R/give_candygrams.R b/R/give_candygrams.R
index 8d71397..67cadcb 100644
--- a/R/give_candygrams.R
+++ b/R/give_candygrams.R
@@ -30,7 +30,7 @@ give_candygrams <- function(person, number,
   number <- str_to_title(as.english(number))
 
 
-  glue::glue("{number} for {person}.")
+  glue::glue("{number} for {person}. {extra_message}")
 
 
 
diff --git a/README.md b/README.md
index 876c029..f06cad8 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,6 @@
 # meangirls
 
 <!-- badges: start -->
-
 <!-- badges: end -->
 
 The goal of meangirls is to create quotes in the style of the 2004
@@ -92,7 +91,7 @@ You can also give extra commentary to your announcement:
 ``` r
 give_candygrams("Taylor Zimmerman", 2, 
                 extra_message = "Merry Christmas!")
-#> Two for Taylor Zimmerman.
+#> Two for Taylor Zimmerman. Merry Christmas!
 ```
 
 Some special cases trigger automatic extra commentary or special
@@ -100,10 +99,10 @@ behavior:
 
 ``` r
 give_candygrams("Glen Coco", 4)
-#> Four for Glen Coco.
+#> Four for Glen Coco. You go, Glen Coco!
 ```
 
 ``` r
 give_candygrams("Gretchen Weiners", 4)
-#> [1] "None for Grethen Weiners."
+#> None for Gretchen Weiners.
 ```

From 88d989f74e10daaf2b6e1b4affd197f3e5df5a8e Mon Sep 17 00:00:00 2001
From: Joshua Blank <jwblank@calpoly.edu>
Date: Mon, 13 May 2024 11:11:07 -0700
Subject: [PATCH 2/2] Fixed unit test failures

---
 R/compliments.R     | 6 ++----
 R/give_candygrams.R | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/R/compliments.R b/R/compliments.R
index e0066f2..df6bd74 100644
--- a/R/compliments.R
+++ b/R/compliments.R
@@ -7,9 +7,9 @@
 #' @return A compliment string
 #'
 #' @export
-really_pretty <- function(name, follow_up = TRUE) {
+really_pretty <- function(name, follow_up = FALSE) {
 
-  compliment <- glue::glue("You're, like, really pretty, {name}.")
+  compliment <- glue::glue("You're, like, really pretty {name}.")
 
   if (follow_up) {
     compliment <- paste(compliment,
@@ -41,5 +41,3 @@ nice_style <- function(object, adjective = "vintage", follow_up = FALSE) {
   return(compliment)
 
 }
-
-
diff --git a/R/give_candygrams.R b/R/give_candygrams.R
index 67cadcb..b9a05d4 100644
--- a/R/give_candygrams.R
+++ b/R/give_candygrams.R
@@ -6,7 +6,7 @@
 #'
 #' @return A candy gram announcement
 #'
-#' @importFrom stringr str_detect str_to_title
+#' @importFrom stringr str_detect str_to_title str_trim
 #' @importFrom english as.english
 #'
 #' @export
@@ -30,7 +30,7 @@ give_candygrams <- function(person, number,
   number <- str_to_title(as.english(number))
 
 
-  glue::glue("{number} for {person}. {extra_message}")
+  stringr::str_trim(glue::glue("{number} for {person}. {extra_message}"))