Be ready for tidyr v1.0.0

Main objective: get rid of the call to `tidyr::nest_()`. Secondary objective: write code that also works with CRAN tidyr.
dgrtwo · Aug 4, 2019 · a39fc46 · a39fc46
1 parent 7c4ad72
commit a39fc46
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -19,7 +19,7 @@ Depends: R (>= 2.10)
 Imports:
     stringdist,
     stringr,
-    dplyr,
+    dplyr (>= 0.7.5),
     tidyr (>= 0.4.0),
     purrr,
     geosphere

diff --git a/R/genome_join.R b/R/genome_join.R
@@ -61,8 +61,8 @@ genome_join <- function(x, y, by = NULL, mode = "inner", ...) {
     # nest around the chromosome column
     x$..index <- seq_len(nrow(x))
     y$..index <- seq_len(nrow(y))
-    nested_x <- tidyr::nest_(x, "x_data", colnames(x)[-1])
-    nested_y <- tidyr::nest_(y, "y_data", colnames(y)[-1])
+    nested_x <- tidyr::nest(dplyr::group_by_at(x, .vars = 1))
+    nested_y <- tidyr::nest(dplyr::group_by_at(y, .vars = 1))
     by <- c(colnames(nested_y)[1])
     names(by) <- colnames(nested_x)[1]
 
@@ -76,7 +76,7 @@ genome_join <- function(x, y, by = NULL, mode = "inner", ...) {
       data.frame(x = xd$..index[o$queryHits], y = yd$..index[o$subjectHits])
     }
 
-   ret <- purrr::map2_df(joined$x_data, joined$y_data, find_overlaps)
+   ret <- purrr::map2_df(joined$data.x, joined$data.y, find_overlaps)
    ret
   }