Merge pull request #129 from ropensci/marianne-fix-bar-null

Fix bar chart conversion for position="dodge" (barmode="group" in Plotly)

Author: mkcor

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: plotly
 Type: Package
 Title: Interactive, publication-quality graphs online.
-Version: 0.5.2
+Version: 0.5.3
 Authors@R: c(person("Chris", "Parmer", role = c("aut", "cre"),
     email = "[email protected]"),
     person("Scott", "Chamberlain", role = "aut",

NEWS

@@ -1,3 +1,20 @@
+0.5.3 -- 21 October 2014.
+
+Support conversion of geom_bar() with position_dodge().
+
+0.5.2 -- 18 October 2014.
+
+Support aesthetic shape in geom_path() and, hence, geom_line() (conversion).
+
+0.5.1 -- 15 October 2014.
+
+Do not show zero lines by default (as in ggplot2 plots).
+
+0.5.0 -- 15 October 2014.
+
+From now on, version numbers are meaningful again...
+Many changes meanwhile, especially support for more geoms.
+
 0.4 -- 7 April 2014.
 
 Re-write geom to trace conversion code.
@@ -22,4 +39,4 @@ For ggplotly:
 
 Merge ggplotly code.
 
-0.3.5 
+0.3.5

R/trace_generation.R

@@ -178,7 +178,7 @@ layer2traces <- function(l, d, misc) {
       }
     }
     name.names <- grep("[.]name$", names(data.params$params), value=TRUE)
-    if(length(name.names)){
+    if (length(name.names)) {
       for(a.name in name.names){
         a <- sub("[.]name$", "", a.name)
         a.value <- as.character(data.params$params[[a.name]])
@@ -189,6 +189,8 @@ layer2traces <- function(l, d, misc) {
       }
       name.list <- data.params$params[name.names]
       tr$name <- paste(unlist(name.list), collapse=".")
+      if (length(unique(name.list)) < 2)
+        tr$name <- as.character(name.list[[1]])
     }
 
     dpd <- data.params$data
@@ -268,6 +270,8 @@ toBasic <- list(
     g
   },
   bar=function(g) {
+    if (any(is.na(g$prestats.data$x)))
+      g$prestats.data$x <- g$prestats.data$x.name
     g$prestats.data$fill <- g$data$fill[match(g$prestats.data$group, g$data$group)]
     g$params$xstart <- min(g$data$xmin)
     g$params$xend <- max(g$data$xmax)

run_tests_with_outputs.R

@@ -14,9 +14,10 @@ save_outputs <- function(gg, name, ignore_ggplot=FALSE) {
   if (!ignore_ggplot) {
     ggsave(paste0("test-ggplot-", name, "-ggplot2.png"), plot=gg, w=7, h=5)
   }
-
-  # save the json
-  writeLines(getURL(paste0(plotlyUrl, ".json")), paste0("test-ggplot-", name, ".json"))
+  
+  # Save the json
+  writeLines(getURL(paste0(plotlyUrl, ".json")), paste0("test-ggplot-", name,
+                                                        ".json"))
 }
 
 test_check("plotly")

tests/testthat.R

@@ -1,5 +1,5 @@
 library(testthat)
 save_outputs <- function(gg, name, ignore_ggplot=FALSE) {
-      print(paste("running", name))
+  print(paste("running", name))
 }
 test_check("plotly")

tests/testthat/test-ggplot-abline-ggplot2.png

@@ -15,6 +15,11 @@ test_that("position_dodge is translated to barmode=group", {
   trace.names <- sapply(L[1:2], "[[", "name")
   expect_true(all(c("Math", "Bio") %in% trace.names))
   expect_identical(L$kwargs$layout$barmode, "group")
+  # Check x values
+  expect_identical(as.character(L[[1]]$x[1]), "Canada")
+  expect_identical(as.character(L[[1]]$x[2]), "Germany")
+  expect_identical(as.character(L[[2]]$x[1]), "Canada")
+  expect_identical(as.character(L[[2]]$x[2]), "USA")
 
   save_outputs(gg.dodge, "bar-dodge")
 })