Merge branch 'master' of github.com:ropensci/plotly into fix/ns

Author: cpsievert

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: plotly
 Title: Create Interactive Web Graphics via 'plotly.js'
-Version: 4.3.4
+Version: 4.3.5
 Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
     email = "cpsievert1@gmail.com"),
     person("Chris", "Parmer", role = c("aut", "cph"),
@@ -17,7 +17,7 @@ Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
     email = "pedro@plot.ly"))
 License: MIT + file LICENSE
 Description: Easily translate 'ggplot2' graphs to an interactive web-based version and/or create custom web-based visualizations directly from R. Once uploaded to a 'plotly' account, 'plotly' graphs (and the data behind them) can be viewed and modified in a web browser.
-URL: https://plot.ly/r, https://github.com/ropensci/plotly
+URL: https://plot.ly/r, https://cpsievert.github.io/plotly_book/, https://github.com/ropensci/plotly
 BugReports: https://github.com/ropensci/plotly/issues
 Depends:
     R (>= 2.10),
@@ -37,6 +37,7 @@ Imports:
     hexbin,
     lazyeval (>= 0.2.0)
 Suggests:
+    MASS,
     maps,
     ggthemes,
     GGally,

NAMESPACE

@@ -1,5 +1,8 @@
 # Generated by roxygen2: do not edit by hand
 
+S3method(arrange_,plotly)
+S3method(distinct_,plotly)
+S3method(filter_,plotly)
 S3method(geom2trace,GeomBar)
 S3method(geom2trace,GeomBlank)
 S3method(geom2trace,GeomBoxplot)
@@ -14,12 +17,19 @@ S3method(geom2trace,default)
 S3method(ggplotly,ggmatrix)
 S3method(ggplotly,ggplot)
 S3method(ggplotly,plotly)
+S3method(group_by_,plotly)
+S3method(groups,plotly)
 S3method(layout,matrix)
 S3method(layout,plotly)
+S3method(mutate_,plotly)
 S3method(plotly_build,gg)
 S3method(plotly_build,list)
 S3method(plotly_build,plotly)
 S3method(print,plotly_figure)
+S3method(rename_,plotly)
+S3method(select_,plotly)
+S3method(slice_,plotly)
+S3method(summarise_,plotly)
 S3method(to_basic,GeomAbline)
 S3method(to_basic,GeomArea)
 S3method(to_basic,GeomBoxplot)
@@ -45,6 +55,8 @@ S3method(to_basic,GeomTile)
 S3method(to_basic,GeomViolin)
 S3method(to_basic,GeomVline)
 S3method(to_basic,default)
+S3method(transmute_,plotly)
+S3method(ungroup,plotly)
 export("%>%")
 export(add_area)
 export(add_bars)
@@ -68,29 +80,25 @@ export(add_text)
 export(add_trace)
 export(arrange)
 export(arrange_)
-export(arrange_.plotly)
 export(as.widget)
+export(as_widget)
 export(config)
 export(distinct)
 export(distinct_)
-export(distinct_.plotly)
 export(do)
 export(do_)
 export(embed_notebook)
 export(event_data)
 export(export)
 export(filter)
 export(filter_)
-export(filter_.plotly)
 export(geom2trace)
 export(get_figure)
 export(gg2list)
 export(ggplotly)
 export(group_by)
 export(group_by_)
-export(group_by_.plotly)
 export(groups)
-export(groups.plotly)
 export(hide_colorbar)
 export(hide_guides)
 export(hide_legend)
@@ -99,7 +107,6 @@ export(last_plot)
 export(layout)
 export(mutate)
 export(mutate_)
-export(mutate_.plotly)
 export(offline)
 export(plot_ly)
 export(plotly)
@@ -112,29 +119,23 @@ export(plotly_empty)
 export(plotly_json)
 export(rename)
 export(rename_)
-export(rename_.plotly)
 export(renderPlotly)
 export(schema)
 export(select)
 export(select_)
-export(select_.plotly)
 export(signup)
 export(slice)
 export(slice_)
-export(slice_.plotly)
 export(style)
 export(subplot)
 export(summarise)
 export(summarise_)
-export(summarise_.plotly)
 export(toRGB)
 export(toWebGL)
 export(to_basic)
 export(transmute)
 export(transmute_)
-export(transmute_.plotly)
 export(ungroup)
-export(ungroup.plotly)
 import(ggplot2)
 importFrom(base64enc,base64encode)
 importFrom(dplyr,arrange)

NEWS.md

@@ -1,3 +1,19 @@
+# 4.3.5 --
+
+## NEW FEATURES
+
+* The internal `as_widget()` function was exported to make it easier to convert a list
+(adhering to the plotly spec) to a plotly htmlwidget object. This should only be needed when "manually" editing the underlying list object.
+* Warnings about missing attributes now supply information about the relevant trace.
+
+## CHANGES
+
+* vignettes were removed and that documentation will now be hosted at <https://cpsievert.github.io/plotly_book/>
+
+## BUG FIXES
+
+* Get event_data() working with subplots. Fixes #663
+
 # 4.3.4 -- 31 August 2016
 
 ## CHANGES

R/add.R

@@ -24,18 +24,20 @@ add_data <- function(p, data = NULL) {
 #' @param p a plotly or ggplot object.
 #' @param ... These arguments are documented in the references section below.
 #' Note that acceptable arguments depend on the trace type.
-#' @param x the x variable.
-#' @param y the y variable.
-#' @param text textual labels.
-#' @param ymin a variable used to define the lower boundary of a polygon.
-#' @param ymax a variable used to define the upper boundary of a polygon.
 #' @param color Either a variable name or a vector to use for color mapping.
-#' @param alpha alpha channel applied to color (on 0-1 scale).
 #' @param symbol Either a variable name or a (discrete) vector to use for symbol encoding.
 #' @param size A variable name or numeric vector to encode the size of markers.
 #' @param linetype Either a variable name or a (discrete) vector to use for linetype encoding.
 #' @param data A data frame to associate with this trace (optional). If not 
 #' provided, arguments are evaluated using the data frame in \code{\link{plot_ly}()}.
+#' @param z a numeric matrix
+#' @param x the x variable.
+#' @param y the y variable.
+#' @param text textual labels.
+#' @param ymin a variable used to define the lower boundary of a polygon.
+#' @param ymax a variable used to define the upper boundary of a polygon.
+#' @param xend "final" x position (in this context, x represents "start")
+#' @param yend "final" y position (in this context, y represents "start")
 #' @seealso \code{\link{plot_ly}()}
 #' @references \url{https://plot.ly/r/reference/}
 #' @author Carson Sievert
@@ -413,6 +415,7 @@ add_surface <- function(p, z = NULL, ...) {
 
 #' @inheritParams add_trace
 #' @rdname add_trace
+#' @param geo anchor this trace on which geo object?
 #' @export
 #' @examples 
 #' plot_ly() %>% add_scattergeo()

R/ggplotly.R

@@ -15,7 +15,7 @@
 #' @param originalData should the "original" or "scaled" data be returned?
 #' @param source Only relevant for \link{event_data}.
 #' @param ... arguments passed onto methods.
-#' @seealso \link{signup}, \link{plot_ly}
+#' @seealso \code{\link{signup}()}, \code{\link{plot_ly}()}
 #' @return a plotly object
 #' @export
 #' @author Carson Sievert

R/group2NA.R

@@ -54,10 +54,11 @@ group2NA <- function(data, groupNames = "group", nested = NULL, ordered = NULL,
   for (i in c(nested, groupNames)) {
     data <- dplyr::group_by_(data, i, add = TRUE)
   }
+  # TODO: this is slow, can it be done with dplyr::slice()?
   d <- if (retrace.first) {
-    dplyr::do(data, rbind(., .[1,], NA))
+    dplyr::do(data, rbind.data.frame(., .[1,], NA))
   } else {
-    dplyr::do(data, rbind(., NA))
+    dplyr::do(data, rbind.data.frame(., NA))
   }
   # TODO: how to drop the NAs separating the nested values? Does it even matter?
   # d <- dplyr::ungroup(d)

R/helpers.R

@@ -2,7 +2,7 @@
 #'
 #' @param p a plotly object.
 #' @export
-#' @seealso \link{hide_legend}, \link{hide_colorbar}
+#' @seealso \code{\link{hide_legend}()}, \code{\link{hide_colorbar}()}
 #'
 
 hide_guides <- function(p) {
@@ -14,7 +14,7 @@ hide_guides <- function(p) {
 #' 
 #' @param p a plotly object.
 #' @export
-#' @seealso \link{hide_legend}
+#' @seealso \code{\link{hide_legend}()}
 #' @examples
 #' 
 #' plot_ly(economics, x = ~date, y = ~unemploy / pop, color = ~pop) %>%
@@ -38,7 +38,7 @@ hide_colorbar <- function(p) {
 #' 
 #' @param p a plotly object.
 #' @export
-#' @seealso \link{hide_legend}
+#' @seealso \code{\link{hide_legend}()}
 #' @examples 
 #' 
 #' plot_ly(economics, x = ~date, y = ~unemploy / pop, color = ~pop) %>%
@@ -82,7 +82,9 @@ toWebGL <- function(p) {
 
 #' Create a complete empty plotly graph.
 #' 
-#' Useful when used with \link{subplot}
+#' Useful when used with \code{\link{subplot}()}
+#' 
+#' @param ... arguments passed onto \code{\link{plot_ly}()}
 #' 
 #' @export
 plotly_empty <- function(...) {