Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
a58d21b
Update function's documentation
villegar Mar 16, 2026
45df281
Refactor extract_safe_data.opal and flatten_safe_data.rocrate to simp…
villegar Mar 16, 2026
75c40b2
Update tests to account for changes in extract_safe_data.rocrate
villegar Mar 16, 2026
3d155ab
Update safe_project.opal S3 generic to automatically link users to pr…
villegar Mar 16, 2026
646bdcf
Add new function append_entity_ref to attach new references/links to …
villegar Mar 16, 2026
8858c2a
Update internal documentation
villegar Mar 16, 2026
85fa12a
New build
villegar Mar 16, 2026
3a93840
Minor change to simplify adding the hasPart property
villegar Mar 17, 2026
a0c63b4
Minor changes to streamline extraction of 5 safe components
villegar Mar 17, 2026
6d43958
Streamline audit safe project to provide same functionality without o…
villegar Mar 18, 2026
807a300
Update add_asset_permissions_to_crate and get_asset_permissions
villegar Mar 18, 2026
2b895cd
Update error messages for project_exists.* S3 generics
villegar Mar 18, 2026
0a885e8
Standardise column names, Safe Projects: project_id and project; Safe…
villegar Mar 18, 2026
8957c0d
Standardise audit functions
villegar Mar 18, 2026
0369e31
New build
villegar Mar 18, 2026
e943713
Update tests to capture changes done to the code
villegar Mar 18, 2026
0bad595
Add new internal generic, audit_engine, to power the auditing functions
villegar Mar 19, 2026
733d778
Update audit_cr8tor from a single function to an S3 generic, so the i…
villegar Mar 19, 2026
5dfb6d0
Phase out the internal load_rocrate in favour of rocrateR::load_rocrate
villegar Mar 19, 2026
f79e6e1
Phase out internal load_rocrate in favour of rocrateR::load_rocrate
villegar Mar 19, 2026
263af05
Update internal functions to use asset, instead of table, table_id >>…
villegar Mar 19, 2026
80ebdfb
Add initial draft of print generic for cr8tor/cr8tor_bundle objects
villegar Mar 19, 2026
a747f60
New build
villegar Mar 19, 2026
d93ef82
Minor changes to tests
villegar Mar 19, 2026
8c02fed
Update audit_engine to require project and check if the given values …
villegar Mar 20, 2026
3fd36d5
Update safe_people.opal generic to include givenName and familyName a…
villegar Mar 20, 2026
ee0ffbb
Update audit_cr8tor and supporting utilitarian functions to make no a…
villegar Mar 20, 2026
3265d07
Update tests to capture new changes in requiring a project for audits
villegar Mar 20, 2026
694df41
New build
villegar Mar 20, 2026
d0f170a
Add new function audit_governance to audit intent vs deployment
villegar Mar 23, 2026
68cd8c6
New build
villegar Mar 23, 2026
c31ca16
Add new internal function .extract_srvr_comp to simplify combination …
villegar Mar 24, 2026
f85b29d
Update logo's URL
villegar Mar 24, 2026
14b7468
Update Collate section
villegar Mar 25, 2026
8781395
Add new global function `audit` to handle all types of audits, includ…
villegar Mar 25, 2026
ce9d394
New build
villegar Mar 25, 2026
360ef98
Update tests to capture changes in the audit module
villegar Mar 25, 2026
6dd3cad
Update calls to audit_safe_* with the new audit() global function
villegar Mar 26, 2026
13c0927
Add internal function audit_intent, that handles if the intent arg is…
villegar Mar 26, 2026
4d42f53
Combine the audit_governance into the main audit function, to replica…
villegar Mar 26, 2026
fda356a
New build
villegar Mar 26, 2026
e2252ca
Set load_cr8tor_bundle as an internal function
villegar Mar 26, 2026
7aa2b95
Rename rocrate_report to report
villegar Mar 26, 2026
385e9e4
New build
villegar Mar 26, 2026
365335c
Update tutorial to reflect changes in the package. including calls to…
villegar Mar 27, 2026
dc4a331
Update title
villegar Mar 27, 2026
1485677
New build
villegar Mar 27, 2026
40ae48c
Move DSMolgenisArmadillo from Suggests to Imports
villegar Mar 31, 2026
703a5ab
Update tests to suppress warning messages generate when no logs are f…
villegar Mar 31, 2026
1c8a5ff
Update minimum version of rocrateR to 0.0.2 and temporarily include R…
villegar Mar 31, 2026
dfc167b
Downgrade dependency with rocrateR
villegar Apr 1, 2026
3fb5859
Add NEWS.md
villegar Apr 2, 2026
37a22d7
Update NEWS
villegar Apr 2, 2026
3733883
Add new GHA workflow to check the package
villegar Apr 2, 2026
b2696c1
Set cache to FALSE
villegar Apr 2, 2026
f415d70
Avoid generation of Rd file for internal functions used by report()
villegar Apr 2, 2026
29ad363
Split README into a separate vignette for longer instructions and onl…
villegar Apr 2, 2026
a06e620
New build
villegar Apr 2, 2026
5e7bdcd
Merge branch 'main' into dev
villegar Apr 2, 2026
b5a0e55
Update reliance on rocrateR 0.1.0 and add fs as a suggested package
villegar Apr 2, 2026
f988412
Temporarily ammend workflow to install dev version of rocrateR
villegar Apr 2, 2026
ca351d7
Update installation of dependencies
villegar Apr 2, 2026
2a4aa40
Add missing package, rcmdcheck
villegar Apr 2, 2026
84dd94c
Add explicit installation of dependencies
villegar Apr 2, 2026
595f176
Update LICENSE
villegar Apr 2, 2026
6072c7f
Update workflows to include github dependency for rocrateR dev
villegar Apr 2, 2026
2c79c69
Update test coverage extra dependencies
villegar Apr 2, 2026
99b29da
Update audit.armadillo and audit.rocrate
villegar Apr 2, 2026
2818cb2
Add GitHub links to DESCRIPTION
villegar Apr 2, 2026
cb9aa65
New build
villegar Apr 2, 2026
e3cd123
Add CITATION file to include end of project report and update author'…
villegar Apr 2, 2026
9d743af
Update internal documentation and remove unused code
villegar Apr 7, 2026
1bea483
Add test to verify that all Rd files have a return value
villegar Apr 7, 2026
53ee49c
New build
villegar Apr 7, 2026
2fb5142
Remove codecov badge
villegar Apr 7, 2026
7ffc6f2
Update the print.cr8tor_bundle generic method
villegar Apr 7, 2026
9a6f2bf
Remove dependency on remote dev version of rocrateR, now on CRAN v0.1.0
villegar Apr 9, 2026
b0c72a3
Remove commented dev package installation, github::ResearchObject/ro-…
villegar Apr 9, 2026
d6a6c62
Remove unused test
villegar Apr 9, 2026
fc74a2c
Update definition of safe_project.armadillo generic and S4 class defi…
villegar Apr 9, 2026
8e039cd
New build
villegar Apr 9, 2026
c21072a
Move opalr to the imports section
villegar Apr 9, 2026
2bfee47
Update generics to handle S4 methods for armadillo
villegar Apr 9, 2026
38888dc
Ignore cran-comments
villegar Apr 9, 2026
5baccb7
Update list of non-standard words
villegar Apr 9, 2026
7b41838
Add CRAN-SUBMISSION to list of ignored files
villegar Apr 9, 2026
6da119b
Update package generics to replace calls to *.armadillo with *.Armadi…
villegar Apr 14, 2026
092f2e6
Remove setting old class for ArmadilloCredentials
villegar Apr 16, 2026
58ad3f0
Update package description
villegar Apr 16, 2026
6af4ebc
Remove cran-comments from GitHub
villegar Apr 16, 2026
c5eb808
Merge pull request #10 from FederatedMethods/armadillo
villegar Apr 16, 2026
600c3c7
Remove calls to print
villegar Apr 16, 2026
03a62cb
Update vignette to avoid writing in user's working directory
villegar Apr 16, 2026
cc13bf6
Remove calls to low level API, opalr::opal.get
villegar Apr 16, 2026
16d30d7
New build
villegar Apr 16, 2026
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
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@
^\.github$
(^|/)\.DS\_Store$
^\.git($|/)
^CRAN-SUBMISSION$
53 changes: 53 additions & 0 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
pull_request:

name: R-CMD-check.yaml

permissions: read-all

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: false
matrix:
config:
- {os: macos-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
- {os: ubuntu-latest, r: 'oldrel-1'}

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: |
any::rcmdcheck
local::.
needs: check

- uses: r-lib/actions/check-r-package@v2
with:
upload-snapshots: true
build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'
4 changes: 3 additions & 1 deletion .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ jobs:

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::pkgdown, local::.
extra-packages: |
any::pkgdown
local::.
needs: website

- name: Build site
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ jobs:

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::covr, any::xml2
extra-packages: |
any::covr
any::xml2
local::.
needs: coverage

- name: Test coverage
Expand All @@ -34,7 +37,6 @@ jobs:
clean = FALSE,
install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
)
print(cov)
covr::to_cobertura(cov)
shell: Rscript {0}

Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,5 @@ rsconnect/
inst/doc
**/.quarto/
inst/R.ignore
cran-comments.md
CRAN-SUBMISSION
50 changes: 13 additions & 37 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Package: dsROCrate
Title: 'DataSHIELD' RO-Crate Wrapper Functions
Title: 'DataSHIELD' RO-Crate Governance Functions
Version: 0.0.1
Authors@R: c(
person(given = "Roberto",
family = "Villegas-Diaz",
role = c("aut", "cre"),
email = "r.villegas-diaz@outlook.com",
comment = c(ORCID = "0000-0001-5036-8661")),
person(given = "Rebecca",
person(given = "Becca",
family = "Wilson",
role = c("aut"),
comment = c(ORCID = "0000-0003-2294-593X")),
Expand All @@ -20,17 +20,19 @@ Authors@R: c(
role = c("aut"),
comment = c(ORCID = "0009-0003-2419-1964")),
person("University of Liverpool", role = c("cph")))
Description: R package to wrap elements from 'DataSHIELD' analysis into an
RO-Crate.
Description: Tools for wrapping 'DataSHIELD' analyses into RO-Crate
(Research Object Crate) objects. Provides functions to create structured
metadata for federated data analysis projects, enabling governance
tracking of data access, project membership, analysis execution and
output validation across distributed data sources.
License: MIT + file LICENSE
Suggests:
dsBaseClient,
DSI,
DSMolgenisArmadillo,
DSOpal,
fs,
knitr,
MolgenisArmadillo,
opalr,
testthat (>= 3.0.0),
withr
Config/testthat/edition: 3
Expand All @@ -41,45 +43,19 @@ RoxygenNote: 7.3.3
Imports:
digest,
dplyr,
DSMolgenisArmadillo,
jsonlite,
methods,
opalr,
purrr,
RcppTOML,
rmarkdown,
rocrateR (>= 0.0.1),
rocrateR (>= 0.1.0),
tibble,
vtree,
xptr,
yaml
Depends:
R (>= 4.1.0)
VignetteBuilder: knitr
Collate:
'ArmadilloCredentials-class.R'
'audit_cr8tor.R'
'audit_safe_people.R'
'audit_safe_project.R'
'audit_study.R'
'dsROCrate-package.R'
'dsROCrate.R'
'rocrate_report.R'
'safe_data.R'
'safe_output.R'
'safe_people.R'
'safe_project.R'
'safe_setting.R'
'utils-armadillo.R'
'utils-connection.R'
'utils-cr8tor.R'
'utils-date.R'
'utils-digest.R'
'utils-opal.R'
'utils-rocrate.R'
'utils-rocrateR.R'
'utils-safe_data.R'
'utils-safe_output.R'
'utils-safe_people.R'
'utils-safe_project.R'
'utils-safe_setting.R'
'utils-show.R'
'utils-tibble.R'
URL: https://github.com/FederatedMethods/dsROCrate
BugReports: https://github.com/FederatedMethods/dsROCrate/issues
2 changes: 2 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
YEAR: 2026
COPYRIGHT HOLDER: University of Liverpool
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License

Copyright (c) 2025 dsROCrate authors
Copyright (c) 2026 University of Liverpool

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
37 changes: 18 additions & 19 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# Generated by roxygen2: do not edit by hand

S3method(audit_safe_people,default)
S3method(audit_safe_people,opal)
S3method(audit_safe_project,default)
S3method(audit_safe_project,opal)
S3method(audit_study,default)
S3method(audit_study,list)
S3method(audit_study,opal)
S3method(audit,ArmadilloCredentials)
S3method(audit,character)
S3method(audit,cr8tor)
S3method(audit,list)
S3method(audit,opal)
S3method(audit,rocrate)
S3method(audit_engine,cr8tor)
S3method(audit_engine,opal)
S3method(extract_safe_data,opal)
S3method(extract_safe_data,rocrate)
S3method(extract_safe_output,opal)
Expand All @@ -29,10 +30,13 @@ S3method(flatten_safe_setting,default)
S3method(flatten_safe_setting,rocrate)
S3method(init,opal)
S3method(init,rocrate)
S3method(rocrate_report,character)
S3method(rocrate_report,default)
S3method(rocrate_report,list)
S3method(rocrate_report,rocrate)
S3method(parse_user_profiles,ArmadilloCredentials)
S3method(print,cr8tor_bundle)
S3method(project_exists,ArmadilloCredentials)
S3method(report,character)
S3method(report,default)
S3method(report,list)
S3method(report,rocrate)
S3method(safe_data,character)
S3method(safe_data,default)
S3method(safe_data,opal)
Expand All @@ -45,6 +49,7 @@ S3method(safe_people,character)
S3method(safe_people,default)
S3method(safe_people,opal)
S3method(safe_people,rocrate)
S3method(safe_project,ArmadilloCredentials)
S3method(safe_project,character)
S3method(safe_project,default)
S3method(safe_project,opal)
Expand All @@ -55,19 +60,13 @@ S3method(safe_setting,default)
S3method(safe_setting,opal)
S3method(safe_setting,rocrate)
export(armadillo_login)
export(audit_cr8tor)
export(audit_safe_people)
export(audit_safe_project)
export(audit_study)
export(audit)
export(init)
export(load_cr8tor_bundle)
export(rocrate_report)
export(report)
export(safe_data)
export(safe_output)
export(safe_people)
export(safe_project)
export(safe_setting)
exportMethods(safe_project)
import(methods)
importFrom(rocrateR,get_entity)
importFrom(utils,write.csv)
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# dsROCrate 0.0.1

* Initial CRAN submission.
* This version contains standard functions for auditing (`audit()`), reporting
(`report()`) and extracting five safe principle components (`safe_*()`).
* This version currently only supports OBiBa's Opal as the backend.
17 changes: 0 additions & 17 deletions R/ArmadilloCredentials-class.R

This file was deleted.

Loading
Loading