improved support for readSource family of functions

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '7062243'
+ValidationKey: '7081806'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'

CITATION.cff

@@ -2,7 +2,7 @@ cff-version: 1.2.0
 message: If you use this software, please cite it using the metadata from this file.
 type: software
 title: 'madrat: May All Data be Reproducible and Transparent (MADRaT) *'
-version: 3.6.1
+version: 3.6.2
 date-released: '2023-07-25'
 abstract: Provides a framework which should improve reproducibility and transparency
   in data processing. It provides functionality such as automatic meta data creation

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: madrat
 Title: May All Data be Reproducible and Transparent (MADRaT) *
-Version: 3.6.1
+Version: 3.6.2
 Date: 2023-07-25
 Authors@R: c(
     person("Jan Philipp", "Dietrich", , "[email protected]", role = c("aut", "cre")),

R/getMadratMessage.R

@@ -20,9 +20,18 @@
 getMadratMessage <- function(name = NULL, fname = NULL) {
   x <- getOption("madratMessage")
   if (!is.null(x) && !is.null(fname)) {
-    deps <- try(suppressWarnings(getDependencies(sub("^.*:::", "", fname),
+    fname <- sub("^.*:::", "", fname)
+    fnameBase <- sub("^(download|correct|convert)", "read", fname)
+    deps <- try(suppressWarnings(getDependencies(fnameBase,
                                                  packages = getConfig("packages"), self = TRUE)$func))
     if (inherits(deps, "try-error")) return(NULL)
+    readDeps <- sub("^read", "", grep("^read", deps, value = TRUE))
+    if (length(readDeps) > 0) {
+      convertDeps <- paste0("convert", readDeps)
+      correctDeps <- paste0("correct", readDeps)
+      downloadDeps <- paste0("download", readDeps)
+      deps <- c(deps, convertDeps, correctDeps, downloadDeps)
+    }
     for (n in names(x)) {
       x[[n]] <- x[[n]][sub("^.*:::", "", names(x[[n]])) %in% deps]
     }

README.md

@@ -1,6 +1,6 @@
 # May All Data be Reproducible and Transparent (MADRaT) *
 
-R package **madrat**, version **3.6.1**
+R package **madrat**, version **3.6.2**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/madrat)](https://cran.r-project.org/package=madrat) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1115490.svg)](https://doi.org/10.5281/zenodo.1115490) [![R build status](https://github.com/pik-piam/madrat/workflows/check/badge.svg)](https://github.com/pik-piam/madrat/actions) [![codecov](https://codecov.io/gh/pik-piam/madrat/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/madrat) [![r-universe](https://pik-piam.r-universe.dev/badges/madrat)](https://pik-piam.r-universe.dev/builds)
 
@@ -55,7 +55,7 @@ In case of questions / problems please contact Jan Philipp Dietrich <dietrich@pi
 
 To cite package **madrat** in publications use:
 
-Dietrich J, Baumstark L, Wirth S, Giannousakis A, Rodrigues R, Bodirsky B, Leip D, Kreidenweis U, Klein D, Führlich P (2023). _madrat: May All Data be Reproducible and Transparent (MADRaT)_. doi: 10.5281/zenodo.1115490 (URL: https://doi.org/10.5281/zenodo.1115490), R package version 3.6.1, <URL: https://github.com/pik-piam/madrat>.
+Dietrich J, Baumstark L, Wirth S, Giannousakis A, Rodrigues R, Bodirsky B, Leip D, Kreidenweis U, Klein D, Führlich P (2023). _madrat: May All Data be Reproducible and Transparent (MADRaT)_. doi: 10.5281/zenodo.1115490 (URL: https://doi.org/10.5281/zenodo.1115490), R package version 3.6.2, <URL: https://github.com/pik-piam/madrat>.
 
 A BibTeX entry for LaTeX users is
 
@@ -64,7 +64,7 @@ A BibTeX entry for LaTeX users is
   title = {madrat: May All Data be Reproducible and Transparent (MADRaT)},
   author = {Jan Philipp Dietrich and Lavinia Baumstark and Stephen Wirth and Anastasis Giannousakis and Renato Rodrigues and Benjamin Leon Bodirsky and Debbora Leip and Ulrich Kreidenweis and David Klein and Pascal Führlich},
   year = {2023},
-  note = {R package version 3.6.1},
+  note = {R package version 3.6.2},
   doi = {10.5281/zenodo.1115490},
   url = {https://github.com/pik-piam/madrat},
 }

tests/testthat/test-getputMadratMessage.R

@@ -8,6 +8,11 @@ test_that("getMadratMessage and putMadratMessage work", {
   expect_identical(getMadratMessage("test", fname = "calcTauTotal"), list(readTau = "This is a toast"))
   expect_silent(resetMadratMessages())
   expect_null(getMadratMessage())
+  expect_silent(putMadratMessage("test2", "another test", fname = "convertTau"))
+  expect_identical(getMadratMessage(fname = "calcTauTotal"), list(test2 = list(convertTau = "another test")))
+  expect_identical(getMadratMessage(fname = "readTau"), list(test2 = list(convertTau = "another test")))
+  expect_identical(getMadratMessage(fname = "convertTau"), list(test2 = list(convertTau = "another test")))
+  resetMadratMessages()
   test <- function() {
     putMadratMessage("level", "level 1")
     .tmp <- function() {