Merge branch 'main' into 240_ard_event_rates@main

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: cardx
 Title: Extra Analysis Results Data Utilities
-Version: 0.2.2.9009
+Version: 0.2.2.9010
 Authors@R: c(
     person("Daniel D.", "Sjoberg", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0003-0862-2018")),

NEWS.md

@@ -1,4 +1,4 @@
-# cardx 0.2.2.9009
+# cardx 0.2.2.9010
 
 * Update in `ard_categorical.survey.design()` for factor variables that are all missing. These variables can now be tabulated, where previously this resulted in an error. 
 

R/ard_categorical_ci.R

@@ -311,7 +311,7 @@ ard_categorical_ci.data.frame <- function(data,
   }
 
 
-  df_grouping_cols <- cards::nest_for_ard(data, by = all_of(by), include_data = FALSE)
+  df_grouping_cols <- cards::nest_for_ard(data, by = by, include_data = FALSE)
   levels <- .levels_for_row(data = data, by = by)
 
   cards::nest_for_ard(
@@ -360,7 +360,7 @@ ard_categorical_ci.data.frame <- function(data,
                                            conf.level, strata, weights, max.iterations) {
   # create the base of what the grouping and variable ARD will look like
   df_groups_variable <-
-    cards::nest_for_ard(data, by = all_of(c(by, variable)), include_data = FALSE) |>
+    cards::nest_for_ard(data, by = c(by, variable), include_data = FALSE) |>
     dplyr::rename(
       variable = glue::glue("group{length(c(variable, by))}"),
       variable_level = glue::glue("group{length(c(variable, by))}_level")

R/ard_survival_survfit.R

@@ -50,7 +50,8 @@
 #' lung |>
 #'   ard_survival_survfit(y = Surv(time, status), variables = "sex", time = 500)
 #' ```
-#' You **cannot**, however, pass a stored formula, e.g. `survfit(my_formula, lung)`
+#' You **cannot**, however, pass a stored formula, e.g. `survfit(my_formula, lung)`,
+#' but you can use stored formulas with `rlang::inject(survfit(!!my_formula, lung))`.
 #'
 #' @section Variable Classes:
 #' When the `survfit` method is called, the class of the stratifying variables
@@ -117,7 +118,7 @@ ard_survival_survfit.survfit <- function(x, times = NULL, probs = NULL, type = N
     cli::cli_abort(
       message = paste(
         "The call in the survfit object {.arg x} must be an evaluated formula.",
-        "Please see the function documentation for details on properly specifying formulas."
+        "Please see {.help [{.fun ard_survival_survfit}](cardx::ard_survival_survfit)} documentation for details on properly specifying formulas."
       ),
       call = get_cli_abort_call()
     )
@@ -328,7 +329,7 @@ ard_survival_survfit.data.frame <- function(x, y, variables,
 extract_multi_strata <- function(x, df_stat) {
   x_terms <- attr(stats::terms(stats::as.formula(x$call$formula)), "term.labels")
   x_terms <- gsub(".*\\(", "", gsub("\\)", "", x_terms))
-  if (length(x_terms) > 1) {
+  if (length(x_terms) > 0L) {
     strata_lvls <- data.frame()
 
     for (i in df_stat[["strata"]]) {

tests/testthat.R

@@ -1,2 +1,2 @@
 library(testthat)
-test_check("cardx")
+test_check("cardx", stop_on_warning = TRUE)

tests/testthat/_snaps/ard_survival_survfit.md

@@ -280,7 +280,7 @@
       ard_survival_survfit(x, times = 25)
     Condition
       Error in `ard_survival_survfit()`:
-      ! The call in the survfit object `x` must be an evaluated formula. Please see the function documentation for details on properly specifying formulas.
+      ! The call in the survfit object `x` must be an evaluated formula. Please see `ard_survival_survfit()` (`?cardx::ard_survival_survfit()`) documentation for details on properly specifying formulas.
 
 ---