Rename drop_na into remove_na in data_match()

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: datawizard
 Title: Easy Data Wrangling and Statistical Transformations
-Version: 0.13.0.2
+Version: 0.13.0.5
 Authors@R: c(
     person("Indrajeet", "Patil", , "[email protected]", role = "aut",
            comment = c(ORCID = "0000-0003-1995-6531")),

NEWS.md

@@ -1,5 +1,10 @@
 # datawizard (development)
 
+BREAKING CHANGES
+
+* Argument `drop_na` in `data_match()` is deprecated now. Please use `remove_na`
+  instead.
+
 CHANGES
 
 * The `select` argument, which is available in different functions to select

R/data_group.R

@@ -51,7 +51,7 @@ data_group <- function(data,
       to = my_grid[i, , drop = FALSE],
       match = "and",
       return_indices = TRUE,
-      drop_na = FALSE
+      remove_na = FALSE
     ))
   })
   my_grid[[".rows"]] <- .rows

R/data_match.R

@@ -15,7 +15,7 @@
 #' @param return_indices Logical, if `FALSE`, return the vector of rows that
 #'   can be used to filter the original data frame. If `FALSE` (default),
 #'   returns directly the filtered data frame instead of the row indices.
-#' @param drop_na Logical, if `TRUE`, missing values (`NA`s) are removed before
+#' @param remove_na Logical, if `TRUE`, missing values (`NA`s) are removed before
 #'   filtering the data. This is the default behaviour, however, sometimes when
 #'   row indices are requested (i.e. `return_indices=TRUE`), it might be useful
 #'   to preserve `NA` values, so returned row indices match the row indices of
@@ -26,6 +26,7 @@
 #'   character vector (e.g. `c("x > 4", "y == 2")`) or a variable that contains
 #'   the string representation of a logical expression. These might be useful
 #'   when used in packages to avoid defining undefined global variables.
+#' @param drop_na Deprecated, please use `remove_na` instead.
 #'
 #' @return A filtered data frame, or the row indices that match the specified
 #' configuration.
@@ -100,12 +101,24 @@
 #' data_filter(mtcars, fl)
 #' @inherit data_rename seealso
 #' @export
-data_match <- function(x, to, match = "and", return_indices = FALSE, drop_na = TRUE, ...) {
+data_match <- function(x,
+                       to,
+                       match = "and",
+                       return_indices = FALSE,
+                       remove_na = TRUE,
+                       drop_na,
+                       ...) {
   if (!is.data.frame(to)) {
     to <- as.data.frame(to)
   }
   original_x <- x
 
+  ## TODO: remove deprecated argument later
+  if (!missing(drop_na)) {
+    insight::format_warning("Argument `drop_na` is deprecated. Please use `remove_na` instead.")
+    remove_na <- drop_na
+  }
+
   # evaluate
   match <- match.arg(tolower(match), c("and", "&", "&&", "or", "|", "||", "!", "not"))
   match <- switch(match,
@@ -133,7 +146,7 @@
     idx <- vector("numeric", length = 0L)
   } else {
     # remove missings before matching
-    if (isTRUE(drop_na)) {
+    if (isTRUE(remove_na)) {
       x <- x[stats::complete.cases(x), , drop = FALSE]
     }
     idx <- seq_len(nrow(x))

tests/testthat/test-data_match.R

@@ -23,7 +23,7 @@
     match = "or",
     return_indices = TRUE
   ))
   x2 <- nrow(poorman::filter(efc, c172code == 1 | e16sex == 2))
   expect_identical(x1, x2)
 
   # "AND" works
@@ -33,7 +33,7 @@
     match = "and",
     return_indices = TRUE
   ))
   x2 <- nrow(poorman::filter(efc, c172code == 1, e16sex == 2))
   expect_identical(x1, x2)
 
   # "NOT" works
@@ -43,7 +43,7 @@
     match = "not",
     return_indices = TRUE
   ))
   x2 <- nrow(poorman::filter(efc, c172code != 1, e16sex != 2))
   expect_identical(x1, x2)
 
   # remove NA
@@ -52,15 +52,15 @@
     data.frame(c172code = 1, e16sex = 2),
     match = "not",
     return_indices = TRUE,
-    drop_na = FALSE
+    remove_na = FALSE
   ))
   expect_identical(x1, 41L)
   x1 <- length(data_match(
     efc,
     data.frame(c172code = 1, e16sex = 2),
     match = "not",
     return_indices = TRUE,
-    drop_na = TRUE
+    remove_na = TRUE
   ))
   expect_identical(x1, 36L)
 })
@@ -231,7 +231,7 @@
   )
 
   foo3 <- function(data) {
     var <- "mpg >= 30"
     data_filter(data, var)
   }
   expect_identical(