changed username and key checking with fxns

Author: sckott

R/plotly.R

@@ -40,14 +40,20 @@
 #' browseURL(url)
 #' }
 
-plotly <- function(username, key){
+plotly <- function(username=NULL, key=NULL){
+
+  if(is.null(username))
+    username <- getOption("plotlyUsername", stop("you need a user name for Plot.ly - See the signup function"))
+  if(is.null(key))
+    key <- getOption("plotlyKey", stop("you need an API key for Plot.ly - See the signup function"))
+  
 	# public attributes/methods that the user has access to
 	pub = list(
 		username = username,
 		key = key,
 		filename='from api',
 		fileopt=NULL,
-		version = '0.3.1'
+		version = as.character(packageVersion("plotly"))
 	)
 
 	priv = list()

R/signup.R

@@ -24,9 +24,14 @@
 #' response$tmp_pw # temporary password to access your plotly account
 #' }
 
-signup <- function(username, email){
+signup <- function(username=NULL, email=NULL){
+  if(is.null(username))
+    key <- getOption("plotlyUsername", stop("you need a user name for Plot.ly - See the signup function"))
+  if(is.null(key))
+    key <- getOption("plotlyKey", stop("you need an API key for Plot.ly - See the signup function"))
+  
   platform = 'R'
-  version = packageVersion("plotly")
+  version = as.character(packageVersion("plotly"))
   url = 'https://plot.ly/apimkacct'
   options(RCurlOptions = list(sslversion=3, cainfo = system.file("CurlSSL", "cacert.pem", package = "RCurl")))
   respst = postForm(url,
@@ -40,4 +45,4 @@ signup <- function(username, email){
   if(!is.null(resp$warning)) cat(resp$warning)
   if(!is.null(resp$message)) cat(resp$message)
   return(resp)
-}
+}

man/plotly.Rd

@@ -2,7 +2,7 @@
 \alias{plotly}
 \title{Main interface to plotly}
 \usage{
-plotly(username, key)
+plotly(username = NULL, key = NULL)
 }
 \arguments{
   \item{username}{plotly username}

man/signup.Rd

@@ -2,7 +2,7 @@
 \alias{signup}
 \title{Sign up to plotly.}
 \usage{
-signup(username, email)
+signup(username = NULL, email = NULL)
 }
 \arguments{
   \item{username}{Desired username}