Upload seek

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: httr
 Title: Tools for Working with URLs and HTTP
-Version: 1.4.6.9000
+Version: 1.4.7
 Authors@R: c(
     person("Hadley", "Wickham", , "[email protected]", role = c("aut", "cre")),
     person("Posit, PBC", role = c("cph", "fnd"))
@@ -15,7 +15,7 @@ BugReports: https://github.com/r-lib/httr/issues
 Depends:
     R (>= 3.5)
 Imports:
-    curl (>= 3.0.0),
+    curl (>= 5.0.2),
     jsonlite,
     mime,
     openssl (>= 0.8),
@@ -36,3 +36,4 @@ Config/Needs/website: tidyverse/tidytemplate
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE, r6 = FALSE)
 RoxygenNote: 7.2.3
+Remotes: jeroen/curl

NEWS.md

@@ -1,4 +1,4 @@
-# httr (development version)
+# httr 1.4.7
 
 * Suppress another use of httpbin.
 

R/body.R

@@ -25,6 +25,12 @@ body_config <- function(body = NULL,
           }
           bin
         },
+        seekfunction = function(offset, ...) {
+          if (is.null(con)) {
+            con <<- file(body$path, "rb")
+          }
+          seek(con, where = offset)
+        },
         postfieldsize_large = size
       ),
       content_type(body$type)

R/http-get.r

@@ -46,8 +46,10 @@
 #' @export
 #' @examples
 #' GET("http://google.com/")
+#' \dontrun{
 #' GET("http://google.com/", path = "search")
 #' GET("http://google.com/", path = "search", query = list(q = "ham"))
+#' }
 #'
 #' # See what GET is doing with httpbin.org
 #' \dontrun{
@@ -62,9 +64,11 @@
 #'
 #' # You might want to manually specify the handle so you can have multiple
 #' # independent logins to the same website.
+#' \dontrun{
 #' google <- handle("http://google.com")
 #' GET(handle = google, path = "/")
 #' GET(handle = google, path = "search")
+#' }
 GET <- function(url = NULL, config = list(), ..., handle = NULL) {
   hu <- handle_url(handle, url, ...)
   req <- request_build("GET", hu$url, as.request(config), ...)

R/oauth-listener.r

@@ -10,8 +10,6 @@
 #'
 #' @param request_url the url to send the browser to
 #' @param is_interactive DEPRECATED
-#' @param host ip address for the listener
-#' @param port for the listener
 #' @export
 #' @keywords internal
 oauth_listener <- function(request_url, is_interactive = interactive()) {

R/oauth-server-side.R

@@ -28,8 +28,6 @@ init_oauth_service_account <- function(secrets, scope = NULL, sub = NULL) {
 #' @param credentials Parsed contents of the credentials file.
 #' @param scope A space-delimited list of the permissions that the application
 #'    requests.
-#' @param iss Email address of the client_id of the application making the
-#'   access token request.
 #' @param scope A space-delimited list of the permissions that the application
 #'    requests.
 #' @param sub The email address of the user for which the application is

R/write-function.R

@@ -3,7 +3,6 @@
 #' This S3 object allows you to control how the response body is saved.
 #'
 #' @param subclass,... Class name and fields. Used in class constructors.
-#' @param x A `write_function` object to process.
 #' @keywords internal
 #' @export
 write_function <- function(subclass, ...) {
@@ -24,10 +23,10 @@ write_function <- function(subclass, ...) {
 #' tmp <- tempfile()
 #' r1 <- GET("https://www.google.com", write_disk(tmp))
 #' readLines(tmp)
-#' 
+#'
 #' # The default
 #' r2 <- GET("https://www.google.com", write_memory())
-#' 
+#'
 #' # Save a very large file
 #' \dontrun{
 #' GET(

tests/testthat/test-upload-file.R

@@ -0,0 +1,17 @@
+test_that("can upload with redirect", {
+  skip_on_cran()
+
+  str <- paste(letters, collapse = '')
+  tmp <- tempfile()
+  writeBin(str, tmp)
+
+  resp <- PUT(
+    "https://hb.cran.dev/redirect-to?url=/put&status_code=307",
+    body = upload_file(tmp)
+  )
+
+  expect_equal(resp$status_code, 200)
+  expect_equal(resp$url, "https://hb.cran.dev/put")
+  json <- content(resp)
+  expect_equal(json$data, str)
+})