Merge pull request #555 from yjunechoe/safer-glue

Safer glue interpolation of non standard column names
rstudio · Aug 6, 2024 · f9fc1f3 · f9fc1f3
2 parents 9c00e40 + 2dee3fb
commit f9fc1f3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/R/info_add.R b/R/info_add.R
@@ -1365,9 +1365,9 @@ snip_list <- function(
       stats::as.formula(
         as.character(
           glue::glue(
-            "~ . %>% dplyr::select(<<column>>) %>%",
+            "~ . %>% dplyr::select(`<<column>>`) %>%",
             "dplyr::distinct() %>%",
-            "dplyr::pull(<<column>>) %>%",
+            "dplyr::pull(`<<column>>`) %>%",
             ifelse(reverse, "rev() %>%", ""),
             "pb_str_catalog(
             limit = <<limit[1]>>,
@@ -1389,16 +1389,16 @@ snip_list <- function(
       stats::as.formula(
         as.character(
           glue::glue(
-            "~ . %>% dplyr::select(<<column>>) %>%",
-            "dplyr::group_by(<<column>>) %>%",
+            "~ . %>% dplyr::select(`<<column>>`) %>%",
+            "dplyr::group_by(`<<column>>`) %>%",
             "dplyr::summarize(`_count_` = dplyr::n(), .groups = 'keep') %>%",
             ifelse(
               reverse,
               "dplyr::arrange(`_count_`) %>%",
               "dplyr::arrange(dplyr::desc(`_count_`)) %>%"
             ),
-            "dplyr::select(<<column>>) %>%",
-            "dplyr::pull(<<column>>) %>%",
+            "dplyr::select(`<<column>>`) %>%",
+            "dplyr::pull(`<<column>>`) %>%",
             "pb_str_catalog(
             limit = <<limit[1]>>,
             sep = <<sep>>,
@@ -1420,9 +1420,9 @@ snip_list <- function(
       stats::as.formula(
         as.character(
           glue::glue(
-            "~ . %>% dplyr::select(<<column>>) %>%",
+            "~ . %>% dplyr::select(`<<column>>`) %>%",
             "dplyr::distinct() %>%",
-            "dplyr::pull(<<column>>) %>%",
+            "dplyr::pull(`<<column>>`) %>%",
             ifelse(
               reverse,
               "sort(decreasing = TRUE) %>%",
@@ -1533,7 +1533,7 @@ snip_stats <- function(
     as.character(
       glue::glue(
         "~ . %>%
-    dplyr::select(<<column>>) %>%
+    dplyr::select(`<<column>>`) %>%
     pb_str_summary(type = '<<type>>')",
     .open = "<<", .close = ">>"
       )
@@ -1607,8 +1607,8 @@ snip_lowest <- function(column) {
     as.character(
       glue::glue(
         "~ . %>%
-    dplyr::select(<<column>>) %>% dplyr::distinct() %>%
-    dplyr::summarize(`pb_summary` = min(<<column>>, na.rm = TRUE)) %>%
+    dplyr::select(`<<column>>`) %>% dplyr::distinct() %>%
+    dplyr::summarize(`pb_summary` = min(`<<column>>`, na.rm = TRUE)) %>%
     dplyr::pull(`pb_summary`) %>% as.character()",
     .open = "<<", .close = ">>"
       )
@@ -1681,8 +1681,8 @@ snip_highest <- function(column) {
     as.character(
       glue::glue(
         "~ . %>%
-    dplyr::select(<<column>>) %>% dplyr::distinct() %>%
-    dplyr::summarize(`pb_summary` = max(<<column>>, na.rm = TRUE)) %>%
+    dplyr::select(`<<column>>`) %>% dplyr::distinct() %>%
+    dplyr::summarize(`pb_summary` = max(`<<column>>`, na.rm = TRUE)) %>%
     dplyr::pull(`pb_summary`) %>% as.character()",
     .open = "<<", .close = ">>"
       )

diff --git a/R/steps_and_briefs.R b/R/steps_and_briefs.R
@@ -187,9 +187,10 @@ apply_segments_to_tbl <- function(agent, idx, tbl) {
   }
 
   # Generate a second set of 'preconditions' to filter the table
+  seg_val <- gsub("'", "\\\\'", seg_val)
   preconditions <- 
     stats::as.formula(
-      glue::glue("~ . %>% dplyr::filter({seg_col} == '{seg_val}')")
+      glue::glue("~ . %>% dplyr::filter(`{seg_col}` == '{seg_val}')")
     )
 
   tbl <- apply_preconditions(tbl = tbl, preconditions = preconditions)