From 3f49d1caff8b5c97bece4978bdf8ced07c58b81d Mon Sep 17 00:00:00 2001
From: cpsievert <cpsievert1@gmail.com>
Date: Thu, 13 Aug 2015 17:45:39 -0700
Subject: [PATCH 01/16] Fixes for dev version of ggplot2

---
 .travis.yml          |  1 +
 R/ggplotly.R         |  8 +++++++-
 R/trace_generation.R | 10 ++++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4f434953d9..a68ba263cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ before_install:
 
 install:
   - ./travis-tool.sh install_deps
+  - ./travis-tool.sh install_github hadley/scales hadley/ggplot2
 
 before_script:
   - git config --global user.name "cpsievert"
diff --git a/R/ggplotly.R b/R/ggplotly.R
index d57fad99ba..dd826c02d5 100644
--- a/R/ggplotly.R
+++ b/R/ggplotly.R
@@ -116,6 +116,12 @@ markUnique <- as.character(unique(unlist(markLegends)))
 
 markSplit <- c(markLegends,list(boxplot=c("x")))
 
+# obtain the "type" of geom/position/etc.
+type <- function(x, y) {
+  sub(y, "", tolower(class(x[[y]])[[1]]))
+}
+
+
 #' Convert a ggplot to a list.
 #' @import ggplot2
 #' @param p ggplot2 plot.
@@ -293,7 +299,7 @@ gg2list <- function(p) {
     # This extracts essential info for this geom/layer.
     traces <- layer2traces(L, df, misc)
     
-    possible.legends <- markLegends[[L$geom$objname]]
+    possible.legends <- markLegends[[type(L, "geom")]]
     actual.legends <- possible.legends[possible.legends %in% names(L$mapping)]
     layer.legends[[paste(i)]] <- actual.legends
     
diff --git a/R/trace_generation.R b/R/trace_generation.R
index 58f78df03e..1d347782af 100644
--- a/R/trace_generation.R
+++ b/R/trace_generation.R
@@ -10,9 +10,11 @@ layer2traces <- function(l, d, misc) {
     to.exclude <- apply(na.mat, 1, any)
     df[!to.exclude, ]
   }
-  g <- list(geom=l$geom$objname,
-            data=not.na(d),
-            prestats.data=not.na(l$prestats.data))
+  g <- list(
+    geom = type(l, "geom"),
+    data = not.na(d),
+    prestats.data = not.na(l$prestats.data)
+  )
   
   # needed for when group, etc. is an expression.
   g$aes <- sapply(l$mapping, function(k) as.character(as.expression(k)))
@@ -251,7 +253,7 @@ layer2traces <- function(l, d, misc) {
     # special handling for bars
     if (g$geom == "bar") {
       tr$bargap <- if (exists("bargap")) bargap else "default"
-      pos <- l$position$.super$objname
+      pos <- type(l, "position")
       tr$barmode <-
         if (pos %in% "identity" && tr$bargap == 0) {
           "overlay" 

From 601a414099f4a69feb17f154279b60635c2cd4d4 Mon Sep 17 00:00:00 2001
From: cpsievert <cpsievert1@gmail.com>
Date: Thu, 13 Aug 2015 18:43:41 -0700
Subject: [PATCH 02/16] StatVline doesn't currently exist

---
 tests/testthat/test-cookbook-lines.R | 70 ++++++++++++++--------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/tests/testthat/test-cookbook-lines.R b/tests/testthat/test-cookbook-lines.R
index 272ebfe544..8bc2fac100 100644
--- a/tests/testthat/test-cookbook-lines.R
+++ b/tests/testthat/test-cookbook-lines.R
@@ -187,28 +187,28 @@ test_that("Add a red dashed vertical line", {
   expect_identical(dash.trace$line$color, toRGB("#BB0000"))
 })
 
-temp <- sp + geom_hline(aes(yintercept=10)) +
-  geom_line(stat="vline", xintercept="mean")
-test_that("Add colored lines for the mean xval of each group", {
-  info <- expect_traces_shapes(temp, 5, 0, "scatter-hline-vline-stat")
-  expect_true(info$layout$showlegend)
-  mode <- sapply(info$traces, "[[", "mode")
-  line.traces <- info$traces[mode == "lines"]
-  expect_equal(length(line.traces), 3)
-  lines.by.name <- list()
-  for(tr in line.traces){
-    expect_false(tr$showlegend)
-    if(is.character(tr$name)){
-      lines.by.name[[tr$name]] <- tr
-    }
-  }
-  marker.traces <- info$traces[mode == "markers"]
-  for(tr in marker.traces){
-    expect_true(tr$showlegend)
-    line.trace <- lines.by.name[[tr$name]]
-    expect_equal(range(line.trace$y), range(tr$y))
-  }
-})
+# temp <- sp + geom_hline(aes(yintercept=10)) +
+#   geom_line(stat="vline", xintercept="mean")
+# test_that("Add colored lines for the mean xval of each group", {
+#   info <- expect_traces_shapes(temp, 5, 0, "scatter-hline-vline-stat")
+#   expect_true(info$layout$showlegend)
+#   mode <- sapply(info$traces, "[[", "mode")
+#   line.traces <- info$traces[mode == "lines"]
+#   expect_equal(length(line.traces), 3)
+#   lines.by.name <- list()
+#   for(tr in line.traces){
+#     expect_false(tr$showlegend)
+#     if(is.character(tr$name)){
+#       lines.by.name[[tr$name]] <- tr
+#     }
+#   }
+#   marker.traces <- info$traces[mode == "markers"]
+#   for(tr in marker.traces){
+#     expect_true(tr$showlegend)
+#     line.trace <- lines.by.name[[tr$name]]
+#     expect_equal(range(line.trace$y), range(tr$y))
+#   }
+# })
 
 # Facet, based on cond
 spf <- sp + facet_grid(. ~ cond)
@@ -242,16 +242,16 @@ test_that("geom_vline -> 2 more traces", {
   info <- expect_traces_shapes(spf.vline, 6, 0, "scatter-facet-hline-vline")
 })
 
-spf.line.stat <- 
-  spf +
-  geom_hline(aes(yintercept=10)) +
-  geom_line(stat="vline", xintercept="mean")
-test_that("geom_line -> 2 more traces", {
-  info <-
-    expect_traces_shapes(spf.line.stat, 6, 0,
-                         "scatter-facet-hline-line-stat")
-  for(tr in info$traces){
-    expected <- ifelse(tr$mode == "markers", TRUE, FALSE)
-    expect_identical(tr$showlegend, expected)
-  }
-})
+# spf.line.stat <- 
+#   spf +
+#   geom_hline(aes(yintercept=10)) +
+#   geom_line(stat="vline", xintercept="mean")
+# test_that("geom_line -> 2 more traces", {
+#   info <-
+#     expect_traces_shapes(spf.line.stat, 6, 0,
+#                          "scatter-facet-hline-line-stat")
+#   for(tr in info$traces){
+#     expected <- ifelse(tr$mode == "markers", TRUE, FALSE)
+#     expect_identical(tr$showlegend, expected)
+#   }
+# })

From 4a0c81b97c29727b8f8ef66a65903a55ce3ad21e Mon Sep 17 00:00:00 2001
From: cpsievert <cpsievert1@gmail.com>
Date: Fri, 14 Aug 2015 11:05:21 -0700
Subject: [PATCH 03/16] GeomHistogram no longer exists

---
 R/trace_generation.R | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/R/trace_generation.R b/R/trace_generation.R
index 1d347782af..11a043cdd4 100644
--- a/R/trace_generation.R
+++ b/R/trace_generation.R
@@ -43,11 +43,6 @@ layer2traces <- function(l, d, misc) {
       g$geom <- "smoothLine"
     }
   }
-  # histogram is essentially a bar chart with no gaps (after stats are computed)
-  if (g$geom == "histogram") {
-    g$geom <- "bar"
-    bargap <- 0
-  }
   
   # For non-numeric data on the axes, we should take the values from
   # the original data.
@@ -252,7 +247,7 @@ layer2traces <- function(l, d, misc) {
     
     # special handling for bars
     if (g$geom == "bar") {
-      tr$bargap <- if (exists("bargap")) bargap else "default"
+      tr$bargap <- if ("binwidth" %in% names(l$stat_params)) 0 else "default"
       pos <- type(l, "position")
       tr$barmode <-
         if (pos %in% "identity" && tr$bargap == 0) {

From 23f597326ad2a98e677ef0caf697e102d942b1b6 Mon Sep 17 00:00:00 2001
From: cpsievert <cpsievert1@gmail.com>
Date: Fri, 14 Aug 2015 11:06:01 -0700
Subject: [PATCH 04/16] coordinates have a slightly different class
 specification

---
 R/ggplotly.R | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/R/ggplotly.R b/R/ggplotly.R
index dd826c02d5..e1e8409c07 100644
--- a/R/ggplotly.R
+++ b/R/ggplotly.R
@@ -944,7 +944,8 @@ gg2list <- function(p) {
   # each axis.
   flipped.traces <- named.traces
   flipped.layout <- layout
-  if("flip" %in% attr(built$plot$coordinates, "class")){
+  coord_cl <- sub("coord", "", tolower(class(built$plot$coordinates)))
+  if("flip" %in% coord_cl){
     if(!inherits(p$facet, "null")){
       stop("coord_flip + facet conversion not supported")
     }

From 2415558dfc6ec76b69fcaccccfd6cea36433e6f0 Mon Sep 17 00:00:00 2001
From: cpsievert <cpsievert1@gmail.com>
Date: Fri, 14 Aug 2015 13:48:09 -0700
Subject: [PATCH 05/16] more robust way of identifying histograms

---
 R/trace_generation.R | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/R/trace_generation.R b/R/trace_generation.R
index 11a043cdd4..10af55acd7 100644
--- a/R/trace_generation.R
+++ b/R/trace_generation.R
@@ -247,10 +247,11 @@ layer2traces <- function(l, d, misc) {
     
     # special handling for bars
     if (g$geom == "bar") {
-      tr$bargap <- if ("binwidth" %in% names(l$stat_params)) 0 else "default"
+      is_hist <- (misc$is.continuous[["x"]] || misc$is.date[["x"]])
+      tr$bargap <- if (is_hist) 0 else "default"
       pos <- type(l, "position")
       tr$barmode <-
-        if (pos %in% "identity" && tr$bargap == 0) {
+        if (pos %in% "identity" && is_hist) {
           "overlay" 
         } else if (pos %in% c("identity", "stack", "fill")) {
           "stack"

From acd135a131500b1c7b6d0e3c83f3c73983fc3c64 Mon Sep 17 00:00:00 2001
From: cpsievert <cpsievert1@gmail.com>
Date: Sun, 16 Aug 2015 13:43:29 -0500
Subject: [PATCH 06/16] fall back on geom_blank() for unimplemented geoms (or
 if no layers are found)

---
 R/ggplotly.R                        |  6 +++---
 R/trace_generation.R                | 27 +++++++++++++++++--------
 tests/testthat/test-unimplemented.R | 31 ++++++++++-------------------
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/R/ggplotly.R b/R/ggplotly.R
index e1e8409c07..026bd7e418 100644
--- a/R/ggplotly.R
+++ b/R/ggplotly.R
@@ -128,9 +128,6 @@ type <- function(x, y) {
 #' @return figure object (list with names "data" and "layout").
 #' @export
 gg2list <- function(p) {
-  if(length(p$layers) == 0) {
-    stop("No layers in plot")
-  }
   # Always use identity size scale so that plot.ly gets the real
   # units for the size variables.
   original.p <- p
@@ -145,11 +142,14 @@ gg2list <- function(p) {
   })
   layout <- list()
   trace.list <- list()
+  # ggplot now applies geom_blank() (instead of erroring) when no layers exist
+  if (length(p$layers) == 0) p <- p + geom_blank()
   
   # Before building the ggplot, we would like to add aes(name) to
   # figure out what the object group is later. This also copies any
   # needed global aes/data values to each layer, so we do not have to
   # worry about combining global and layer-specific aes/data later.
+  
   for(layer.i in seq_along(p$layers)) {
     layer.aes <- p$layers[[layer.i]]$mapping
     if(p$layers[[layer.i]]$inherit.aes){
diff --git a/R/trace_generation.R b/R/trace_generation.R
index 10af55acd7..ae783b8ee9 100644
--- a/R/trace_generation.R
+++ b/R/trace_generation.R
@@ -192,12 +192,12 @@ layer2traces <- function(l, d, misc) {
                            names=basic$params$name)
   }
   getTrace <- geom2trace[[basic$geom]]
-  if(is.null(getTrace)){
-    warning("Conversion not implemented for geom_",
-            g$geom, " (basic geom_", basic$geom, "), ignoring. ",
-            "Please open an issue with your example code at ",
-            "https://github.com/ropensci/plotly/issues")
-    return(list())
+  if (is.null(getTrace)) {
+    getTrace <- geom2trace[["blank"]]
+    warning("geom_", g$geom, " has yet to be implemented in plotly.\n",
+            "  If you'd like to see this geom implemented,\n",
+            "  Please open an issue with your example code at\n",
+            "  https://github.com/ropensci/plotly/issues")
   }
   traces <- NULL
   names.in.legend <- NULL
@@ -256,8 +256,8 @@ layer2traces <- function(l, d, misc) {
         } else if (pos %in% c("identity", "stack", "fill")) {
           "stack"
         } else {
-        "group"
-      }
+          "group"
+        }
     }
     
     traces <- c(traces, list(tr))
@@ -507,6 +507,17 @@ ribbon_dat <- function(dat) {
 
 # Convert basic geoms to traces.
 geom2trace <- list(
+  blank=function(data, params) {
+    list(
+      x=data$x,
+      y=data$y,
+      name=params$name,
+      text=data$text,
+      type="scatter",
+      mode="markers",
+      marker=list(opacity = 0)
+    )
+  },
   path=function(data, params) {
     list(x=data$x,
          y=data$y,
diff --git a/tests/testthat/test-unimplemented.R b/tests/testthat/test-unimplemented.R
index d41e142404..df5d908293 100644
--- a/tests/testthat/test-unimplemented.R
+++ b/tests/testthat/test-unimplemented.R
@@ -1,27 +1,16 @@
 context("Unimplemented geoms")
 
-library(proto)
-geom_unimplemented <- function(...) {
-  GeomUnimplemented <- proto(ggplot2:::GeomLine, {
-    objname <- "unimplemented"
-  })
-  GeomUnimplemented$new(...)
-}
-
 test_that("un-implemented geoms are ignored with a warning", {
-  gg <- ggplot(iris, aes(Sepal.Width, Petal.Length))
-  expect_error({
-    gg2list(gg)
-  }, "No layers in plot")
-
-  un <- gg + geom_unimplemented()
-  expect_error({
-    gg2list(un)
-  }, "No exportable traces")
-
-  ok <- un + geom_point()
+  
+  dmod <- lm(price ~ cut, data=diamonds)
+  cuts <- data.frame(
+    cut = unique(diamonds$cut), 
+    predict(dmod, data.frame(cut = unique(diamonds$cut)), se=TRUE)[c("fit","se.fit")]
+  )
+  se <- ggplot(cuts, aes(cut, fit,
+                         ymin = fit - se.fit, ymax=fit + se.fit, colour = cut))
   expect_warning({
-    info <- gg2list(ok)
-  }, "Conversion not implemented")
+    info <- gg2list(se + geom_linerange())
+  }, "geom_linerange() has yet to be implemented in plotly")
   expect_equal(length(info), 2)
 })

From b428706385c85693ef109bfce1561dc86d5ec229 Mon Sep 17 00:00:00 2001
From: cpsievert <cpsievert1@gmail.com>
Date: Sun, 16 Aug 2015 15:17:04 -0500
Subject: [PATCH 07/16] stat_vline(), stat_hline(), and stat_abline() will no
 longer be supported

---
 tests/testthat/test-cookbook-lines.R | 37 ----------------------------
 1 file changed, 37 deletions(-)

diff --git a/tests/testthat/test-cookbook-lines.R b/tests/testthat/test-cookbook-lines.R
index 8bc2fac100..fc114670d8 100644
--- a/tests/testthat/test-cookbook-lines.R
+++ b/tests/testthat/test-cookbook-lines.R
@@ -187,29 +187,6 @@ test_that("Add a red dashed vertical line", {
   expect_identical(dash.trace$line$color, toRGB("#BB0000"))
 })
 
-# temp <- sp + geom_hline(aes(yintercept=10)) +
-#   geom_line(stat="vline", xintercept="mean")
-# test_that("Add colored lines for the mean xval of each group", {
-#   info <- expect_traces_shapes(temp, 5, 0, "scatter-hline-vline-stat")
-#   expect_true(info$layout$showlegend)
-#   mode <- sapply(info$traces, "[[", "mode")
-#   line.traces <- info$traces[mode == "lines"]
-#   expect_equal(length(line.traces), 3)
-#   lines.by.name <- list()
-#   for(tr in line.traces){
-#     expect_false(tr$showlegend)
-#     if(is.character(tr$name)){
-#       lines.by.name[[tr$name]] <- tr
-#     }
-#   }
-#   marker.traces <- info$traces[mode == "markers"]
-#   for(tr in marker.traces){
-#     expect_true(tr$showlegend)
-#     line.trace <- lines.by.name[[tr$name]]
-#     expect_equal(range(line.trace$y), range(tr$y))
-#   }
-# })
-
 # Facet, based on cond
 spf <- sp + facet_grid(. ~ cond)
 test_that("scatter facet -> 2 traces", {
@@ -241,17 +218,3 @@ spf.vline <-
 test_that("geom_vline -> 2 more traces", {
   info <- expect_traces_shapes(spf.vline, 6, 0, "scatter-facet-hline-vline")
 })
-
-# spf.line.stat <- 
-#   spf +
-#   geom_hline(aes(yintercept=10)) +
-#   geom_line(stat="vline", xintercept="mean")
-# test_that("geom_line -> 2 more traces", {
-#   info <-
-#     expect_traces_shapes(spf.line.stat, 6, 0,
-#                          "scatter-facet-hline-line-stat")
-#   for(tr in info$traces){
-#     expected <- ifelse(tr$mode == "markers", TRUE, FALSE)
-#     expect_identical(tr$showlegend, expected)
-#   }
-# })

From 84347489a0e23c5734f23cd48097cddc4ec52fb1 Mon Sep 17 00:00:00 2001
From: cpsievert <cpsievert1@gmail.com>
Date: Sun, 16 Aug 2015 15:19:51 -0500
Subject: [PATCH 08/16] group no longer is different for each panel and I'm not
 sure if this will matter...

---
 tests/testthat/test-ggplot-build2.R | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/testthat/test-ggplot-build2.R b/tests/testthat/test-ggplot-build2.R
index 4ee84bad46..60f1a33fa7 100644
--- a/tests/testthat/test-ggplot-build2.R
+++ b/tests/testthat/test-ggplot-build2.R
@@ -11,8 +11,8 @@ test_that("ggplot_build2 returns prestats.data", {
   expect_true("prestats.data" %in% names(L))
 })
 
-test_that("prestats.data gives the right panel info", {
-  gr <- as.integer(L$prestats.data[[1]]$group)
-  pa <- as.integer(L$prestats.data[[1]]$PANEL)
-  expect_identical(gr, pa)
-})
+# test_that("prestats.data gives the right panel info", {
+#   gr <- as.integer(L$prestats.data[[1]]$group)
+#   pa <- as.integer(L$prestats.data[[1]]$PANEL)
+#   expect_identical(gr, pa)
+# })

From b395eb482c714f123994f16aa31ce16a653c1369 Mon Sep 17 00:00:00 2001
From: cpsievert <cpsievert1@gmail.com>
Date: Sun, 16 Aug 2015 16:44:28 -0500
Subject: [PATCH 09/16] Require something higher than ggplot2 1.0.1

---
 DESCRIPTION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index d200825f59..98c81eeaf9 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -23,7 +23,7 @@ Description: Create interactive web-based graphs via plotly's API.
 URL: https://github.com/ropensci/plotly
 BugReports: https://github.com/ropensci/plotly/issues
 Depends:
-    ggplot2
+    ggplot2 (> 1.0.1)
 Imports:
     scales,
     httr,

From d1db211d2d2c1ba7336856e6d13d0b1abe764de6 Mon Sep 17 00:00:00 2001
From: cpsievert <cpsievert1@gmail.com>
Date: Mon, 17 Aug 2015 10:18:09 -0500
Subject: [PATCH 10/16] geom_abline()'s intercept/slope moved from params to
 data

---
 R/trace_generation.R | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/R/trace_generation.R b/R/trace_generation.R
index ae783b8ee9..e83f8646fd 100644
--- a/R/trace_generation.R
+++ b/R/trace_generation.R
@@ -10,12 +10,13 @@ layer2traces <- function(l, d, misc) {
     to.exclude <- apply(na.mat, 1, any)
     df[!to.exclude, ]
   }
+  
   g <- list(
     geom = type(l, "geom"),
     data = not.na(d),
     prestats.data = not.na(l$prestats.data)
   )
-  
+  #if (grepl("line", g$geom)) browser()
   # needed for when group, etc. is an expression.
   g$aes <- sapply(l$mapping, function(k) as.character(as.expression(k)))
   # Partial conversion for geom_violin (Plotly does not offer KDE yet)
@@ -677,8 +678,8 @@ geom2trace <- list(
   },
   abline=function(data, params) {
     list(x=c(params$xstart, params$xend),
-         y=c(params$intercept + params$xstart * params$slope,
-             params$intercept + params$xend * params$slope),
+         y=c(data$intercept + params$xstart * data$slope,
+             data$intercept + params$xend * data$slope),
          name=params$name,
          type="scatter",
          mode="lines",

From 02791e6bb2fc55f628ba759ca8295493667f1640 Mon Sep 17 00:00:00 2001
From: cpsievert <cpsievert1@gmail.com>
Date: Mon, 17 Aug 2015 14:33:33 -0500
Subject: [PATCH 11/16] sending an empty axis title results in plotly error
 (also, no one can follow that nested if else mess)

---
 R/ggplotly.R | 71 +++++++++++++++++++++-------------------------------
 1 file changed, 28 insertions(+), 43 deletions(-)

diff --git a/R/ggplotly.R b/R/ggplotly.R
index 026bd7e418..9ea6510cee 100644
--- a/R/ggplotly.R
+++ b/R/ggplotly.R
@@ -410,7 +410,7 @@ gg2list <- function(p) {
     grid <- theme.pars$panel.grid
     grid.major <- theme.pars$panel.grid.major
     if ((!is.null(grid$linetype) || !is.null(grid.major$linetype)) && 
-          c(grid$linetype, grid.major$linetype) %in% c(2, 3, "dashed", "dotted")) {
+        c(grid$linetype, grid.major$linetype) %in% c(2, 3, "dashed", "dotted")) {
       ax.list$gridcolor <- ifelse(is.null(grid.major$colour),
                                   toRGB(grid$colour, 0.1),
                                   toRGB(grid.major$colour, 0.1))
@@ -463,50 +463,35 @@ gg2list <- function(p) {
     
     # Translate axes labels.
     scale.i <- which(p$scales$find(xy))
-    ax.list$title <- if(length(scale.i)){
-      sc <- p$scales$scales[[scale.i]]
-      if(ax.list$type == "category"){
-        trace.order.list[[xy]] <- sc$limits
-        if(is.character(sc$breaks)){
-          if(is.character(sc$labels)){
-            trace.name.map[sc$breaks] <- sc$labels
-          }
-          ##TODO: if(is.function(sc$labels)){
-        }
-      }
-      if (is.null(sc$breaks)) {
-        ax.list$showticklabels <- FALSE
-        ax.list$showgrid <- FALSE
-        ax.list$ticks <- ""
-      }
-      if (is.numeric(sc$breaks)) {
-        dticks <- diff(sc$breaks)
-        dt <- dticks[1]
-        if(all(dticks == dt)){
-          ax.list$dtick <- dt
-          ax.list$autotick <- FALSE
-        }
-      }
-      ax.list$range <- if(!is.null(sc$limits)){
-        sc$limits
-      }else{
-        if(misc$is.continuous[[xy]]){
-          built$panel$ranges[[1]][[s("%s.range")]] #TODO: facets!
-        }else{ # for a discrete scale, range should be NULL.
-          NULL
-        }
-      }
-      if(is.character(sc$trans$name) && sc$trans$name == "reverse"){
-        ax.list$range <- sort(-ax.list$range, decreasing = TRUE)
-      }
-      if(!is.null(sc$name)){
-        sc$name
-      }else{
-        p$labels[[xy]]
+    sc <- tryCatch(p$scales$scales[[scale.i]], 
+                   error = function(e) list())
+    ax.list$title <- sc$name %||% p$labels[[xy]] %||% p$labels[[xy]]
+    
+    if (ax.list$type == "category") {
+      trace.order.list[[xy]] <- sc$limits
+      if (is.character(sc$breaks) && is.character(sc$labels))
+        trace.name.map[sc$breaks] <- sc$labels
+      ##TODO: if(is.function(sc$labels)){
+    }
+    if (is.null(sc$breaks)) {
+      ax.list$showticklabels <- FALSE
+      ax.list$showgrid <- FALSE
+      ax.list$ticks <- ""
+    }
+    if (is.numeric(sc$breaks)) {
+      dticks <- diff(sc$breaks)
+      dt <- dticks[1]
+      if (all(dticks == dt)) {
+        ax.list$dtick <- dt
+        ax.list$autotick <- FALSE
       }
-    }else{
-      p$labels[[xy]]
     }
+    ax.list$range <- sc$limits %||% 
+      #TODO: facets!
+      if (misc$is.continuous[[xy]]) 
+        built$panel$ranges[[1]][[s("%s.range")]] %||%
+      if (is.character(sc$trans$name) && sc$trans$name == "reverse")
+        sort(-ax.list$range, decreasing = TRUE)
     
     ax.list$zeroline <- FALSE  # ggplot2 plots do not show zero lines
     # Lines drawn around the plot border.

From 38b2dd1eeb28a024d3b844e574c707e9b1667647 Mon Sep 17 00:00:00 2001
From: cpsievert <cpsievert1@gmail.com>
Date: Mon, 17 Aug 2015 14:34:36 -0500
Subject: [PATCH 12/16] NAs and NULLs should always be converted to null
 (toJSON has different defaults for different classes)

---
 R/utils.R | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/R/utils.R b/R/utils.R
index c8702de3d4..2b16ad1304 100644
--- a/R/utils.R
+++ b/R/utils.R
@@ -118,7 +118,8 @@ try_file <- function(f, what) {
 
 # preferred defaults for toJSON mapping
 to_JSON <- function(x, ...) {
-  jsonlite::toJSON(x, digits = 50, auto_unbox = TRUE, force = TRUE, ...)
+  jsonlite::toJSON(x, digits = 50, auto_unbox = TRUE, 
+                   force = TRUE, null = "null", na = "null", ...)
 }
 
 # preferred defaults for toJSON mapping

From 81b840408af371032dccc6698d0031ff197749c4 Mon Sep 17 00:00:00 2001
From: cpsievert <cpsievert1@gmail.com>
Date: Mon, 17 Aug 2015 14:35:43 -0500
Subject: [PATCH 13/16] Fix #268 (implementation of abline). Add an additional
 test.

---
 R/trace_generation.R                | 32 ++++++++++-----
 tests/testthat/test-ggplot-abline.R | 60 +++++++++++++++++++++--------
 2 files changed, 67 insertions(+), 25 deletions(-)

diff --git a/R/trace_generation.R b/R/trace_generation.R
index e83f8646fd..617bda6914 100644
--- a/R/trace_generation.R
+++ b/R/trace_generation.R
@@ -248,7 +248,7 @@ layer2traces <- function(l, d, misc) {
     
     # special handling for bars
     if (g$geom == "bar") {
-      is_hist <- (misc$is.continuous[["x"]] || misc$is.date[["x"]])
+      is_hist <- misc$is.continuous[["x"]]
       tr$bargap <- if (is_hist) 0 else "default"
       pos <- type(l, "position")
       tr$barmode <-
@@ -369,8 +369,19 @@ toBasic <- list(
     g
   },
   abline=function(g) {
-    g$params$xstart <- min(g$prestats.data$globxmin)
-    g$params$xend <- max(g$prestats.data$globxmax)
+    N <- nrow(g$data)
+    m <- g$data$slope
+    b <- g$data$intercept
+    xmin <- unique(g$prestats.data$globxmin)
+    xmax <- unique(g$prestats.data$globxmax)
+    browser()
+    l <- list()
+    for (i in seq_len(N)) {
+      # the NAs tell plotly to draw different traces for each line
+      l$x <- c(l$x, xmin, xmax, NA) 
+      l$y <- c(l$y, xmin * m[i] + b[i], xmax * m[i] + b[i], NA)
+    }
+    g$params$ablines <- data.frame(l)
     g
   },
   hline=function(g) {
@@ -677,13 +688,14 @@ geom2trace <- list(
                                               params$alpha)))
   },
   abline=function(data, params) {
-    list(x=c(params$xstart, params$xend),
-         y=c(data$intercept + params$xstart * data$slope,
-             data$intercept + params$xend * data$slope),
-         name=params$name,
-         type="scatter",
-         mode="lines",
-         line=paramORdefault(params, aes2line, line.defaults))
+    list(
+      x = params$ablines$x,
+      y = params$ablines$y,
+      name = params$name,
+      type = "scatter",
+      mode = "lines",
+      line = paramORdefault(params, aes2line, line.defaults)
+    )
   },
   hline=function(data, params) {
     list(x=c(params$xstart, params$xend),
diff --git a/tests/testthat/test-ggplot-abline.R b/tests/testthat/test-ggplot-abline.R
index 95b6d0130a..3099727afe 100644
--- a/tests/testthat/test-ggplot-abline.R
+++ b/tests/testthat/test-ggplot-abline.R
@@ -2,23 +2,53 @@ context("Abline")
 
 # 'Abline' refers to the line coefficients, as in y = a + b * x
 
+expect_traces <- function(gg, n.traces, name) {
+  stopifnot(is.ggplot(gg))
+  stopifnot(is.numeric(n.traces))
+  L <- save_outputs(gg, paste0("cookbook-axes-", name))
+  all.traces <- L$data
+  no.data <- sapply(all.traces, function(tr) {
+    is.null(tr[["x"]]) && is.null(tr[["y"]])
+  })
+  has.data <- all.traces[!no.data]
+  expect_equal(length(has.data), n.traces)
+  list(traces=has.data, layout=L$layout)
+}
+
 test_that("Second trace be the a-b line", {
-  x1 <- seq(from=0, to=3.5, by=0.5)
-  x2 <- x1 * 0.95
-  df <- data.frame("x1"=x1, "x2"=x2)
+  x <- seq(0, 3.5, by = 0.5)
+  y <- x * 0.95
+  df <- data.frame(x, y)
+  
+  gg <- ggplot(df) + geom_point(aes(x, y)) +
+    geom_abline(intercept = 1.1, slope = 0.9, colour = "red", size = 4)
   
-  gg <- ggplot(df) + geom_point(aes(x=x1, y=x2)) +
-    geom_abline(intercept=1.1, slope=0.9, colour="red", size=4)
+  L <- expect_traces(gg, 2, "single-abline")
+
+  dat <- L$data[[2]]
+  expect_true(dat$x[1] <= 0)
+  expect_true(dat$x[2] >= 3.5)
+  expect_identical(dat$mode, "lines")
+  expect_identical(dat$line$shape, "linear")
+  expect_equal(dat$line$width, 8)
+  expect_identical(dat$showlegend, FALSE)
+})
+
+test_that("abline aesthetics", {
+  df <- data.frame(
+    m = c(2, -3, 0.1),
+    b = c(1, 0, -1)
+  )
   
-  L <- save_outputs(gg, "abline")
-
-  expect_equal(length(L$data), 2)
-  expect_true(L$data[[2]]$x[1] <= 0)
-  expect_true(L$data[[2]]$x[2] >= 3.5)
-  expect_identical(L$data[[2]]$mode, "lines")
-  expect_identical(L$data[[2]]$line$shape, "linear")
-  expect_equal(L$data[[2]]$line$width, 8)
+  p <- ggplot(df) + xlim(c(-5, 5)) + ylim(c(-5, 5)) + 
+    geom_abline(aes(intercept = b, slope = m))
   
-  expect_identical(L$data[[1]]$showlegend, FALSE)
-  expect_identical(L$data[[2]]$showlegend, FALSE)
+  L <- expect_traces(gg, 2, "multiple-abline")
+  expect_identical(L$layout$xaxis$range, c(-5, 5))
+  expect_identical(L$layout$yaxis$range, c(-5, 5))
+  expect_identical(L$data[[1]]$y[1:2], 
+                   df$m[1] * L$data[[1]]$x[1:2] + df$b[1])
 })
+
+
+

From cba55cc2f4863db884851a52986320b869391dda Mon Sep 17 00:00:00 2001
From: cpsievert <cpsievert1@gmail.com>
Date: Mon, 17 Aug 2015 15:47:31 -0500
Subject: [PATCH 14/16] some test fixes

---
 R/trace_generation.R                | 16 +++-------------
 tests/testthat/test-ggplot-abline.R |  9 +++------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/R/trace_generation.R b/R/trace_generation.R
index 617bda6914..7ac8189d15 100644
--- a/R/trace_generation.R
+++ b/R/trace_generation.R
@@ -5,16 +5,11 @@
 #' @return list representing a layer, with corresponding aesthetics, ranges, and groups.
 #' @export
 layer2traces <- function(l, d, misc) {
-  not.na <- function(df){
-    na.mat <- is.na(df)
-    to.exclude <- apply(na.mat, 1, any)
-    df[!to.exclude, ]
-  }
   
   g <- list(
     geom = type(l, "geom"),
-    data = not.na(d),
-    prestats.data = not.na(l$prestats.data)
+    data = na.omit(d),
+    prestats.data = na.omit(l$prestats.data)
   )
   #if (grepl("line", g$geom)) browser()
   # needed for when group, etc. is an expression.
@@ -137,11 +132,7 @@ layer2traces <- function(l, d, misc) {
   
   # First convert to a "basic" geom, e.g. segments become lines.
   convert <- toBasic[[g$geom]]
-  basic <- if(is.null(convert)){
-    g
-  }else{
-    convert(g)
-  }
+  basic <- if (is.null(convert)) g else convert(g)
   # Then split on visual characteristics that will get different
   # legend entries.
   data.list <- if (basic$geom %in% names(markSplit)) {
@@ -374,7 +365,6 @@ toBasic <- list(
     b <- g$data$intercept
     xmin <- unique(g$prestats.data$globxmin)
     xmax <- unique(g$prestats.data$globxmax)
-    browser()
     l <- list()
     for (i in seq_len(N)) {
       # the NAs tell plotly to draw different traces for each line
diff --git a/tests/testthat/test-ggplot-abline.R b/tests/testthat/test-ggplot-abline.R
index 3099727afe..bfc48d76d4 100644
--- a/tests/testthat/test-ggplot-abline.R
+++ b/tests/testthat/test-ggplot-abline.R
@@ -5,7 +5,7 @@ context("Abline")
 expect_traces <- function(gg, n.traces, name) {
   stopifnot(is.ggplot(gg))
   stopifnot(is.numeric(n.traces))
-  L <- save_outputs(gg, paste0("cookbook-axes-", name))
+  L <- save_outputs(gg, paste0("abline-", name))
   all.traces <- L$data
   no.data <- sapply(all.traces, function(tr) {
     is.null(tr[["x"]]) && is.null(tr[["y"]])
@@ -23,7 +23,7 @@ test_that("Second trace be the a-b line", {
   gg <- ggplot(df) + geom_point(aes(x, y)) +
     geom_abline(intercept = 1.1, slope = 0.9, colour = "red", size = 4)
   
-  L <- expect_traces(gg, 2, "single-abline")
+  L <- expect_traces(gg, 2, "single")
 
   dat <- L$data[[2]]
   expect_true(dat$x[1] <= 0)
@@ -43,12 +43,9 @@ test_that("abline aesthetics", {
   p <- ggplot(df) + xlim(c(-5, 5)) + ylim(c(-5, 5)) + 
     geom_abline(aes(intercept = b, slope = m))
   
-  L <- expect_traces(gg, 2, "multiple-abline")
+  L <- expect_traces(p, 2, "multiple")
   expect_identical(L$layout$xaxis$range, c(-5, 5))
   expect_identical(L$layout$yaxis$range, c(-5, 5))
   expect_identical(L$data[[1]]$y[1:2], 
                    df$m[1] * L$data[[1]]$x[1:2] + df$b[1])
 })
-
-
-

From 98c488024fe6f9aad4d16888b05c8357a2e1f535 Mon Sep 17 00:00:00 2001
From: cpsievert <cpsievert1@gmail.com>
Date: Tue, 18 Aug 2015 17:12:29 -0500
Subject: [PATCH 15/16] implement abline/hline/vline as paths

---
 R/trace_generation.R | 75 ++++++++++++++++++++++++++------------------
 1 file changed, 45 insertions(+), 30 deletions(-)

diff --git a/R/trace_generation.R b/R/trace_generation.R
index 7ac8189d15..7e27ed4a7c 100644
--- a/R/trace_generation.R
+++ b/R/trace_generation.R
@@ -331,6 +331,51 @@ toBasic <- list(
     g$data <- g$data[order(g$data$x), ]
     group2NA(g, "path")
   },
+  abline=function(g) {
+    m <- g$data$slope
+    b <- g$data$intercept
+    # replicate each row twice (since each line needs 2 points)
+    idx <- rep(seq_len(nrow(g$data)), 2)
+    g$data <- g$data[idx, ]
+    g$data <- cbind(
+      g$data,
+      x = with(g$prestats.data, c(globxmin, globxmax)),
+      y = with(g$prestats.data, c(globxmin * m + b, globxmax * m + b))
+    )
+    g$data <- g$data[order(g$data$x), ]
+    group2NA(g, "path")
+  },
+  hline=function(g) {
+    if (is.factor(g$data$x)) {
+      xstart <- as.character(sort(g$data$x)[1])
+      xend <- as.character(sort(g$data$x)[length(g$data$x)])
+    } else {
+      xstart <- min(g$prestats.data$globxmin)
+      xend <- max(g$prestats.data$globxmax)
+    }
+    int <- g$data$yintercept
+    # replicate each row twice (since each line needs 2 points)
+    idx <- rep(seq_len(nrow(g$data)), 2)
+    g$data <- g$data[idx, ]
+    g$data <- cbind(
+      g$data,
+      x = int[idx],
+      y = c(xstart, xend)
+    )
+    group2NA(g, "path")
+  },
+  vline=function(g) {
+    int <- g$data$xintercept
+    # replicate each row twice (since each line needs 2 points)
+    idx <- rep(seq_len(nrow(g$data)), 2)
+    g$data <- g$data[idx, ]
+    g$data <- cbind(
+      g$data,
+      x = int[idx],
+      y = with(g$prestats.data, c(globymin, globymax))
+    )
+    group2NA(g, "path")
+  },
   boxplot=function(g) {
     # Preserve default colour values usign fill:
     if (!is.null(g$data$fill)) {
@@ -359,36 +404,6 @@ toBasic <- list(
     g$data <- g$prestats.data
     g
   },
-  abline=function(g) {
-    N <- nrow(g$data)
-    m <- g$data$slope
-    b <- g$data$intercept
-    xmin <- unique(g$prestats.data$globxmin)
-    xmax <- unique(g$prestats.data$globxmax)
-    l <- list()
-    for (i in seq_len(N)) {
-      # the NAs tell plotly to draw different traces for each line
-      l$x <- c(l$x, xmin, xmax, NA) 
-      l$y <- c(l$y, xmin * m[i] + b[i], xmax * m[i] + b[i], NA)
-    }
-    g$params$ablines <- data.frame(l)
-    g
-  },
-  hline=function(g) {
-    if (is.factor(g$data$x)) {
-      g$params$xstart <- as.character(sort(g$data$x)[1])
-      g$params$xend <- as.character(sort(g$data$x)[length(g$data$x)])
-    } else {
-      g$params$xstart <- min(g$prestats.data$globxmin)
-      g$params$xend <- max(g$prestats.data$globxmax)
-    }
-    g
-  },
-  vline=function(g) {
-    g$params$ystart <- min(g$prestats.data$globymin)
-    g$params$yend <- max(g$prestats.data$globymax)
-    g
-  },
   point=function(g) {
     if ("size" %in% names(g$data)) {
       g$params$sizemin <- min(g$prestats.data$globsizemin)

From 404f19c85cfa1b07a027340ab3d797bd4e78b8a8 Mon Sep 17 00:00:00 2001
From: cpsievert <cpsievert1@gmail.com>
Date: Tue, 18 Aug 2015 17:13:31 -0500
Subject: [PATCH 16/16] improve abline/vline tests

---
 R/plotly_POST.R                     |  2 +-
 tests/testthat/test-ggplot-abline.R |  7 ++--
 tests/testthat/test-ggplot-vline.R  | 62 ++++++++++++++++++++---------
 3 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/R/plotly_POST.R b/R/plotly_POST.R
index 3f49149905..58da4b3112 100644
--- a/R/plotly_POST.R
+++ b/R/plotly_POST.R
@@ -35,7 +35,7 @@ plotly_POST <- function(x) {
   # filename & fileopt are keyword arguments required by the API
   # (note they can also be specified by the user)
   if (!is.null(x$url) || !is.null(kwargs$filename)) kwargs$fileopt <- "overwrite"
-  if (is.null(kwargs$filename)) {
+  if (is.null(kwargs$filename) || kwargs$filename == "") {
     kwargs$filename <- 
       as.character(kwargs$layout$title) %||% 
       paste(
diff --git a/tests/testthat/test-ggplot-abline.R b/tests/testthat/test-ggplot-abline.R
index bfc48d76d4..8052ba34f3 100644
--- a/tests/testthat/test-ggplot-abline.R
+++ b/tests/testthat/test-ggplot-abline.R
@@ -36,12 +36,13 @@ test_that("Second trace be the a-b line", {
 
 test_that("abline aesthetics", {
   df <- data.frame(
-    m = c(2, -3, 0.1),
-    b = c(1, 0, -1)
+    m = c(5, 5, 5, -5, -5, -5),
+    b = c(10, 0, -10, 10, 0, -10),
+    type = factor(c(1, 2, 3, 3, 2, 1))
   )
   
   p <- ggplot(df) + xlim(c(-5, 5)) + ylim(c(-5, 5)) + 
-    geom_abline(aes(intercept = b, slope = m))
+    geom_abline(aes(intercept = b, slope = m, linetype = type))
   
   L <- expect_traces(p, 2, "multiple")
   expect_identical(L$layout$xaxis$range, c(-5, 5))
diff --git a/tests/testthat/test-ggplot-vline.R b/tests/testthat/test-ggplot-vline.R
index 5ce1e93988..96df1fb8d1 100644
--- a/tests/testthat/test-ggplot-vline.R
+++ b/tests/testthat/test-ggplot-vline.R
@@ -1,32 +1,46 @@
 context("Vline")
-# Vertical line
 
-x1 <- seq(from=0, to=3.5, by=0.5)
-x2 <- x1 * 0.95
-df <- data.frame("x1"=x1, "x2"=x2)
-gg <- ggplot(df) + geom_point(aes(x=x1, y=x2))
+expect_traces <- function(gg, n.traces, name) {
+  stopifnot(is.ggplot(gg))
+  stopifnot(is.numeric(n.traces))
+  L <- save_outputs(gg, paste0("vline-", name))
+  all.traces <- L$data
+  no.data <- sapply(all.traces, function(tr) {
+    is.null(tr[["x"]]) && is.null(tr[["y"]])
+  })
+  has.data <- all.traces[!no.data]
+  expect_equal(length(has.data), n.traces)
+  list(traces=has.data, layout=L$layout)
+}
+
+x <- seq(0, 3.5, by = 0.5)
+y <- x * 0.95
+df <- data.frame(x, y)
+gg <- ggplot(df) + geom_point(aes(x, y))
 
 test_that("second trace be the vline", {
-  gg <- gg + geom_vline(xintercept=1.1, colour="green", size=3)
+  gg <- gg + 
+    geom_vline(xintercept = 1.1, colour = "green", size = 3)
   
-  L <- save_outputs(gg, "vline")
+  L <- expect_traces(gg, 2, "single")
+  dat <- L$data[[2]]
   
-  expect_equal(length(L$data), 2)
-  expect_equal(L$data[[2]]$x[1], 1.1)
-  expect_true(L$data[[2]]$y[1] <= 0)
-  expect_true(L$data[[2]]$y[2] >= 3.325)
-  expect_identical(L$data[[2]]$mode, "lines")
-  expect_identical(L$data[[2]]$line$shape, "linear")
-  expect_equal(L$data[[2]]$line$width, 6)
-  expect_identical(L$data[[2]]$line$color, "rgb(0,255,0)")
+  expect_equal(dat$x[1], 1.1)
+  expect_true(dat$y[1] <= 0)
+  expect_true(dat$y[2] >= 3.325)
+  expect_identical(dat$mode, "lines")
+  expect_identical(dat$line$shape, "linear")
+  expect_equal(dat$line$width, 6)
+  expect_identical(dat$line$color, "rgb(0,255,0)")
 })
 
 test_that("vector xintercept results in multiple vertical lines", {
-  gg <- gg + geom_vline(xintercept=1:2, colour="blue", size=3)
-  
-  L <- save_outputs(gg, "vline-multiple")
+  gg <- gg + 
+    geom_vline(xintercept = 1:2, colour = "blue", size = 3)
   
-  expect_equal(length(L$data), 3)
+  L <- expect_traces(gg, 2, "multiple")
+  dat <- L$data[[2]]
+
   expect_equal(L$data[[2]]$x[1], 1)
   expect_equal(L$data[[3]]$x[1], 2)
   expect_true(L$data[[3]]$y[1] <= 0)
@@ -36,3 +50,13 @@ test_that("vector xintercept results in multiple vertical lines", {
   expect_equal(L$data[[3]]$line$width, 6)
   expect_identical(L$data[[3]]$line$color, "rgb(0,0,255)")
 })
+
+test_that("vline aesthetics", {
+  df <- data.frame(
+    m = c(2, -3, 0.1),
+    b = c(1, 0, -1)
+  )
+  
+  p <- ggplot(df) + xlim(c(-5, 5)) + ylim(c(-5, 5)) + 
+    geom_vline(aes(xintercept = m, linetype = factor(b)))
+})