diff --git a/R/utils.R b/R/utils.R index 2948a84..fb2e968 100644 --- a/R/utils.R +++ b/R/utils.R @@ -5,10 +5,10 @@ #' @noRd .get_encode_dictionary <- function() { encode_list <- list( - input = c("(", ")", "\"", ",", " ", ":", "!", "&", "|", "'", "[", "]", "=", "+", "-", "*", "/", "^", ">", "<", "~", "\n"), + input = c("(", ")", "\"", ",", " ", ":", "!", "&", "|", "'", "=", "+", "-", "*", "/", "^", ">", "<", "~", "\n"), output = c( "$LB$", "$RB$", "$QUOTE$", "$COMMA$", "$SPACE$", "$COLON$", "$EXCL$", "$AND$", "$OR$", - "$APO$", "$LSQ$", "$RSQ", "$EQU$", "$ADD$", "$SUB$", "$MULT$", "$DIVIDE$", "$POWER$", "$GT$", "$LT$", "$TILDE$", "$LINE$" + "$APO$", "$EQU$", "$ADD$", "$SUB$", "$MULT$", "$DIVIDE$", "$POWER$", "$GT$", "$LT$", "$TILDE$", "$LINE$" ) ) return(encode_list) diff --git a/docs/authors.html b/docs/authors.html index 4b1d130..622d967 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -67,14 +67,14 @@

Citation

-

Cadman T, Slofstra M, Wheater S, Avraam D (2024). +

Cadman T, Slofstra M, Wheater S, Avraam D (2025). dsTidyverse: 'DataSHIELD' 'Tidyverse' Serverside Package. R package version 1.0.1.

@Manual{,
   title = {dsTidyverse: 'DataSHIELD' 'Tidyverse' Serverside Package},
   author = {Tim Cadman and Mariska Slofstra and Stuart Wheater and Demetris Avraam},
-  year = {2024},
+  year = {2025},
   note = {R package version 1.0.1},
 }
diff --git a/docs/index.html b/docs/index.html index d4fa65c..591a5e9 100644 --- a/docs/index.html +++ b/docs/index.html @@ -120,6 +120,39 @@

From the tibble package: +

Disclosure control +

+

DataSHIELD implements (permission levels)[https://wiki.datashield.org/en/opmanag/disclosure-control], which allows data owners to control which functions can be used by researchers. The table below shows which dsTidyverse functions are allowed in which permission mode.

+ ++++ + + + + + + + + + + + + + + + + + + +
Privacy LevelFunctions
permissive +arrangeDS, asTibbleDS, bindColsDS, bindRowsDS, caseWhenDS, distinctDS, filterDS, groupByDS, groupKeysDS, mutateDS, renameDS, selectDS, sliceDS, ungroupDS +
banana +arrangeDS, asTibbleDS, bindColsDS, bindRowsDS, caseWhenDS, distinctDS, filterDS, groupByDS, groupKeysDS, mutateDS, renameDS, selectDS, sliceDS, ungroupDS +
avocadoifElseDS
+ +

Contributing

If there are functions in this list you would like implemented, please either attempt to do so yourself and submit a pull request, or submit a feature request in the issues section. See the “CONTRIBUTING” file for more information.

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index fac7be5..c14cbe4 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -1,6 +1,6 @@ -pandoc: 3.1.11 +pandoc: '3.2' pkgdown: 2.0.9 pkgdown_sha: ~ articles: {} -last_built: 2024-10-28T10:02Z +last_built: 2025-02-11T10:57Z diff --git a/tests/testthat/test-utils.R b/tests/testthat/test-utils.R index e38d3b2..806a489 100644 --- a/tests/testthat/test-utils.R +++ b/tests/testthat/test-utils.R @@ -142,9 +142,9 @@ test_that(".tidy_eval_handle_errors fails with correct message when unrecognised test_that(".get_encode_dictionary returns the expected encoding key", { expected_encode_list <- list( - input = c("(", ")", "\"", ",", " ", ":", "!", "&", "|", "'", "[", "]", "=", "+", "-", "*", "/", "^", ">", "<", "~", "\n"), + input = c("(", ")", "\"", ",", " ", ":", "!", "&", "|", "'", "=", "+", "-", "*", "/", "^", ">", "<", "~", "\n"), output = c( - "$LB$", "$RB$", "$QUOTE$", "$COMMA$", "$SPACE$", "$COLON$", "$EXCL$", "$AND$", "$OR$", "$APO$", "$LSQ$", "$RSQ", "$EQU$", "$ADD$", "$SUB$", "$MULT$", + "$LB$", "$RB$", "$QUOTE$", "$COMMA$", "$SPACE$", "$COLON$", "$EXCL$", "$AND$", "$OR$", "$APO$", "$EQU$", "$ADD$", "$SUB$", "$MULT$", "$DIVIDE$", "$POWER$", "$GT$", "$LT$", "$TILDE$", "$LINE$" ) )