works for both character and tidyselect

Author: dsweber2

R/slide.R

@@ -495,7 +495,11 @@ epi_slide_opt <- function(x, col_names, f, ..., before = NULL, after = NULL, ref
   # positions of user-provided `col_names` into string column names. We avoid
   # using `names(pos)` directly for robustness and in case we later want to
   # allow users to rename fields via tidyselection.
-  pos <- eval_select(all_of(col_names), data = x, allow_rename = FALSE)
+  if (typeof(quo_get_expr(enquo(col_names))) == "character") {
+    pos <- eval_select(all_of(col_names), data = x, allow_rename = FALSE)
+  } else {
+    pos <- eval_select(enquo(col_names), data = x, allow_rename = FALSE)
+  }
   col_names_chr <- names(x)[pos]
   # Always rename results to "slide_value_<original column name>".
   result_col_names <- paste0("slide_value_", col_names_chr)

man-roxygen/opt-slide-params.R

@@ -1,9 +1,10 @@
 #' @param col_names <[`tidy-select`][dplyr_tidy_select]> An unquoted column
-#'  name(e.g., `cases`), multiple column names (e.g., `c(cases, deaths)`), or
-#'  [other tidy-select expression][tidyselect::language]. Variable names can
-#'  be used as if they were positions in the data frame, so expressions like
-#'  `x:y` can be used to select a range of variables. If you have the desired
-#'  column names stored in a vector `vars`, use `col_names = all_of(vars)`.
+#'   name(e.g., `cases`), multiple column names (e.g., `c(cases, deaths)`),
+#'   [other tidy-select expression][tidyselect::language], or a vector of
+#'   characters (e.g. `c("cases", "deaths")`). Variable names can be used as if
+#'   they were positions in the data frame, so expressions like `x:y` can be
+#'   used to select a range of variables. If you have the desired column names
+#'   stored in a vector `vars`, use `col_names = all_of(vars)`.
 #'
 #'   The tidy-selection renaming interface is not supported, and cannot be used
 #'   to provide output column names; if you want to customize the output column

man/epi_slide_mean.Rd

@@ -1283,5 +1283,10 @@ multi_columns <- dplyr::bind_rows(
   group_by(geo_value)
 
 test_that("no dplyr warnings from selecting multiple columns", {
-  expect_no_warning(epi_slide_mean(multi_columns, col_names = c("value", "value2"), before = 3L))
+  expect_no_warning(multi_slid <- epi_slide_mean(multi_columns, col_names = c("value", "value2"), before = 3L))
+  expect_equal(names(multi_slid), c("geo_value", "time_value", "value", "value2", "slide_value_value", "slide_value_value2"))
+  expect_no_warning(multi_slid_select <- epi_slide_mean(multi_columns, c(value, value2), before = 3L))
+  expect_equal(multi_slid_select, multi_slid)
+  expect_no_warning(multi_slid_select <- epi_slide_mean(multi_columns, starts_with("value"), before = 3L))
+  expect_equal(multi_slid_select, multi_slid)
 })

man/epi_slide_opt.Rd

@@ -1,4 +1,4 @@
-library(dplyr)
+suppressPackageStartupMessages(library(dplyr))
 
 test_date <- as.Date("2020-01-01")
 

man/epi_slide_sum.Rd

@@ -1,6 +1,6 @@
 test_that("Grouping, regrouping, and ungrouping archives works as intended", {
   # From an example:
-  library(dplyr)
+  suppressPackageStartupMessages(library(dplyr))
   toy_archive <-
     tribble(
       ~geo_value, ~age_group, ~time_value, ~version, ~value,