Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/R-CMD-check-thorough.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
- uses: r-lib/actions/setup-pandoc@v2

- name: Restore R package cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
${{ env.R_LIBS_USER }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
shell: Rscript {0}

- name: Cache R packages
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ env.R_LIBS_USER }}
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
Expand Down
8 changes: 6 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: dataverse
Version: 0.3.15
Version: 0.3.16
Title: Client for Dataverse 4+ Repositories
Authors@R:
c(person(given = "Shiro",
Expand Down Expand Up @@ -42,7 +42,11 @@ Authors@R:
family = "Morgan",
role = "ctb",
email = "mtmorgan.xyz@gmail.com",
comment = c(ORCID = "0000-0002-5874-8148")))
comment = c(ORCID = "0000-0002-5874-8148")),
person(given = "Konrad",
family = "Oberwimmer",
role = "ctb",
email = "konrad.oberwimmer@gmail.com"))
Imports:
checkmate,
httr,
Expand Down
6 changes: 5 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# dataverse

# CHANGES in dataverse 0.3.16

* Fix API calls to set X-Dataverse-key header correctly (#140, by @konradoberwimmer)

# CHANGES in dataverse 0.3.15

* 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)
Expand All @@ -8,7 +12,7 @@

* Improve recommendation for rdata loading (#107, #127)
* `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)
* Removes remote resource from vignette and move them to ghactions (#131)
* Removes remote resource from vignette and move them to `ghactions` (#131)

# CHANGES in dataverse 0.3.12 and 0.3.13

Expand Down
2 changes: 1 addition & 1 deletion R/utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ api_get <- function(url, ..., key = NULL, as = "text", use_cache = Sys.getenv("D
## .onLoad()
api_get_impl <- function(url, ..., key = NULL, as = "text") {
if (!is.null(key))
key <- httr::add_headers("X-Dataverse-key", key)
key <- httr::add_headers("X-Dataverse-key" = key)
r <- httr::GET(url, ..., key)
httr::stop_for_status(r, task = httr::content(r)$message)
httr::content(r, as = as, encoding = "UTF-8")
Expand Down
3 changes: 2 additions & 1 deletion tests/testthat/tests-dataset_metadata.R
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ test_that("check versions format", {
"fileAccessRequest", "files", "id", "lastUpdateTime", "latestVersionPublishingState",
"license", "metadataBlocks", "publicationDate", "releaseTime",
"storageIdentifier", "UNF", "versionMinorNumber", "versionNumber",
"versionState", "deaccessionLink")
"versionState", "deaccessionLink",
"datasetType", "internalVersionNumber")
expect_setequal(names(actual[[1]]), expected_names)
expect_s3_class(actual[[2]], "dataverse_dataset_version")
})
4 changes: 2 additions & 2 deletions tests/testthat/tests-get_dataset.R
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ test_that("download tab from DOI and filename", {
"lastUpdateTime", "latestVersionPublishingState", "license",
"metadataBlocks", "publicationDate", "releaseTime",
"storageIdentifier", "UNF", "versionMinorNumber",
"versionNumber", "versionState", "deaccessionLink")
"versionNumber", "versionState", "deaccessionLink",
"datasetType", "internalVersionNumber")

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

expect_equal(nrow(files) , 2L)
expect_equal(ncol(files) , 26L)

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