merge with master

Author: cpsievert

.travis.yml

@@ -5,7 +5,7 @@ before_install:
   - chmod 755 ./travis-tool.sh
   - ./travis-tool.sh bootstrap
   # password is encrypted below
-  - echo "Sys.setenv('plotly_username' = 'dfvd')" > ~/.Rprofile
+  - echo "Sys.setenv('plotly_username' = 'RTestBot3000')" > ~/.Rprofile
 
 install:
   - ./travis-tool.sh install_deps
@@ -20,16 +20,11 @@ script:
 
 after_success:
   - cd ../plotly-test-table
-  - ls -R
   - Rscript ../plotly/inst/build-push-comment.R
 
 env:
   global:
     # plotly_api_key (for posting to plot.ly)
-    - secure: "eHO4OUmgLusU9i4xSvr3daZxnsMZw3x4FH8BYVEC8Ja+Ey6kkAFFSh2iAC/CqewEYJ7I/M8aIJYqlyTMGRYUgy36WU7iWHAGgaZOU8fIB5dWzMwHbIvS4Naq2sdU7lRT7sxkS+40K1+rplpWDoLF2yt8vSRWo9rjNzp+yc8PjXM="
+    - secure: "UAETDsmeXkXm9eUpZa3JTm8/cv+jyLmArXE0TQD0yQNICFNPkGeNergoQmkesRqG+ifLu6V1lPXu1XlqQPdXY60clUHThDN+AjsBmcv9F170k6RtBSV8pIKL9fsW8t0v/maEet86qOSf3cNa5+gK8GjBH1pmLrN2rF9r7RhwUdg="
     # GITHUB_PAT (for pushing to plotly-test-table)
-    - secure: "LHJONgWOo+98vNeFLI7LSJU3RtbMVszlI79GB8CcXmc2mlgM/UtZ5b6RnkNlhmg3Gj1/uObfm/rIybVTwuS1yNpeKv73+gsZOYhobVXiUGVxdRFG/mg5mbqwyWkkuofjPGFlMZCEMgHim37eZzgjSibwVH1LClRDsCoFMCgvgV0="
-    # plotlyjs_full (link to the full offline bundle)
-    - secure: "ivxfqGwbzpBpVJe+jVcOBktcmLrT38W/ZapAk/FNDu+yaBhag1eCYErAPPx6Snc4GzwatMt22v4SxAqXQF4SAhTRtmrWVaWnbhzuNqpTkiS6IKEd6EqaoyUZvUTgXh1ruyik00zl3ET9898O3vFfqafodljE0lCLVICHq6ANo68="
-    # plotlyjs_no_jq (link to the offline bundle w/o jQuery)
-    - secure: "i5cYEs2lCFSYgrSTHMmzzs8hRwAwiz89GpgM16fqUDQz8T1QMWofNugQInS7fIfKL36FoTz8BaiLs2D98/2kDkkZ0LTHnfrdrY9PO+7D+CmL8QeLLp4atBT0i682nwy8RzEqlvB8yAVQo/i0Eh8tmT97pppddsxttZKoUidfOeA=" 
+    - secure: "LHJONgWOo+98vNeFLI7LSJU3RtbMVszlI79GB8CcXmc2mlgM/UtZ5b6RnkNlhmg3Gj1/uObfm/rIybVTwuS1yNpeKv73+gsZOYhobVXiUGVxdRFG/mg5mbqwyWkkuofjPGFlMZCEMgHim37eZzgjSibwVH1LClRDsCoFMCgvgV0="    

DESCRIPTION

@@ -1,26 +1,23 @@
 Package: plotly
-Title: Create interactive web-based graphs via plotly's API
-Version: 1.0.0
-Authors@R: c(person("Chris", "Parmer", role = c("aut", "cph"),
+Title: Create Interactive Web Graphics via Plotly's JavaScript Graphing Library
+Version: 2.0.6
+Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
+    email = "[email protected]"),
+    person("Chris", "Parmer", role = c("aut", "cph"),
     email = "[email protected]"),
+    person("Toby", "Hocking", role = "aut",
+    email = "[email protected]"),
     person("Scott", "Chamberlain", role = "aut",
     email = "[email protected]"),
     person("Karthik", "Ram", role = "aut",
     email = "[email protected]"),
-    person("Toby", "Hocking", role = "aut",
-    email = "[email protected]"),
     person("Marianne", "Corvellec", role = "aut",
     email = "[email protected]"),
     person("Pedro", "Despouy", role = "aut",
-    email = "[email protected]"),
-    person("Carson", "Sievert", role = c("aut", "cre"),
-    email = "[email protected]"))
+    email = "[email protected]"))
 License: MIT + file LICENSE
-Description: Create interactive web-based graphs via plotly's API.
-    Easily translate ggplot2 plots to plotly and/or create custom plotly graphs. 
-    Once uploaded to a plotly account, plotly graphs (and the data behind them) 
-    can be viewed and modified in a web browser.
-URL: https://github.com/ropensci/plotly
+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
 BugReports: https://github.com/ropensci/plotly/issues
 Depends:
     ggplot2
@@ -30,14 +27,24 @@ Imports:
     jsonlite,
     magrittr,
     digest,
-    viridis
+    viridis,
+    base64enc,
+    htmlwidgets,
+    plyr
 Suggests:
     dplyr,
     maps,
     testthat,
     knitr,
     devtools,
     shiny,
+    htmltools,
+    curl,
     rmarkdown,
-    RColorBrewer
+    RColorBrewer,
+    Rserve,
+    RSclient,
+    broom
 LazyData: true
+VignetteBuilder: knitr
+RoxygenNote: 5.0.1

NAMESPACE

@@ -1,16 +1,17 @@
-# Generated by roxygen2 (4.1.1): do not edit by hand
+# Generated by roxygen2: do not edit by hand
 
-S3method(print,offline)
+S3method(print,figure)
 S3method(print,plotly)
 export("%>%")
 export(add_trace)
+export(config)
 export(embed_notebook)
 export(get_figure)
 export(gg2list)
 export(ggplot_build2)
 export(ggplotly)
 export(group2NA)
-export(knit_print.offline)
+export(knit_print.figure)
 export(knit_print.plotly)
 export(last_plot)
 export(layer2traces)
@@ -20,6 +21,7 @@ export(paramORdefault)
 export(plot_ly)
 export(plotly)
 export(plotlyOutput)
+export(plotly_IMAGE)
 export(plotly_POST)
 export(plotly_build)
 export(plotly_empty)
@@ -31,4 +33,20 @@ export(toRGB)
 import(ggplot2)
 import(httr)
 import(jsonlite)
+importFrom(base64enc,base64encode)
+importFrom(grDevices,col2rgb)
+importFrom(htmlwidgets,createWidget)
+importFrom(htmlwidgets,shinyRenderWidget)
+importFrom(htmlwidgets,shinyWidgetOutput)
+importFrom(htmlwidgets,sizingPolicy)
 importFrom(magrittr,"%>%")
+importFrom(plyr,ddply)
+importFrom(plyr,join)
+importFrom(plyr,summarise)
+importFrom(stats,setNames)
+importFrom(utils,browseURL)
+importFrom(utils,data)
+importFrom(utils,getFromNamespace)
+importFrom(utils,modifyList)
+importFrom(utils,packageVersion)
+importFrom(viridis,viridis)

NEWS

@@ -1,6 +1,79 @@
+2.0.6 -- 2 Dec 2015
+
+Upgrade to plotlyjs 1.1.1. Fixes #319.
+
+2.0.5 -- 1 Dec 2015
+
+Fix for legend names. See #236.
+
+2.0.4 -- 28 Nov 2015
+
+Fix #313.
+
+2.0.3 -- 18 Nov 2015
+
+Fixed bug causing knitr options to be ignored. Also added VignetteBuilder to DESCRIPTION to vignette is available.
+
+2.0.2 -- 17 Nov 2015
+
+Using plotly_build() on a ggplot object should always return a plotly object
+
+2.0.1 -- 17 Nov 2015
+
+Better printing of server figures. Documentation and other fixes for initial CRAN release!
+
+2.0.0 -- 2 Nov 2015
+
+Added a dependency on htmlwidgets and 'offline' plots are now the default. If you want to create a figure on a plotly server, you need to use `plotly_POST()`. Also added a `config()` function to control the default appearance of the interactive plot
+
+1.0.10 -- 3 Nov 2015
+
+Fixed #292.
+
+1.0.9 -- 28 Sep 2015
+
+Fixed filename, fileopt arguments in plot_ly. Specifying the same filename will now overwrite the plot if it exists.
+
+1.0.8 -- 14 Sep 2015
+
+Added the plotly_IMAGES() function which interfaces to the images endpoint https://api.plot.ly/v2/#images
+
+Details -> https://github.com/ropensci/plotly/pull/279
+
+1.0.7 -- 26 Aug 2015
+
+See https://github.com/ropensci/plotly/pull/275
+
+1.0.6 -- 25 Aug 2015
+
+Fix a bug with subplot domain calculations (see https://github.com/ropensci/plotly/pull/274)
+
+1.0.5 -- 20 Aug 2015
+
+Fix issue converting plotly offline markdown documents to HTML when using `markdown::markdownToHTML`
+
+1.0.4 -- 14 Aug 2015
+
+Bug fix for subplot. See #265
+
+1.0.3 -- 7 Aug 2015
+
+Improved legend positioning. See #241
+
+1.0.2 -- 2 Aug 2015
+
+* last_plot() will now look for the last plotly object; if not found, it will try to find the last ggplot object.
+* Officially added the filename, fileopt, and world_readable arguments to plot_ly() and ggplotly().
+* If plotly offline is not available, the shiny.launch.browser option is changed to open a web brower. See #245.
+* Various namespace/documentation improvements for R CMD check.
+
+1.0.1 -- 2 Aug 2015
+
+Removed the stream() function as it wasn't ready to be included.
+
 1.0.0 -- 31 July 2015
 
-A major reworking of package internals which includes a few backwards incompatible changes. 
+A major reworking of package internals which includes a few backwards incompatible changes.
 
 Major changes include:
 
@@ -30,7 +103,7 @@ Let gg2list() return a figure object (backwards incompatible change).
 
 0.5.29 -- 16 April 2015
 
-geom_density() as filled area chart #202 
+geom_density() as filled area chart #202
 
 0.5.28 -- 15 April 2015
 

R/build_function.R

@@ -10,23 +10,29 @@
 #' @keywords internal
 #' @export
 ggplot_build2 <- local({
-  # Get body of the original function, in list form
-  ggplot_build2 <- ggplot2::ggplot_build
-  g_b <- as.list(body(ggplot_build2))
-  
-  # Find line where we want to insert new code
-  line_after <- quote(data <- calculate_stats(panel, data, layers))
-  idx <- vapply(g_b, identical, line_after, FUN.VALUE=TRUE)
-  idx <- which(idx)
-  
-  # Insert new code before that line
-  new_line <- quote(prestats.data <- data)
-  return_value <- quote(list(data=data, panel=panel, plot=plot,
-                             prestats.data=prestats.data))
-  g_b2 <- c(g_b[seq(1, idx-1)], list(new_line), g_b[seq(idx, length(g_b)-1)],
-            return_value)
-  
-  # Assign the modified body back into the function
-  body(ggplot_build2) <- as.call(g_b2)
-  ggplot_build2
+  tryCatch({
+    # Get body of the original function, in list form
+    ggplot_build2 <- ggplot2::ggplot_build
+    g_b <- as.list(body(ggplot_build2))
+    
+    # Find line where we want to insert new code
+    line_after <- quote(data <- calculate_stats(panel, data, layers))
+    idx <- vapply(g_b, identical, line_after, FUN.VALUE=TRUE)
+    idx <- which(idx)
+    
+    if (length(idx) != 1) {
+      warning("ggplotly() is not compatible with this version of ggplot2", call. = F)
+    } else {
+      # Insert new code before that line
+      new_line <- quote(prestats.data <- data)
+      return_value <- quote(list(data=data, panel=panel, plot=plot,
+                                 prestats.data=prestats.data))
+      g_b2 <- c(g_b[seq(1, idx-1)], list(new_line), g_b[seq(idx, length(g_b)-1)],
+                return_value)
+      
+      # Assign the modified body back into the function
+      body(ggplot_build2) <- as.call(g_b2)
+    }
+    ggplot_build2
+  })
 })

R/deprecated.R

@@ -0,0 +1,49 @@
+#' Main interface to plotly 
+#' 
+#' Deprecated: see \link{signup} for credentials/configuration storage details.
+#' See \link{ggplotly} for the new ggplot2 interface.
+#' 
+#' @param username plotly username
+#' @param key plotly API key
+#' @export
+plotly <- function(username, key) {
+  
+  if (!missing(username)) {
+    message("Storing 'username' as the environment variable 'plotly_username'")
+    Sys.setenv("plotly_username" = username)
+  } else {
+    usr <- verify("username")
+  }
+  if (!missing(key)) {
+    message("Storing 'key' as the environment variable 'plotly_api_key'")
+    Sys.setenv("plotly_api_key" = key)
+  } else {
+    key <- verify("api_key")
+  }
+  
+  .Deprecated("ggplotly")
+  .Deprecated("plot_ly")
+  invisible(NULL)
+}
+
+
+#' Plotly Offline
+#' 
+#' Deprecated in version 2.0 (offline plots are now the default)
+#' 
+#' @param p a plotly object
+#' @param height A valid CSS unit. (like "100\%", "600px", "auto") or a number, 
+#' which will be coerced to a string and have "px" appended.
+#' @param width A valid CSS unit. (like "100\%", "600px", "auto") or a number, 
+#' which will be coerced to a string and have "px" appended.
+#' @param out_dir a directory to place the visualization. 
+#' If \code{NULL}, a temporary directory is used when the offline object is printed.
+#' @param open_browser open the visualization after creating it?
+#' @author Carson Sievert
+#' @return a plotly object of class "offline"
+#' @export
+
+offline <- function(p, height, width, out_dir, open_browser) {
+  .Deprecated("plot_ly")
+  p
+}