Update docs

DESCRIPTION

@@ -1,70 +1,58 @@
 Package: val.meter
-Title:
-    validation-ready package quantification supporting regulatory use of R
+Title:validation-ready package quantification supporting regulatory use
+    of R
 Version: 0.0.0.9000
-Authors@R:
-    c(
-      person(
-        "Doug", "Kelkhoff",
-        email = "doug.kelkhoff@gmail.com",
-        role = c("aut", "cre")            
-      ),
-      person(
-        "Aaron", "Clark",
-        email = "clark.aaronchris@gmail.com",
-        role = c("ctb")            
-      ),
-      person(
-        "R Validation Hub",
-        email = "r-val-hub-maintainers@lists.r-consortium.org",
-        comment = c("website" = "https://www.pharmar.org"),
-        role = c("cph")
-      )
-    )
-Description:
-    Measures packages for common best practices, adoption and code execution.
-    Built with regulated industries in mind, supporting the surveying of
-    packages and aggregating findings into a portable format to support
-    activities like selecting mature packages and reporting on risk-based
-    software decision-making.
+Authors@R: c(
+    person("Doug", "Kelkhoff", , "doug.kelkhoff@gmail.com", role = c("aut", "cre")),
+    person("Aaron", "Clark", , "clark.aaronchris@gmail.com", role = "ctb"),
+    person("Lluís", "Revilla Sancho", , "lluis.revilla@gmail.com", role = "ctb",
+           comment = c(ORCID = "0000-0001-9747-2570")),
+    person("R Validation Hub", , , "r-val-hub-maintainers@lists.r-consortium.org", role = "cph",
+           comment = c(website = "https://www.pharmar.org"))
+  )
+Description:Measures packages for common best practices, adoption and
+    code execution.  Built with regulated industries in mind, supporting
+    the surveying of packages and aggregating findings into a portable
+    format to support activities like selecting mature packages and
+    reporting on risk-based software decision-making.
 License: MIT + file LICENSE
-URL: 
-    https://pharmar.github.io/val.meter,
-    https://github.com/pharmar/val.meter,
-    https://pharmar.org/
-BugReports:
-    https://github.com/pharmaR/val.meter/issues
+URL: https://pharmar.github.io/val.meter,
+    https://github.com/pharmar/val.meter, https://pharmar.org/
+BugReports:https://github.com/pharmaR/val.meter/issues
+Depends: 
+    R (>= 3.5)
 Imports:
     cli,
     desc,
     evaluate,
+    httr2,
+    jsonlite,
     options,
     S7,
+    stats,
     tools,
     utils,
-    stats,
-    jsonlite,
-    httr2,
     xml2
 Suggests:
     covr,
-    rcmdcheck,
     htmltools,
     igraph,
     knitr,
+    rcmdcheck,
     rmarkdown,
     rosv,
     testthat (>= 3.0.0),
     withr
-Config/Needs/vignettes:
-    knitr,
-    rmarkdown,
-    rosv,
-    testthat (>= 3.0.0)
-Config/Needs/readme:
-    asciicast
-Config/Needs/data:
-    tidytext
+VignetteBuilder: 
+    knitr
+Config/Needs/data:tidytext
+Config/Needs/readme:asciicast
+Config/Needs/vignettes:knitr, rmarkdown, rosv, testthat (>= 3.0.0)
+Config/roxygen2/version: 8.1.0
+Config/testthat/edition: 3
+Encoding: UTF-8
+LazyData: true
+Roxygen: list(markdown = TRUE)
 Collate:
     'utils_enum_vector.R'
     'class_tags.R'
@@ -108,11 +96,3 @@ Collate:
     'utils_rstudio.R'
     'utils_tmp.R'
     'zzz.R'
-Encoding: UTF-8
-Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.3
-Depends: 
-    R (>= 3.5)
-LazyData: true
-VignetteBuilder: knitr
-Config/testthat/edition: 3

NAMESPACE

@@ -50,26 +50,36 @@ import(cli)
 import(options)
 importFrom(desc,desc)
 importFrom(evaluate,replay)
-importFrom(httr2,req_perform)
-importFrom(httr2,request)
-importFrom(httr2,resp_body_html)
+importFrom(httr2,
+  req_perform,
+  request,
+  resp_body_html
+)
 importFrom(jsonlite,read_json)
-importFrom(stats,rbinom)
-importFrom(stats,rpois)
-importFrom(stats,runif)
-importFrom(tools,dependsOnPkgs)
-importFrom(tools,file_ext)
-importFrom(tools,getVignetteInfo)
-importFrom(tools,toRd)
-importFrom(utils,.DollarNames)
-importFrom(utils,available.packages)
-importFrom(utils,capture.output)
-importFrom(utils,download.file)
-importFrom(utils,download.packages)
-importFrom(utils,getCRANmirrors)
-importFrom(utils,head)
-importFrom(utils,install.packages)
-importFrom(utils,packageName)
-importFrom(utils,packageVersion)
-importFrom(xml2,xml_attrs)
-importFrom(xml2,xml_find_all)
+importFrom(stats,
+  rbinom,
+  rpois,
+  runif
+)
+importFrom(tools,
+  dependsOnPkgs,
+  file_ext,
+  getVignetteInfo,
+  toRd
+)
+importFrom(utils,
+  .DollarNames,
+  available.packages,
+  capture.output,
+  download.file,
+  download.packages,
+  getCRANmirrors,
+  head,
+  install.packages,
+  packageName,
+  packageVersion
+)
+importFrom(xml2,
+  xml_attrs,
+  xml_find_all
+)

R/data_desc.R

@@ -1,10 +1,12 @@
 #' @include impl_data.R
 
+source_code_or_install <- new_union(source_code_resource, install_resource)
+
 #' @importFrom desc desc
 impl_data(
   "desc",
   class = c("description", "R6"),
-  for_resource = new_union(source_code_resource, install_resource),
+  for_resource = source_code_or_install,
   function(pkg, resource, field, ...) {
     desc::desc(resource@path)
   }
@@ -14,7 +16,7 @@ impl_data(
   "name",
   title = "Package name",
   class = class_character,
-  for_resource = new_union(source_code_resource, install_resource),
+  for_resource = source_code_or_install,
   function(pkg, resource, field, ...) {
     pkg$desc$get_field("Package")
   }
@@ -31,7 +33,7 @@ impl_data(
 impl_data(
   "version",
   class = class_character,
-  for_resource = new_union(source_code_resource, install_resource),
+  for_resource = source_code_or_install,
   function(pkg, resource, field, ...) {
     pkg$desc$get_field("Version")
   }
@@ -48,7 +50,7 @@ impl_data(
 impl_data(
   "md5",
   class = class_character,
-  for_resource = new_union(source_code_resource, install_resource),
+  for_resource = source_code_or_install,
   function(pkg, resource, field, ...) {
     pkg$desc$get_field("MD5sum")
   }

R/data_has_current_news.R

@@ -50,7 +50,7 @@ impl_data(
 #' @importFrom tools file_ext
 impl_data(
   "has_current_news",
-  for_resource = new_union(install_resource, source_code_resource),
+  for_resource = source_code_or_install,
   overwrite = TRUE,
   function(pkg, resource, field, ...) {
     files <- resource@path |>

R/generic_pkg_data_derive.R

@@ -99,7 +99,7 @@ method(
 #' @noRd
 method(
   pkg_data_derive,
-  list(class_pkg, new_union(NULL, class_missing), class_any)
+  list(class_pkg, class_missing | new_S3_class("NULL"), class_any)
 ) <-
   function(pkg, resource, field, ...) {
     pkg_data_derive(pkg = pkg, resource = pkg@resource, field = field, ...)