merge conflicts with master

Author: cpsievert

DESCRIPTION

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

NAMESPACE

@@ -1,4 +1,4 @@
-# Generated by roxygen2 (4.1.0): do not edit by hand
+# Generated by roxygen2 (4.1.1): do not edit by hand
 
 export(gg2list)
 export(ggplot_build2)

NEWS

@@ -1,7 +1,11 @@
-0.5.30 -- 5 May 2015
+0.5.31 -- 5 May 2015
 
 Add test-cookbook-lines.R and fix bugs that showed up in those tests.
 
+0.5.30 -- 4 May 2015
+
+Let gg2list() return a figure object.
+
 0.5.29 -- 16 April 2015
 
 geom_density() as filled area chart #202 

R/ggplotly.R

@@ -71,9 +71,9 @@ markSplit <- c(markLegends,list(boxplot=c("x")))
 #' Convert a ggplot to a list.
 #' @import ggplot2
 #' @param p ggplot2 plot.
-#' @return list representing a ggplot.
+#' @return figure object (list with names "data" and "layout").
 #' @export
-gg2list <- function(p){
+gg2list <- function(p) {
   if(length(p$layers) == 0) {
     stop("No layers in plot")
   }
@@ -906,7 +906,8 @@ gg2list <- function(p){
     flipped.layout[["yaxis"]] <- x
   }
 
-  flipped.traces$kwargs <- list(layout=flipped.layout)
+  fig <- list(data=flipped.traces, layout=flipped.layout)
+
+  fig
 
-  flipped.traces
 }

R/plotly-package.r

@@ -7,7 +7,7 @@
 #' \itemize{
 #'  \item Package: plotly
 #'  \item Type: Package
-#'  \item Version: 0.5.20
+#'  \item Version: 0.5.30
 #'  \item Date: 2014-03-07
 #'  \item License: MIT
 #' }

R/plotly.R

@@ -82,14 +82,14 @@ For more help, see https://plot.ly/R or contact <[email protected]>.")
 
   # public attributes/methods that the user has access to
   pub <- list(username=username, key=key, filename="from api", fileopt=NULL,
-              version="0.5.20")
+              version="0.5.30")
   priv <- list()
 
   pub$makecall <- function(args, kwargs, origin) {
     if (is.null(kwargs$filename))
       kwargs$filename <- pub$filename
     if (is.null(kwargs$fileopt))
-      kwargs$fileopt <- NULL
+      kwargs$fileopt <- pub$fileopt
     url <- paste(base_url, "/clientresp", sep="")
 
     respst <- postForm(url, platform="R", version=pub$version, 
@@ -139,11 +139,15 @@ For more help, see https://plot.ly/R or contact <[email protected]>.")
     if(!is.ggplot(gg)){
       stop("gg must be a ggplot")
     }
-    pargs <- gg2list(gg)
+    fig <- gg2list(gg)
     if (!"auto_open" %in% names(kwargs)) {
       kwargs <- c(kwargs, auto_open=TRUE)
     }
-    pargs$kwargs <- c(pargs$kwargs, kwargs)
+    
+    pargs <- fig$data
+    pargs$kwargs <- kwargs
+    pargs$kwargs$layout <- fig$layout
+    
     if (session == "interactive") {  # we are on the command line
       resp <- do.call(pub$plotly, pargs)
       if (pargs$kwargs$auto_open) {

man/ensure_file_exist.Rd

@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/tools.R
 \name{ensure_file_exist}
 \alias{ensure_file_exist}

man/get_config_file.Rd

@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/tools.R
 \name{get_config_file}
 \alias{get_config_file}

man/get_credentials_file.Rd

@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/tools.R
 \name{get_credentials_file}
 \alias{get_credentials_file}

man/gg2list.Rd

@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/ggplotly.R
 \name{gg2list}
 \alias{gg2list}
@@ -10,7 +10,7 @@ gg2list(p)
 \item{p}{ggplot2 plot.}
 }
 \value{
-list representing a ggplot.
+figure object (list with names "data" and "layout").
 }
 \description{
 Convert a ggplot to a list.