Fix compatibility with dplyr 1.0.0 (#140)

* Use group_by() before group_indices()

* Ensure the result of summairse() returns only one row per group

* Explicitly sort the columns of data.frame

* Use expect_equivalent()

Author: yutannihilation

R/gghighlight.R

@@ -296,10 +296,11 @@ calculate_group_info <- function(data, mapping, extra_vars = NULL) {
   }
 
   # calculate group IDs with extra_data
-  group_ids <- dplyr::group_indices(
+  group_df <- dplyr::group_by(
     dplyr::bind_cols(data_evaluated, extra_data),
     !!!syms(c(group_cols, names(extra_data)))
   )
+  group_ids <- dplyr::group_indices(group_df)
 
   list(
     data = data_evaluated,
@@ -480,6 +481,11 @@ calculate_grouped <- function(data, predicates, max_highlight, group_ids) {
   data_predicated <- dplyr::group_by(data_predicated, !!VERY_SECRET_COLUMN_NAME := !!group_ids)
   data_predicated <- dplyr::summarise(data_predicated, !!!predicates)
 
+  group_with_multiple_result <- anyDuplicated(dplyr::pull(data_predicated, !!VERY_SECRET_COLUMN_NAME))
+  if (!identical(group_with_multiple_result, 0L)) {
+    abort("", "gghighlight_invalid_group_predicate_error")
+  }
+
   cols <- choose_col_for_filter_and_arrange(data_predicated, VERY_SECRET_COLUMN_NAME)
 
   # Filter by the logical predicates.

tests/testthat/helpers.R

@@ -1,6 +1,8 @@
 expect_equal_layer <- function(x, y) {
   x$mapping <- x$mapping[sort(names(x$mapping))]
   y$mapping <- y$mapping[sort(names(y$mapping))]
+  x$data <- x$data[, sort(colnames(x$data))]
+  y$data <- y$data[, sort(colnames(y$data))]
   expect_equal(x, y)
 }
 

tests/testthat/test-calculate-group.R

@@ -32,8 +32,10 @@ test_that("calculate_group_info() works", {
   # if there is group mapping, use it
   d_expect_group <- d_expect
   d_expect_group$group <- d$type == "a"
-  expect_equal(calculate_group_info(d, aes(x, y, group = (type == "a"), colour = type)),
-               list(data = d_expect_group, id = c(2, 2, 2, 1, 1, 1, 1), key = aes()))
+  res <- calculate_group_info(d, aes(x, y, group = (type == "a"), colour = type))
+  expect_equal(res$data, d_expect_group[, colnames(res$data)])
+  expect_equal(res$id, c(2, 2, 2, 1, 1, 1, 1))
+  expect_equal(res$key, aes())
 })
 
 

tests/testthat/test-label.R

@@ -74,8 +74,10 @@ test_that("generate_labelled_layer() geenrates a layer for label.", {
 
   expect_equal(generate_labelled_layer(list(l_point), list(g_info), quo(no_such_column), list(fill = "white"), nrow(d)),
                NULL)
-  expect_equal(generate_labelled_layer(list(l_line), list(g_info), type2_quo, list(fill = "white"), 2),
-               ggrepel::geom_label_repel(aes(x, y, colour = type, label = type2), d[c(2, 4), ], fill = "white"))
+  expect_equivalent(
+    generate_labelled_layer(list(l_line), list(g_info), type2_quo, list(fill = "white"), 2),
+    ggrepel::geom_label_repel(aes(x, y, colour = type, label = type2), d[c(2, 4), ], fill = "white")
+  )
   expect_equal(generate_labelled_layer(list(l_bar), list(g_info), type2_quo, list(fill = "white"), nrow(d)),
                list())
   # Do not generate labels when the data is more than max_labels