Merge pull request #60 from eddelbuettel/feature/request_header

Supporting adding request headers to fload

ChangeLog

@@ -1,3 +1,17 @@
+2020-12-07  Dirk Eddelbuettel  <edd@debian.org>
+
+	* R/fload.R (fload): Use ... instead of explicit header argument
+	* R/utils.R (.prep_input): Support ... use
+	* man/fparse.Rd: Document ... use
+
+2020-12-04  Dirk Eddelbuettel  <edd@debian.org>
+
+        * DESCRIPTION (Version, Date): Roll version and date
+
+	* R/fload.R (fload): Additional argument 'headers' to pass API headers
+	* R/utils.R (.prep_input): Idem, passes 'headers' on to curl
+	* man/fparse.Rd: Document option
+
 2020-11-01  Dirk Eddelbuettel  <edd@debian.org>
 
         * DESCRIPTION (Version, Date): Release 0.1.3

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: RcppSimdJson
 Type: Package
 Title: 'Rcpp' Bindings for the 'simdjson' Header-Only Library for 'JSON' Parsing
-Version: 0.1.3
+Version: 0.1.3.1
 Date: 2020-11-01
 Author: Dirk Eddelbuettel, Brendan Knapp
 Maintainer: Dirk Eddelbuettel <edd@debian.org>
@@ -19,3 +19,4 @@ Suggests: bit64, tinytest
 URL: https://github.com/eddelbuettel/rcppsimdjson/
 BugReports: https://github.com/eddelbuettel/rcppsimdjson/issues
 RoxygenNote: 7.1.1
+Encoding: UTF-8

R/fload.R

@@ -16,6 +16,8 @@
 #' @param compressed_download Whether to request server-side compression on
 #'   the downloaded document, default: \code{FALSE}
 #'
+#' @param ... Optional arguments which can be use \emph{e.g.} to pass additional
+#' header settings
 #'
 #' @examples
 #' # load JSON files ===========================================================
@@ -64,7 +66,8 @@ fload <- function(json,
                   verbose = FALSE,
                   temp_dir = tempdir(),
                   keep_temp_files = FALSE,
-                  compressed_download = FALSE) {
+                  compressed_download = FALSE,
+                  ...) {
     # validate arguments =======================================================
     if (!.is_valid_json_arg(json)) {
         stop("`json=` must be a non-empty character vector, raw vector, or a list containing raw vectors.")
@@ -157,7 +160,8 @@ fload <- function(json,
     diagnosis <- .prep_input(json,
                              temp_dir = temp_dir,
                              compressed_download = compressed_download,
-                             verbose = verbose)
+                             verbose = verbose,
+                             ...)
     if (!keep_temp_files) {
         on.exit(unlink(diagnosis$input[diagnosis$is_from_url]), add = TRUE)
     }

R/utils.R

@@ -16,9 +16,12 @@
 .prep_input <- function(input,
                         temp_dir,
                         compressed_download,
-                        verbose) {
+                        verbose,
+                        headers = NULL,
+                        ...) {
     input[!is.na(input)] <- path.expand(input[!is.na(input)])
     diagnosis <- .diagnose_input(input)
+    .headers <- headers
 
     if (length(missing_files <- diagnosis$input[!is.na(diagnosis$input) &
                                                 !diagnosis$is_from_url &
@@ -28,14 +31,13 @@
     }
 
     if (any(diagnosis$is_from_url)) {
-        if (compressed_download) {
-            .headers <- c(`Accept-Encoding` = "gzip")
+        if (compressed_download) {      				# #nocov start
+            .headers <- c(.headers, `Accept-Encoding` = "gzip")
             # for local files, don't attach .gz
             .fileext <- rep(NA_character_, nrow(diagnosis))
             .fileext[diagnosis$is_local_file_url] <- diagnosis$file_ext[diagnosis$is_local_file_url]
             .fileext[diagnosis$is_remote_file_url] <- sprintf("%s.gz", diagnosis$file_ext[diagnosis$is_remote_file_url])
-        } else {
-            .headers <- NULL
+        } else {      							# #nocov end
             .fileext <-  diagnosis$file_ext[diagnosis$is_from_url]
         }