(v1.6.0.9020) fix for skimr in dplyr 1.0.6

R/disk.R

@@ -202,7 +202,7 @@ get_skimmers.disk <- function(column) {
     min = ~min(as.double(.), na.rm = TRUE),
     max = ~max(as.double(.), na.rm = TRUE),
     median = ~stats::median(as.double(.), na.rm = TRUE),
-    n_unique = ~pm_n_distinct(., na.rm = TRUE),
+    n_unique = ~length(unique(stats::na.omit(.))),
     hist = ~skimr::inline_hist(stats::na.omit(as.double(.)))
   )
 }

R/mic.R

@@ -348,7 +348,7 @@ get_skimmers.mic <- function(column) {
     min = ~min(., na.rm = TRUE),
     max = ~max(., na.rm = TRUE),
     median = ~stats::median(., na.rm = TRUE),
-    n_unique = ~pm_n_distinct(., na.rm = TRUE),
+    n_unique = ~length(unique(stats::na.omit(.))),
     hist_log2 = ~skimr::inline_hist(log2(stats::na.omit(.)))
   )
 }

R/mo.R

@@ -1732,9 +1732,9 @@ freq.mo <- function(x, ...) {
 get_skimmers.mo <- function(column) {
   skimr::sfl(
     skim_type = "mo",
-    unique_total = ~pm_n_distinct(., na.rm = TRUE),
-    gram_negative = ~sum(mo_is_gram_negative(stats::na.omit(.))),
-    gram_positive = ~sum(mo_is_gram_positive(stats::na.omit(.))),
+    unique_total = ~length(unique(stats::na.omit(.))),
+    gram_negative = ~sum(mo_is_gram_negative(.), na.rm = TRUE),
+    gram_positive = ~sum(mo_is_gram_positive(.), na.rm = TRUE),
     top_genus = ~names(sort(-table(mo_genus(stats::na.omit(.), language = NULL))))[1L],
     top_species = ~names(sort(-table(mo_name(stats::na.omit(.), language = NULL))))[1L]
   )

R/rsi.R

@@ -934,28 +934,16 @@ get_skimmers.rsi <- function(column) {
   # get the variable name 'skim_variable'
   name_call <- function(.data) {
     calls <- sys.calls()
+    frms <- sys.frames()
     calls_txt <- vapply(calls, function(x) paste(deparse(x), collapse = ""), FUN.VALUE = character(1))
     if (any(calls_txt %like% "skim_variable", na.rm = TRUE)) {
       ind <- which(calls_txt %like% "skim_variable")[1L]
-      vars <- tryCatch(eval(parse(text = ".data$skim_variable"), envir = sys.frame(ind)), 
+      vars <- tryCatch(eval(parse(text = ".data$skim_variable$rsi"), envir = frms[[ind]]), 
                        error = function(e) NULL)
+      tryCatch(ab_name(as.character(calls[[length(calls)]][[2]]), language = NULL),
+               error = function(e) NA_character_)
     } else {
-      vars <- NULL
-    }
-    i <- tryCatch(attributes(calls[[length(calls)]])$position, 
-                  error = function(e) NULL)
-    if (is.null(vars) | is.null(i)) {
       NA_character_
-    } else {
-      lengths <- vapply(FUN.VALUE = double(1), vars, length)
-      when_starts_rsi <- which(names(vapply(FUN.VALUE = double(1), vars, length)) == "rsi")
-      offset <- sum(lengths[c(1:when_starts_rsi - 1)])
-      var <- vars$rsi[i - offset]
-      if (!isFALSE(var == "data")) {
-        NA_character_
-      } else{
-        ab_name(var)
-      }
     }
   }