style fixes from code review

Author: jameslamb

DESCRIPTION

@@ -26,7 +26,7 @@ Depends:
 Imports:
     tools,
     scales,
-    httr,
+    httr (>= 1.3.0),
     jsonlite (>= 1.6),
     magrittr,
     digest,

R/api_exports.R

@@ -170,7 +170,6 @@ api_download_file <- function(id, username, endpoint = "files", ...) {
 
 
 #' @rdname api
-#' @importFrom httr RETRY
 #' @export
 api <- function(endpoint = "/", verb = "GET", body = NULL, ...) {
   api_check_endpoint(endpoint)
@@ -189,15 +188,15 @@ api <- function(endpoint = "/", verb = "GET", body = NULL, ...) {
   }
 
   resp <- httr::RETRY(
-    verb = verb
-    , url = url
-    , api_headers()
-    , api_auth()
-    , body = body
-    , times = 5
-    , terminate_on = c(400, 401, 403, 404)
-    , terminate_on_success = TRUE
-    , ...
+    verb = verb,
+    url = url,
+    api_headers(),
+    api_auth(),
+    body = body,
+    times = 5,
+    terminate_on = c(400, 401, 403, 404),
+    terminate_on_success = TRUE
+    ...
   )
 
   structure(process(resp), class = "api")

R/orca.R

@@ -193,12 +193,12 @@ orca_serve <- function(port = 5151, mathjax = FALSE, safe = FALSE, request_limit
         scale = scale
       )
       res <- httr::RETRY(
-        verb = "POST"
-        , url = paste0("http://127.0.0.1:", port)
-        , body = to_JSON(bod)
-        , times = 5
-        , terminate_on = c(400, 401, 403, 404)
-        , terminate_on_success = TRUE
+        verb = "POST",
+        url = paste0("http://127.0.0.1:", port),
+        body = to_JSON(bod),
+        times = 5,
+        terminate_on = c(400, 401, 403, 404),
+        terminate_on_success = TRUE
       )
       httr::stop_for_status(res)
       httr::warn_for_status(res)

R/plotly_IMAGE.R

@@ -9,8 +9,7 @@
 #' @param format The desired image format 'png', 'jpeg', 'svg', 'pdf', 'eps', or 'webp'
 #' @param scale Both png and jpeg formats will be scaled beyond the specified width and height by this number.
 #' @param out_file A filename for writing the image to a file.
-#' @param ...  arguments passed onto `httr::RETRY`
-#' @importFrom httr RETRY write_disk
+#' @param ... arguments passed onto `httr::RETRY`
 #' @export
 #' @examples \dontrun{
 #' p <- plot_ly(x = 1:10)
@@ -36,16 +35,16 @@ plotly_IMAGE <- function(x, width = 1000, height = 500, format = "png",
   )
   base_url <- file.path(get_domain("api"), "v2", "images")
   resp <- httr::RETRY(
-    verb = "POST"
-    , url = base_url
-    , body = to_JSON(bod)
-    , times = 5
-    , terminate_on = c(400, 401, 403, 404)
-    , terminate_on_success = TRUE
-    , api_headers()
-    , api_auth()
-    , if (!missing(out_file)) httr::write_disk(out_file, overwrite = TRUE)
-    , ...
+    verb = "POST",
+    url = base_url,
+    body = to_JSON(bod),
+    times = 5,
+    terminate_on = c(400, 401, 403, 404),
+    terminate_on_success = TRUE,
+    api_headers(),
+    api_auth(),
+    if (!missing(out_file)) httr::write_disk(out_file, overwrite = TRUE),
+    ...
   )
   con <- process(append_class(resp, "api_image"))
   invisible(con)

R/signup.R

@@ -46,12 +46,12 @@ signup <- function(username, email, save = TRUE) {
   )
   base_url <- file.path(get_domain(), "apimkacct")
   resp <- httr::RETRY(
-    verb = "POST"
-    , base_url
-    , body = bod
-    , times = 5
-    , terminate_on = c(400, 401, 403, 404)
-    , terminate_on_success = TRUE
+    verb = "POST",
+    base_url,
+    body = bod,
+    times = 5,
+    terminate_on = c(400, 401, 403, 404),
+    terminate_on_success = TRUE
   )
   con <- process(append_class(resp, "signup"))
   if (save) {

inst/plotlyjs.R

@@ -2,11 +2,11 @@ library(httr)
 # download latest GitHub release
 # for a particular version: `zip <- "https://github.com/plotly/plotly.js/archive/v1.33.1.zip"`
 x <- httr::RETRY(
-  verb = "GET"
-  , url = 'https://api.github.com/repos/plotly/plotly.js/releases/latest'
-  , times = 5
-  , terminate_on = c(400, 401, 403, 404)
-  , terminate_on_success = TRUE
+  verb = "GET",
+  url = 'https://api.github.com/repos/plotly/plotly.js/releases/latest',
+  times = 5,
+  terminate_on = c(400, 401, 403, 404),
+  terminate_on_success = TRUE
 )
 zip <- content(x)$zipball_url
 tmp <- tempfile(fileext = ".zip")