Skip to content

Commit badfb70

Browse files
authored
Merge pull request #141 from konradoberwimmer/issue-140-fix-call-to-add_headers
Issue 140: Fix call to add_headers of api_get_impl()
2 parents 20bd514 + 52faf52 commit badfb70

7 files changed

Lines changed: 18 additions & 9 deletions

File tree

.github/workflows/R-CMD-check-thorough.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- uses: r-lib/actions/setup-pandoc@v2
5151

5252
- name: Restore R package cache
53-
uses: actions/cache@v2
53+
uses: actions/cache@v3
5454
with:
5555
path: |
5656
${{ env.R_LIBS_USER }}

.github/workflows/pkgdown.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
shell: Rscript {0}
2626

2727
- name: Cache R packages
28-
uses: actions/cache@v2
28+
uses: actions/cache@v3
2929
with:
3030
path: ${{ env.R_LIBS_USER }}
3131
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}

DESCRIPTION

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: dataverse
2-
Version: 0.3.15
2+
Version: 0.3.16
33
Title: Client for Dataverse 4+ Repositories
44
Authors@R:
55
c(person(given = "Shiro",
@@ -42,7 +42,11 @@ Authors@R:
4242
family = "Morgan",
4343
role = "ctb",
4444
email = "mtmorgan.xyz@gmail.com",
45-
comment = c(ORCID = "0000-0002-5874-8148")))
45+
comment = c(ORCID = "0000-0002-5874-8148")),
46+
person(given = "Konrad",
47+
family = "Oberwimmer",
48+
role = "ctb",
49+
email = "konrad.oberwimmer@gmail.com"))
4650
Imports:
4751
checkmate,
4852
httr,

NEWS.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# dataverse
22

3+
# CHANGES in dataverse 0.3.16
4+
5+
* Fix API calls to set X-Dataverse-key header correctly (#140, by @konradoberwimmer)
6+
37
# CHANGES in dataverse 0.3.15
48

59
* Implement a cache for API calls (including file download) when dataset version is specified. The functions will reload from the cache automatically the second time. (#112, #135, by @mtmorgan)
@@ -8,7 +12,7 @@
812

913
* Improve recommendation for rdata loading (#107, #127)
1014
* `get_file_by_*()` can now return the download URL to be used in external functions or programs, useful for large files (#128, implemented in #129 @JBGruber and @kuriwaki)
11-
* Removes remote resource from vignette and move them to ghactions (#131)
15+
* Removes remote resource from vignette and move them to `ghactions` (#131)
1216

1317
# CHANGES in dataverse 0.3.12 and 0.3.13
1418

R/utils.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ api_get <- function(url, ..., key = NULL, as = "text", use_cache = Sys.getenv("D
229229
## .onLoad()
230230
api_get_impl <- function(url, ..., key = NULL, as = "text") {
231231
if (!is.null(key))
232-
key <- httr::add_headers("X-Dataverse-key", key)
232+
key <- httr::add_headers("X-Dataverse-key" = key)
233233
r <- httr::GET(url, ..., key)
234234
httr::stop_for_status(r, task = httr::content(r)$message)
235235
httr::content(r, as = as, encoding = "UTF-8")

tests/testthat/tests-dataset_metadata.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ test_that("check versions format", {
2727
"fileAccessRequest", "files", "id", "lastUpdateTime", "latestVersionPublishingState",
2828
"license", "metadataBlocks", "publicationDate", "releaseTime",
2929
"storageIdentifier", "UNF", "versionMinorNumber", "versionNumber",
30-
"versionState", "deaccessionLink")
30+
"versionState", "deaccessionLink",
31+
"datasetType", "internalVersionNumber")
3132
expect_setequal(names(actual[[1]]), expected_names)
3233
expect_s3_class(actual[[2]], "dataverse_dataset_version")
3334
})

tests/testthat/tests-get_dataset.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ test_that("download tab from DOI and filename", {
1616
"lastUpdateTime", "latestVersionPublishingState", "license",
1717
"metadataBlocks", "publicationDate", "releaseTime",
1818
"storageIdentifier", "UNF", "versionMinorNumber",
19-
"versionNumber", "versionState", "deaccessionLink")
19+
"versionNumber", "versionState", "deaccessionLink",
20+
"datasetType", "internalVersionNumber")
2021

2122
expect_setequal(names(actual) , expected_names)
2223
expect_equal(actual$id , 182158L)
@@ -28,7 +29,6 @@ test_that("download tab from DOI and filename", {
2829
expect_equal(actual$license$name , "CC0 1.0")
2930

3031
expect_equal(nrow(files) , 2L)
31-
expect_equal(ncol(files) , 26L)
3232

3333
expect_setequal(files$label , c("roster-bulls-1996.tab", "vector-basketball.svg"))
3434
expect_setequal(files$restricted , c(FALSE, FALSE))

0 commit comments

Comments
 (0)