fixes for dev ggplot2

* use rlang::eval_tidy() over base::eval() to evaluate aes mappings
* qplot() is currently broken, so avoid it in tests
* GGally is also broken with ggplot2@master so avoid it for now

Author: cpsievert

NAMESPACE

@@ -248,6 +248,7 @@ importFrom(lazyeval,is_formula)
 importFrom(lazyeval,is_lang)
 importFrom(magrittr,"%>%")
 importFrom(purrr,transpose)
+importFrom(rlang,eval_tidy)
 importFrom(stats,complete.cases)
 importFrom(stats,is.leaf)
 importFrom(stats,quantile)

R/ggplotly.R

@@ -261,10 +261,9 @@ gg2list <- function(p, width = NULL, height = NULL,
 
   # save the domain of the group for display in tooltips
   groupDomains <- Map(function(x, y) {
-    tryCatch(
-      eval(y$mapping[["group"]] %||% plot$mapping[["group"]], x), 
-      error = function(e) NULL
-    )
+    aes_g <- y$mapping[["group"]] %||% plot$mapping[["group"]]
+    eval_ <- if (is_dev_ggplot2()) rlang::eval_tidy else base::eval
+    tryNULL(eval_(aes_g, x))
   }, data, layers)
 
   # for simple (StatIdentity) geoms, add crosstalk key to aes mapping

R/imports.R

@@ -14,6 +14,7 @@
 #' @importFrom purrr transpose
 #' @importFrom tools file_ext file_path_sans_ext
 #' @importFrom data.table as.data.table setorderv
+#' @importFrom rlang eval_tidy
 NULL
 
 

tests/testthat/test-animate-highlight.R

@@ -24,20 +24,21 @@ test_that("SharedData produces key/set in ggplotly", {
   expect_false(tr$`_isSimpleKey` %||% FALSE)
 })
 
-test_that("SharedData produces key/set in ggpairs", {
-  p <- GGally::ggpairs(m, columns = 1:3)
-  l <- plotly_build(p)$x
-  
-  for (i in seq_along(l$data)) {
-    tr <- l$data[[i]]
-    if (tr$mode != "markers") next
-    expect_true(all(tr$key == m$key()))
-    expect_identical(tr$set, m$groupName())
-    expect_false(tr$`_isNestedKey` %||% FALSE)
-    expect_false(tr$`_isSimpleKey` %||% FALSE)
-  }
-  
-})
+# Ignore for now https://github.com/ggobi/ggally/issues/264
+#test_that("SharedData produces key/set in ggpairs", {
+#  p <- GGally::ggpairs(m, columns = 1:3)
+#  l <- plotly_build(p)$x
+#  
+#  for (i in seq_along(l$data)) {
+#    tr <- l$data[[i]]
+#    if (tr$mode != "markers") next
+#    expect_true(all(tr$key == m$key()))
+#    expect_identical(tr$set, m$groupName())
+#    expect_false(tr$`_isNestedKey` %||% FALSE)
+#    expect_false(tr$`_isSimpleKey` %||% FALSE)
+#  }
+#  
+#})
 
 
 test_that("When key is equivalent to group, produce simple keys", {

tests/testthat/test-ggplot-lines.R

@@ -111,9 +111,11 @@ test_that("geom_linerange() without a y aesthetic translates to a path", {
   expect_equivalent(
     unlist(l$data[[1]]$text),
     c(
-      'x: 1<br />ymin: 0', 'x: 1<br />ymax: 1', NA, 'x: 2<br />ymin: 0', 
-      'x: 2<br />ymax: 2', NA, 'x: 3<br />ymin: 0', 'x: 3<br />ymax: 3', NA, 
-      'x: 4<br />ymin: 0', 'x: 4<br />ymax: 4', NA, 'x: 5<br />ymin: 0', 'x: 5<br />ymax: 5'
+      'x: 1<br />ymax: 1<br />ymin: 0', 'x: 1<br />ymax: 1<br />ymin: 0', NA, 
+      'x: 2<br />ymax: 2<br />ymin: 0', 'x: 2<br />ymax: 2<br />ymin: 0', NA, 
+      'x: 3<br />ymax: 3<br />ymin: 0', 'x: 3<br />ymax: 3<br />ymin: 0', NA, 
+      'x: 4<br />ymax: 4<br />ymin: 0', 'x: 4<br />ymax: 4<br />ymin: 0', NA, 
+      'x: 5<br />ymax: 5<br />ymin: 0', 'x: 5<br />ymax: 5<br />ymin: 0'
     )
   )
 

tests/testthat/test-ggplot-tooltip.R

@@ -29,7 +29,9 @@ test_that("dates are displayed in tooltip properly", {
 })
 
 test_that("tooltip argument respects ordering", {
-  p <- qplot(mpg, fill = factor(cyl), data = mtcars, geom = "density")
+  # qplot() is broken in ggplot2 (as of c0a99a8)
+  #p <- qplot(mpg, fill = factor(cyl), data = mtcars, geom = "density")
+  p <- ggplot(mtcars, aes(x = mpg, fill = factor(cyl))) + geom_density()
   p <- ggplotly(p, tooltip = c("density", "x"))
   info <- plotly_build(p)$x
   txt <- strsplit(info$data[[1]]$text, br())

tests/testthat/test-plotly-subplot.R

@@ -134,10 +134,10 @@ test_that("subplot accepts a list of plots", {
   expect_true(l$layout[[sub("y", "yaxis", xaxes[[1]]$anchor)]]$domain[1] == 0)
 })
 
-
-test_that("ggplotly understands ggmatrix", {
-  L <- save_outputs(GGally::ggpairs(iris), "plotly-subplot-ggmatrix")
-})
+# Ignore for now https://github.com/ggobi/ggally/issues/264
+#test_that("ggplotly understands ggmatrix", {
+#  L <- save_outputs(GGally::ggpairs(iris), "plotly-subplot-ggmatrix")
+#})
 
 test_that("geo+cartesian behaves", {
   # specify some map projection/options