Skip to content

Commit 6552571

Browse files
moved code metadata to pkg dmt from dv
1 parent a0103e8 commit 6552571

50 files changed

Lines changed: 721 additions & 840 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.Rbuildignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,10 @@
8484
^data-raw/TEMP/mthd_ratify\.R$
8585
^data-raw/TEMP/mthd_renew\.R$
8686
^data-raw/TEMP/mthd_report\.R$
87+
^data-raw/abbreviations_lup\.Rds$
88+
^data-raw/fn_types_lup\.Rds$
89+
^data-raw/object_type_lup\.Rds$
90+
^data-raw/prototype_lup\.Rds$
91+
^data-raw/seed_obj_lup_tb\.Rds$
92+
^data-raw/seed_obj_type_lup\.Rds$
93+
^data-raw/treat_as_words_chr\.Rds$

NAMESPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ export(get_obj_type_new_cses)
3535
export(get_outp_obj_type)
3636
export(get_r4_obj_slots)
3737
export(get_rds_from_dv)
38+
export(get_rds_from_pkg_dmt)
3839
export(get_return_obj_nm)
3940
export(import_xls_sheets)
4041
export(is_ready4fun_abbreviations)
@@ -255,7 +256,6 @@ importFrom(ready4,authorData)
255256
importFrom(ready4,authorFunctions)
256257
importFrom(ready4,get_from_lup_obj)
257258
importFrom(ready4,get_r4_obj_slots)
258-
importFrom(ready4,get_rds_from_dv)
259259
importFrom(ready4,make_list_phrase)
260260
importFrom(ready4,make_prompt)
261261
importFrom(ready4,procure)

R/C3_ready4fun_metadata_b.R

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ x
3939
#' @param inc_pkg_meta_data_1L_lgl Include package meta data (a logical vector of length one), Default: logical(0)
4040
#' @param object_type_lup Object type (a lookup table), Default: ready4fun_abbreviations()
4141
#' @param path_to_dmt_dir_1L_chr Path to documentation directory (a character vector of length one), Default: character(0)
42+
#' @param piggyback_to_1L_chr Piggyback to (a character vector of length one), Default: character(0)
4243
#' @param pkg_dmt_dv_dss_chr Package documentation dataverse datasets (a character vector), Default: character(0)
4344
#' @param pkg_ds_ls_ls Package dataset (a list of lists), Default: list()
4445
#' @param seed_obj_type_lup Seed object type (a lookup table), Default: tibble::tibble()
@@ -66,6 +67,7 @@ import_from_chr = character(0),
6667
inc_pkg_meta_data_1L_lgl = logical(0),
6768
object_type_lup = ready4fun_abbreviations(),
6869
path_to_dmt_dir_1L_chr = character(0),
70+
piggyback_to_1L_chr = character(0),
6971
pkg_dmt_dv_dss_chr = character(0),
7072
pkg_ds_ls_ls = list(),
7173
seed_obj_type_lup = tibble::tibble(),
@@ -87,6 +89,7 @@ import_from_chr = import_from_chr,
8789
inc_pkg_meta_data_1L_lgl = inc_pkg_meta_data_1L_lgl,
8890
object_type_lup = object_type_lup,
8991
path_to_dmt_dir_1L_chr = path_to_dmt_dir_1L_chr,
92+
piggyback_to_1L_chr = piggyback_to_1L_chr,
9093
pkg_dmt_dv_dss_chr = pkg_dmt_dv_dss_chr,
9194
pkg_ds_ls_ls = pkg_ds_ls_ls,
9295
seed_obj_type_lup = seed_obj_type_lup,

R/db_abbreviations_lup.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
#' \item{long_name_chr}{Long name (a character vector)}
1010
#' \item{plural_lgl}{Plural (a logical vector)}
1111
#' }
12-
#' @source \url{https://doi.org/10.7910/DVN/2Y9VF9}
12+
#' @source \url{ready4-dev/ready4}
1313
"abbreviations_lup"

R/db_fn_types_lup.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
#' \item{is_generic_lgl}{Is generic (a logical vector)}
1313
#' \item{is_method_lgl}{Is method (a logical vector)}
1414
#' }
15-
#' @source \url{https://doi.org/10.7910/DVN/2Y9VF9}
15+
#' @source \url{ready4-dev/ready4}
1616
"fn_types_lup"

R/fn_add.R

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,14 +255,13 @@ add_lups <- function (template_lup, new_lup, key_var_nm_1L_chr, priority_lup_for
255255
#' @return Package setup (a list)
256256
#' @rdname add_new_cls_pts
257257
#' @export
258-
#' @importFrom ready4 get_rds_from_dv add_lups
259258
#' @importFrom dplyr filter
259+
#' @importFrom ready4 add_lups
260260
add_new_cls_pts <- function (pkg_setup_ls, addl_cls_pts_tb = NULL, purge_pkg_clss_1L_lgl = T)
261261
{
262262
if (is.null(pkg_setup_ls$subsequent_ls$prototype_lup)) {
263-
pkg_setup_ls$subsequent_ls$prototype_lup <- ready4::get_rds_from_dv("prototype_lup",
264-
dv_ds_nm_1L_chr = pkg_setup_ls$subsequent_ls$dv_ds_nm_1L_chr,
265-
dv_url_pfx_1L_chr = pkg_setup_ls$subsequent_ls$dv_url_pfx_1L_chr)
263+
pkg_setup_ls$subsequent_ls$prototype_lup <- get_rds_from_pkg_dmt(pkg_setup_ls,
264+
fl_nm_1L_chr = "prototype_lup")
266265
}
267266
if (purge_pkg_clss_1L_lgl) {
268267
pkg_setup_ls$subsequent_ls$prototype_lup <- pkg_setup_ls$subsequent_ls$prototype_lup %>%

R/fn_get.R

Lines changed: 51 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,23 @@ get_all_depcys_of_fns <- function (pkg_depcy_ls, fns_chr)
2424
#' Get argument object type
2525
#' @description get_arg_obj_type() is a Get function that retrieves a pre-existing data object from memory, local file system or online repository. Specifically, this function implements an algorithm to get argument object type. Function argument argument_nm_1L_chr specifies the where to look for the required object. The function returns Argument object type (a character vector of length one).
2626
#' @param argument_nm_1L_chr Argument name (a character vector of length one)
27-
#' @param dv_ds_nm_1L_chr Dataverse dataset name (a character vector of length one), Default: 'https://doi.org/10.7910/DVN/2Y9VF9'
28-
#' @param dv_url_pfx_1L_chr Dataverse url prefix (a character vector of length one), Default: character(0)
29-
#' @param key_1L_chr Key (a character vector of length one), Default: NULL
27+
#' @param dv_ds_nm_1L_chr Dataverse dataset name (a character vector of length one), Default: 'ready4-dev/ready4'
28+
#' @param dv_url_pfx_1L_chr Dataverse url prefix (a character vector of length one), Default: deprecated()
29+
#' @param key_1L_chr Key (a character vector of length one), Default: deprecated()
3030
#' @param object_type_lup Object type (a lookup table), Default: NULL
31-
#' @param server_1L_chr Server (a character vector of length one), Default: Sys.getenv("DATAVERSE_SERVER")
31+
#' @param server_1L_chr Server (a character vector of length one), Default: deprecated()
3232
#' @return Argument object type (a character vector of length one)
3333
#' @rdname get_arg_obj_type
3434
#' @export
35-
#' @importFrom ready4 get_rds_from_dv
3635
#' @importFrom dplyr filter mutate pull
3736
#' @keywords internal
38-
get_arg_obj_type <- function (argument_nm_1L_chr, dv_ds_nm_1L_chr = "https://doi.org/10.7910/DVN/2Y9VF9",
39-
dv_url_pfx_1L_chr = character(0), key_1L_chr = NULL, object_type_lup = NULL,
40-
server_1L_chr = Sys.getenv("DATAVERSE_SERVER"))
37+
get_arg_obj_type <- function (argument_nm_1L_chr, dv_ds_nm_1L_chr = "ready4-dev/ready4",
38+
dv_url_pfx_1L_chr = deprecated(), key_1L_chr = deprecated(),
39+
object_type_lup = NULL, server_1L_chr = deprecated())
4140
{
4241
if (is.null(object_type_lup))
43-
object_type_lup <- ready4::get_rds_from_dv("object_type_lup",
44-
dv_ds_nm_1L_chr = dv_ds_nm_1L_chr, dv_url_pfx_1L_chr = dv_url_pfx_1L_chr,
45-
key_1L_chr = key_1L_chr, server_1L_chr = server_1L_chr)
42+
object_type_lup <- get_rds_from_pkg_dmt(fl_nm_1L_chr = "object_type_lup",
43+
piggyback_to_1L_chr = dv_ds_nm_1L_chr)
4644
nchar_int <- nchar(object_type_lup$short_name_chr)
4745
match_chr <- object_type_lup$long_name_chr[endsWith(argument_nm_1L_chr,
4846
paste0(ifelse(nchar(argument_nm_1L_chr) == nchar_int,
@@ -386,26 +384,24 @@ get_new_fn_types <- function (pkg_setup_ls, fn_nms_ls = make_fn_nms(), undmtd_fn
386384
#' Get object type new cases
387385
#' @description get_obj_type_new_cses() is a Get function that retrieves a pre-existing data object from memory, local file system or online repository. Specifically, this function implements an algorithm to get object type new cases. Function argument updated_obj_type_lup specifies the where to look for the required object. The function returns Object type lookup table new cases (a tibble).
388386
#' @param updated_obj_type_lup Updated object type (a lookup table)
389-
#' @param dv_ds_nm_1L_chr Dataverse dataset name (a character vector of length one), Default: 'https://doi.org/10.7910/DVN/2Y9VF9'
390-
#' @param dv_url_pfx_1L_chr Dataverse url prefix (a character vector of length one), Default: character(0)
387+
#' @param dv_ds_nm_1L_chr Dataverse dataset name (a character vector of length one), Default: 'ready4-dev/ready4'
388+
#' @param dv_url_pfx_1L_chr Dataverse url prefix (a character vector of length one), Default: deprecated()
391389
#' @param excluded_chr Excluded (a character vector), Default: 'NA'
392-
#' @param key_1L_chr Key (a character vector of length one), Default: NULL
390+
#' @param key_1L_chr Key (a character vector of length one), Default: deprecated()
393391
#' @param old_obj_type_lup Old object type (a lookup table), Default: NULL
394-
#' @param server_1L_chr Server (a character vector of length one), Default: Sys.getenv("DATAVERSE_SERVER")
392+
#' @param server_1L_chr Server (a character vector of length one), Default: deprecated()
395393
#' @return Object type lookup table new cases (a tibble)
396394
#' @rdname get_obj_type_new_cses
397395
#' @export
398-
#' @importFrom ready4 get_rds_from_dv
399396
#' @importFrom dplyr filter
400397
#' @keywords internal
401-
get_obj_type_new_cses <- function (updated_obj_type_lup, dv_ds_nm_1L_chr = "https://doi.org/10.7910/DVN/2Y9VF9",
402-
dv_url_pfx_1L_chr = character(0), excluded_chr = NA_character_,
403-
key_1L_chr = NULL, old_obj_type_lup = NULL, server_1L_chr = Sys.getenv("DATAVERSE_SERVER"))
398+
get_obj_type_new_cses <- function (updated_obj_type_lup, dv_ds_nm_1L_chr = "ready4-dev/ready4",
399+
dv_url_pfx_1L_chr = deprecated(), excluded_chr = NA_character_,
400+
key_1L_chr = deprecated(), old_obj_type_lup = NULL, server_1L_chr = deprecated())
404401
{
405402
if (is.null(old_obj_type_lup))
406-
old_obj_type_lup <- ready4::get_rds_from_dv("object_type_lup",
407-
dv_ds_nm_1L_chr = dv_ds_nm_1L_chr, dv_url_pfx_1L_chr = dv_url_pfx_1L_chr,
408-
key_1L_chr = key_1L_chr, server_1L_chr = server_1L_chr)
403+
old_obj_type_lup <- get_rds_from_pkg_dmt(fl_nm_1L_chr = "object_type_lup",
404+
piggyback_to_1L_chr = dv_ds_nm_1L_chr)
409405
obj_type_lup_new_cses_tb <- updated_obj_type_lup %>% dplyr::filter(!short_name_chr %in%
410406
old_obj_type_lup$short_name_chr)
411407
if (!is.na(excluded_chr[1]))
@@ -417,27 +413,25 @@ get_obj_type_new_cses <- function (updated_obj_type_lup, dv_ds_nm_1L_chr = "http
417413
#' @description get_outp_obj_type() is a Get function that retrieves a pre-existing data object from memory, local file system or online repository. Specifically, this function implements an algorithm to get output object type. Function argument fns_chr specifies the where to look for the required object. The function returns Output object type (a character vector).
418414
#' @param fns_chr Functions (a character vector)
419415
#' @param abbreviations_lup Abbreviations (a lookup table)
420-
#' @param dv_ds_nm_1L_chr Dataverse dataset name (a character vector of length one), Default: 'https://doi.org/10.7910/DVN/2Y9VF9'
421-
#' @param dv_url_pfx_1L_chr Dataverse url prefix (a character vector of length one), Default: character(0)
416+
#' @param dv_ds_nm_1L_chr Dataverse dataset name (a character vector of length one), Default: 'ready4-dev/ready4'
417+
#' @param dv_url_pfx_1L_chr Dataverse url prefix (a character vector of length one), Default: deprecated()
422418
#' @param fns_env_ls Functions (a list of environments)
423419
#' @param is_generic_lgl Is generic (a logical vector), Default: F
424-
#' @param key_1L_chr Key (a character vector of length one), Default: NULL
420+
#' @param key_1L_chr Key (a character vector of length one), Default: deprecated()
425421
#' @param object_type_lup Object type (a lookup table), Default: NULL
426-
#' @param server_1L_chr Server (a character vector of length one), Default: Sys.getenv("DATAVERSE_SERVER")
422+
#' @param server_1L_chr Server (a character vector of length one), Default: deprecated()
427423
#' @return Output object type (a character vector)
428424
#' @rdname get_outp_obj_type
429425
#' @export
430-
#' @importFrom ready4 get_rds_from_dv
431426
#' @importFrom purrr map2_chr
432427
#' @keywords internal
433-
get_outp_obj_type <- function (fns_chr, abbreviations_lup, dv_ds_nm_1L_chr = "https://doi.org/10.7910/DVN/2Y9VF9",
434-
dv_url_pfx_1L_chr = character(0), fns_env_ls, is_generic_lgl = F,
435-
key_1L_chr = NULL, object_type_lup = NULL, server_1L_chr = Sys.getenv("DATAVERSE_SERVER"))
428+
get_outp_obj_type <- function (fns_chr, abbreviations_lup, dv_ds_nm_1L_chr = "ready4-dev/ready4",
429+
dv_url_pfx_1L_chr = deprecated(), fns_env_ls, is_generic_lgl = F,
430+
key_1L_chr = deprecated(), object_type_lup = NULL, server_1L_chr = deprecated())
436431
{
437432
if (is.null(object_type_lup))
438-
object_type_lup <- ready4::get_rds_from_dv("object_type_lup",
439-
dv_ds_nm_1L_chr = dv_ds_nm_1L_chr, dv_url_pfx_1L_chr = dv_url_pfx_1L_chr,
440-
key_1L_chr = key_1L_chr, server_1L_chr = server_1L_chr)
433+
object_type_lup <- get_rds_from_pkg_dmt(fl_nm_1L_chr = "object_type_lup",
434+
piggyback_to_1L_chr = dv_ds_nm_1L_chr)
441435
outp_obj_type_chr <- purrr::map2_chr(fns_chr, is_generic_lgl,
442436
~{
443437
if (.y) {
@@ -516,6 +510,30 @@ get_rds_from_dv <- function (file_nm_1L_chr, dv_ds_nm_1L_chr = "https://doi.org/
516510
}
517511
return(r_object_xx)
518512
}
513+
#' Get rds from package documentation
514+
#' @description get_rds_from_pkg_dmt() is a Get function that retrieves a pre-existing data object from memory, local file system or online repository. Specifically, this function implements an algorithm to get rds from package documentation. Function argument pkg_setup_ls specifies the where to look for the required object. The function returns R object (an output object of multiple potential types).
515+
#' @param pkg_setup_ls Package setup (a list), Default: NULL
516+
#' @param fl_nm_1L_chr File name (a character vector of length one)
517+
#' @param piggyback_to_1L_chr Piggyback to (a character vector of length one), Default: character(0)
518+
#' @param piggyback_tag_1L_chr Piggyback tag (a character vector of length one), Default: 'Documentation_0.0'
519+
#' @return R object (an output object of multiple potential types)
520+
#' @rdname get_rds_from_pkg_dmt
521+
#' @export
522+
#' @importFrom piggyback pb_download_url
523+
#' @keywords internal
524+
get_rds_from_pkg_dmt <- function (pkg_setup_ls = NULL, fl_nm_1L_chr, piggyback_to_1L_chr = character(0),
525+
piggyback_tag_1L_chr = "Documentation_0.0")
526+
{
527+
if (!is.null(pkg_setup_ls)) {
528+
piggyback_to_1L_chr <- pkg_setup_ls$subsequent_ls$piggyback_to_1L_chr
529+
}
530+
dmt_urls_chr <- piggyback::pb_download_url(repo = piggyback_to_1L_chr,
531+
tag = piggyback_tag_1L_chr)
532+
dmt_url_1L_chr <- dmt_urls_chr[dmt_urls_chr %>% endsWith(paste0(fl_nm_1L_chr,
533+
".Rds"))]
534+
r_object_xx <- readRDS(url(dmt_url_1L_chr))
535+
return(r_object_xx)
536+
}
519537
#' Get return object name
520538
#' @description get_return_obj_nm() is a Get function that retrieves a pre-existing data object from memory, local file system or online repository. Specifically, this function implements an algorithm to get return object name. Function argument fn specifies the where to look for the required object. The function returns Return (a character vector of length one).
521539
#' @param fn Function (a function)

0 commit comments

Comments
 (0)