Using glue_data(.x) instead of glue(.envir) (#1990)

* Using glue_data(.x) instead of glue(.envir) * Update DESCRIPTION * Update NEWS.md
ddsjoberg · Sep 19, 2024 · d9b1952 · d9b1952
1 parent a93e56f
commit d9b1952
Show file tree

Hide file tree

Showing 9 changed files with 148 additions and 147 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -245,3 +245,4 @@ importFrom(dplyr,starts_with)
 importFrom(dplyr,vars)
 importFrom(dplyr,where)
 importFrom(glue,glue)
+importFrom(glue,glue_data)
diff --git a/NEWS.md b/NEWS.md
@@ -1,17 +1,17 @@
 # gtsummary (development version)
 
-* Headers in {gt} tables being exported to PDF do not support the `\n` line breaker. Previously, line breakers were stripped from the header in the `print.gtsummary()` S3 method. But this did not apply to users utilizing `as_gt()` to further customize their tables. As a result, the line breaking strip has been migrated to `as_gt()`. (#1960)
-
-* Removed the `"tbl_summary-arg:statistic"` theme that was incorrectly added to `tbl_continuous()`.
-
 * Made the `oneway.test()` available in `add_p.tbl_continuous()`. (#1970)
 
-* Removed the deprecated `'aov'` test from the `tests.R` file listing available tests. (#1970)
-
 * Added argument `tbl_ard_summary(overall)`. When `TRUE`, the ARD is parsed into primary ARD and the Overall ARD and we run `tbl_ard_summary() |> add_overall()`. (#1940)
 
 * Added `add_stat_label.tbl_ard_summary()` method. (#1969)
 
+* Headers in {gt} tables being exported to PDF do not support the `\n` line breaker. Previously, line breakers were stripped from the header in the `print.gtsummary()` S3 method. But this did not apply to users utilizing `as_gt()` to further customize their tables. As a result, the line breaking strip has been migrated to `as_gt()`. (#1960)
+
+* Removed the `"tbl_summary-arg:statistic"` theme that was incorrectly added to `tbl_continuous()`.
+
+* Removed the deprecated `'aov'` test from the `tests.R` file listing available tests. (#1970)
+
 * Removed documentation for the `add_overall.tbl_ard_summary(digits)` argument, which was never meant to be a part of this function. (#1975)
 
 # gtsummary 2.0.2

diff --git a/R/add_stat_label.R b/R/add_stat_label.R
@@ -155,13 +155,13 @@ add_stat_label.tbl_summary <- function(x, location = c("row", "column"), label =
           dplyr::mutate(
             row_type = "missing",
             stat_label =
-              glue::glue(
-                x$inputs$missing_stat,
-                .envir = list(N_obs = "N",
-                              N_miss = "n",
-                              N_nonmiss = "N - n",
-                              p_miss = "p",
-                              p_nonmiss = "1 - p")
+              glue::glue_data(
+                .x = list(N_obs = "N",
+                          N_miss = "n",
+                          N_nonmiss = "N - n",
+                          p_miss = "p",
+                          p_nonmiss = "1 - p"),
+                x$inputs$missing_stat
               )
           )
       )

diff --git a/R/brdg_summary.R b/R/brdg_summary.R
@@ -239,11 +239,11 @@ pier_summary_categorical <- function(cards,
                       str_statistic_pre_glue,
                       function(str_to_glue) {
                         stat <-
-                          glue::glue(
-                            str_to_glue,
-                            .envir =
+                          glue::glue_data(
+                            .x =
                               cards::get_ard_statistics(df_variable_level_stats, .column = "stat_fmt") |>
-                              c(lst_variable_stats)
+                              c(lst_variable_stats),
+                            str_to_glue
                           ) |>
                           as.character()
                       }
@@ -345,9 +345,9 @@ pier_summary_continuous2 <- function(cards,
               statistic[[.y$variable[1]]],
               function(str_to_glue) {
                 stat <-
-                  glue::glue(
-                    str_to_glue,
-                    .envir = cards::get_ard_statistics(.x, .column = "stat_fmt")
+                  glue::glue_data(
+                    .x = cards::get_ard_statistics(.x, .column = "stat_fmt"),
+                    str_to_glue
                   ) |>
                   as.character()
               }
@@ -358,9 +358,9 @@ pier_summary_continuous2 <- function(cards,
               statistic[[.y$variable[1]]],
               function(str_to_glue) {
                 label <-
-                  glue::glue(
-                    str_to_glue,
-                    .envir = cards::get_ard_statistics(.x, .column = "stat_label")
+                  glue::glue_data(
+                    .x = cards::get_ard_statistics(.x, .column = "stat_label"),
+                    str_to_glue
                   ) |>
                   as.character()
               }
@@ -453,9 +453,9 @@ pier_summary_continuous <- function(cards,
         dplyr::mutate(
           .data = .y,
           stat =
-            glue::glue(
-              statistic[[.data$variable[1]]],
-              .envir = cards::get_ard_statistics(.x, .column = "stat_fmt")
+            glue::glue_data(
+              .x = cards::get_ard_statistics(.x, .column = "stat_fmt"),
+              statistic[[.data$variable[1]]]
             ) |>
             as.character()
         )

diff --git a/R/gtsummary-package.R b/R/gtsummary-package.R
@@ -1,7 +1,7 @@
 #' @keywords internal
 #' @import rlang
 #' @importFrom dplyr across
-#' @importFrom glue glue
+#' @importFrom glue glue glue_data
 "_PACKAGE"
 
 ## usethis namespace: start

diff --git a/R/tbl_uvregression.R b/R/tbl_uvregression.R
@@ -353,10 +353,10 @@ is_quo_empty <- function(x) {
       \(variable) {
         formula_i <-
           cards::eval_capture_conditions(
-            glue(
-              formula,
-              .envir = list(y = ifelse(is_empty(y), cardx::bt(variable), y),
-                            x = ifelse(is_empty(x), cardx::bt(variable), x))
+            glue_data(
+              .x = list(y = ifelse(is_empty(y), cardx::bt(variable), y),
+                            x = ifelse(is_empty(x), cardx::bt(variable), x)),
+              formula
             ) |>
               stats::as.formula()
           )

diff --git a/tests/testthat/_snaps/tbl_continuous.md b/tests/testthat/_snaps/tbl_continuous.md
@@ -90,7 +90,7 @@
       Error in `tbl_continuous()`:
       ! Elements of the `label` argument must be strings.
 
-# tbl_continuous(type,value)
+# tbl_continuous(value)
 
     Code
       df <- as.data.frame(tbl_continuous(trial, variable = age, include = c(trt,
@@ -121,7 +121,7 @@
       4                     II      47 (34, 55)     49 (44, 58)
       5                    III      46 (38, 59)     50 (43, 58)
 
-# tbl_continuous(type,value) messaging
+# tbl_continuous(value) messaging
 
     Code
       tbl_continuous(trial, variable = age, include = c(trt, grade), value = trt ~