Merge pull request #149 from ropensci/marianne-RCurlOptions-getfigure

Include RCurlOptions in get_figure() method

Author: mkcor

DESCRIPTION

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

NEWS

@@ -1,3 +1,7 @@
+0.5.15 -- 19 December 2014.
+
+Use proper RCurlOptions in get_figure() method.
+
 0.5.14 -- 1 December 2014.
 
 Make layers geom_line + geom_point only one trace in Plotly.

R/plotly-package.r

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

R/plotly.R

@@ -82,7 +82,7 @@ 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.1")
+              version="0.5.15")
   priv <- list()
 
   pub$makecall <- function(args, kwargs, origin) {
@@ -91,7 +91,7 @@ For more help, see https://plot.ly/R or contact <[email protected]>.")
     if (is.null(kwargs$fileopt))
       kwargs$fileopt <- NULL
     url <- paste(base_url, "/clientresp", sep="")
-
+    
     respst <- postForm(url, platform="R", version=pub$version, 
                        args=toJSON(args, digits=50, collapse=""), un=pub$username,
                        key=pub$key, origin=origin,
@@ -101,7 +101,7 @@ For more help, see https://plot.ly/R or contact <[email protected]>.")
                                                      "cacert.pem",
                                                      package="RCurl")))
     if (is.raw(respst)) {
-        respst <- rawToChar(respst)
+      respst <- rawToChar(respst)
     }
 
     resp <- fromJSON(respst, simplify = FALSE)
@@ -171,7 +171,10 @@ For more help, see https://plot.ly/R or contact <[email protected]>.")
                           sep="/"),
                 httpheader=headers,
                 writefunction=response_handler$update,
-                headerfunction=header_handler$update)
+                headerfunction=header_handler$update,
+                .opts=list(sslversion=1,  # 1 is for TLSv1
+                           cainfo=system.file("CurlSSL", "cacert.pem",
+                                              package="RCurl")))
     resp_header <- as.list(parseHTTPHeader(header_handler$value()))
 
     # Parse status