Merge pull request #147 from ropensci/marianne-hipsteR-notation

Update notation and naming for modern use

Author: mkcor

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: plotly
 Type: Package
 Title: Interactive, publication-quality graphs online.
-Version: 0.5.12
+Version: 0.5.13
 Authors@R: c(person("Chris", "Parmer", role = c("aut", "cre"),
     email = "[email protected]"),
     person("Scott", "Chamberlain", role = "aut",
@@ -34,14 +34,3 @@ Imports:
 Suggests:
     maps,
     testthat
-Collate:
-    'one_to_one_corr.R'
-    'build_function.R'
-    'colour_conversion.R'
-    'ggplotly.R'
-    'marker_conversion.R'
-    'plotly-package.r'
-    'plotly.R'
-    'signup.R'
-    'tools.R'
-    'trace_generation.R'

NEWS

@@ -1,3 +1,7 @@
+0.5.13 -- 27 November 2014.
+
+Rename translation file and server endpoint parameter to be hip.
+
 0.5.12 -- 12 November 2014.
 
 Improve legend title position.

R/one_to_one_corr.R renamed to R/corresp_one_one.R

@@ -18,7 +18,7 @@
 #' @import RJSONIO
 #' @param username plotly username
 #' @param key plotly API key
-#' @param base.url plotly server
+#' @param base_url plotly server
 #' 
 #' @return An object of class PlotlyClass, except for the final object after
 #' adding layers becomes a list class.
@@ -57,7 +57,7 @@
 #' }
 
 
-plotly <- function(username=NULL, key=NULL, base.url=NULL) {
+plotly <- function(username=NULL, key=NULL, base_url=NULL) {
 
   if (is.null(username)) {
     username <- get_credentials_file(c("username", "api_key"))$username
@@ -73,11 +73,11 @@ To get started, save your plotly username and API key by calling:\n
 For more help, see https://plot.ly/R or contact <[email protected]>.")
   }
   # Plotly server
-  if (is.null(base.url)) {
-    base.url <- get_config_file("plotly_domain")$plotly_domain
+  if (is.null(base_url)) {
+    base_url <- get_config_file("plotly_domain")$plotly_domain
   }
-  if (is.null(base.url) || base.url == "") {
-    base.url <- "https://plot.ly"
+  if (is.null(base_url) || base_url == "") {
+    base_url <- "https://plot.ly"
   }
 
   # public attributes/methods that the user has access to
@@ -90,7 +90,7 @@ For more help, see https://plot.ly/R or contact <[email protected]>.")
       kwargs$filename <- pub$filename
     if (is.null(kwargs$fileopt))
       kwargs$fileopt <- NULL
-    url <- paste(base.url, "/clientresp", sep="")
+    url <- paste(base_url, "/clientresp", sep="")
 
     respst <- postForm(url, platform="R", version=pub$version, 
                        args=toJSON(args, digits=50, collapse=""), un=pub$username,
@@ -167,7 +167,7 @@ For more help, see https://plot.ly/R or contact <[email protected]>.")
                  "plotly-platform"="R")
     response_handler <- basicTextGatherer()
     header_handler <- basicTextGatherer()
-    curlPerform(url=paste(base.url, "apigetfile", file_owner, file_id,
+    curlPerform(url=paste(base_url, "apigetfile", file_owner, file_id,
                           sep="/"),
                 httpheader=headers,
                 writefunction=response_handler$update,

R/plotly.R

@@ -3,14 +3,14 @@
 \alias{plotly}
 \title{Main interface to plotly}
 \usage{
-plotly(username = NULL, key = NULL, base.url = NULL)
+plotly(username = NULL, key = NULL, base_url = NULL)
 }
 \arguments{
 \item{username}{plotly username}
 
 \item{key}{plotly API key}
 
-\item{base.url}{plotly server}
+\item{base_url}{plotly server}
 }
 \value{
 An object of class PlotlyClass, except for the final object after