updated dpcy

Author: matthewphamilton

R/fn_make.R

@@ -914,14 +914,15 @@ make_s4_mthds_ls <- function (fns_dir_1L_chr = "data-raw/s4_fns")
     if (length(fn_nms_chr) > 0) {
         mthd_nms_chr <- env_ls$fns_path_chr %>% fs::path_file() %>% 
             stringr::str_sub(end = -3)
-        s4_mthds_ls <- mthd_nms_chr %>% purrr::map(~{
+        mthds_ls <- mthd_nms_chr %>% purrr::map(~{
             mthd_nm_1L_chr <- .x
             mthd_fns_chr <- fn_nms_chr[fn_nms_chr %>% startsWith(paste0(mthd_nm_1L_chr, 
                 "_"))]
             cls_nms_chr <- mthd_fns_chr %>% stringr::str_remove(paste0(mthd_nm_1L_chr, 
                 "_"))
             mthd_fns_chr <- mthd_fns_chr %>% stats::setNames(cls_nms_chr)
         }) %>% stats::setNames(mthd_nms_chr)
+        s4_mthds_ls <- list(mthds_ls = mthds_ls, env_ls = env_ls)
     }
     else {
         s4_mthds_ls <- NULL

R/fn_write.R

@@ -103,13 +103,13 @@ write_mthds_for_r3_or_r4_clss <- function (methods_tb, fn_ls, fn_types_lup, pkg_
         fn_types_lup = fn_types_lup))
 }
 #' Write ready4 S4 methods
-#' @description write_r4_mthds() is a Write function that writes a file to a specified local directory. Specifically, this function implements an algorithm to write ready4 s4 methods. The function returns Written files (a list of lists).
+#' @description write_r4_mthds() is a Write function that writes a file to a specified local directory. Specifically, this function implements an algorithm to write ready4 s4 methods. The function returns a S4 methods (a list).
 #' @param fns_dir_1L_chr Functions directory (a character vector of length one), Default: 'data-raw/s4_fns'
 #' @param fn_types_lup Function types (a lookup table), Default: NULL
 #' @param import_from_chr Import from (a character vector), Default: character(0)
 #' @param output_dir_1L_chr Output directory (a character vector of length one), Default: 'R'
 #' @param pkg_nm_1L_chr Package name (a character vector of length one), Default: character(0)
-#' @return Written files (a list of lists)
+#' @return a S4 methods (a list)
 #' @rdname write_r4_mthds
 #' @export 
 #' @importFrom ready4fun get_dev_pkg_nm make_gnrc_imports
@@ -125,14 +125,14 @@ write_r4_mthds <- function (fns_dir_1L_chr = "data-raw/s4_fns", fn_types_lup = N
         import_from_chr <- ready4fun::make_gnrc_imports()
     s4_mthds_ls <- make_s4_mthds_ls(fns_dir_1L_chr)
     if (!is.null(s4_mthds_ls)) {
-        written_files_ls_ls <- purrr::map2(s4_mthds_ls, names(s4_mthds_ls), 
-            ~{
+        written_files_ls_ls <- purrr::map2(s4_mthds_ls$mthds_ls, 
+            names(s4_mthds_ls$mthds_ls), ~{
                 fn_name_1L_chr <- .y
                 classes_chr <- names(.x)
                 fns_chr <- unname(.x)
                 purrr::map2(classes_chr, fns_chr, ~{
                   class_nm_1L_chr <- .x
-                  fn <- env_ls$fns_env %>% purrr::pluck(.y)
+                  fn <- s4_mthds_ls$env_ls$fns_env %>% purrr::pluck(.y)
                   fn_desc_chr <- rep(paste0(fn_name_1L_chr, " method applied to ", 
                     class_nm_1L_chr), 2)
                   fn_outp_type_1L_chr <- ""
@@ -147,7 +147,7 @@ write_r4_mthds <- function (fns_dir_1L_chr = "data-raw/s4_fns", fn_types_lup = N
     else {
         written_files_ls_ls <- NULL
     }
-    return(written_files_ls_ls)
+    return(s4_mthds_ls)
 }
 #' Write script to make generic
 #' @description write_script_to_make_gnrc() is a Write function that writes a file to a specified local directory. Specifically, this function implements an algorithm to write script to make generic. The function is called for its side effects and does not return a value. WARNING: This function writes R scripts to your local environment. Make sure to only use if you want this behaviour

_pkgdown.yml

@@ -1,9 +1,9 @@
 home:
   links:
   - text: Manual - User (PDF)
-    href: https://dataverse.harvard.edu/api/access/datafile/5342649
+    href: https://dataverse.harvard.edu/api/access/datafile/5342686
   - text: Manual - Developer (PDF)
-    href: https://dataverse.harvard.edu/api/access/datafile/5342648
+    href: https://dataverse.harvard.edu/api/access/datafile/5342685
   - text: Project website
     href:  https://www.ready4-dev.com/
 development:

data-raw/fns/make.R

@@ -856,14 +856,16 @@ make_s4_mthds_ls <- function(fns_dir_1L_chr = "data-raw/s4_fns"){
   fn_nms_chr <- env_ls$fns_env %>% names()
   if(length(fn_nms_chr)>0){
     mthd_nms_chr <- env_ls$fns_path_chr %>% fs::path_file() %>% stringr::str_sub(end=-3)
-    s4_mthds_ls <- mthd_nms_chr %>%
+    mthds_ls <- mthd_nms_chr %>%
       purrr::map(~{
         mthd_nm_1L_chr <- .x
         mthd_fns_chr <- fn_nms_chr[fn_nms_chr %>% startsWith(paste0(mthd_nm_1L_chr,"_"))]
         cls_nms_chr <-  mthd_fns_chr %>% stringr::str_remove(paste0(mthd_nm_1L_chr,"_"))
         mthd_fns_chr <- mthd_fns_chr %>% stats::setNames(cls_nms_chr)
       }) %>%
       stats::setNames(mthd_nms_chr)
+    s4_mthds_ls <- list(mthds_ls = mthds_ls,
+                        env_ls = env_ls)
   }else{
     s4_mthds_ls <- NULL
   }

data-raw/fns/write.R

@@ -113,8 +113,8 @@ write_r4_mthds <- function(fns_dir_1L_chr = "data-raw/s4_fns",
     import_from_chr <- ready4fun::make_gnrc_imports()
   s4_mthds_ls <- make_s4_mthds_ls(fns_dir_1L_chr)
   if(!is.null(s4_mthds_ls)){
-    written_files_ls_ls <- purrr::map2(s4_mthds_ls,
-                                      names(s4_mthds_ls),
+    written_files_ls_ls <- purrr::map2(s4_mthds_ls$mthds_ls,
+                                      names(s4_mthds_ls$mthds_ls),
                                       ~{
                                         fn_name_1L_chr <- .y
                                         classes_chr <- names(.x)
@@ -123,7 +123,7 @@ write_r4_mthds <- function(fns_dir_1L_chr = "data-raw/s4_fns",
                                                     fns_chr,
                                                     ~ {
                                                       class_nm_1L_chr <- .x
-                                                      fn <- env_ls$fns_env %>% purrr::pluck(.y)
+                                                      fn <- s4_mthds_ls$env_ls$fns_env %>% purrr::pluck(.y)
                                                       fn_desc_chr <- rep(paste0(fn_name_1L_chr," method applied to ",class_nm_1L_chr),2)
                                                       fn_outp_type_1L_chr <- ""
                                                       write_std_mthd(fn,
@@ -140,7 +140,7 @@ write_r4_mthds <- function(fns_dir_1L_chr = "data-raw/s4_fns",
   }else{
     written_files_ls_ls <- NULL
   }
-  return(written_files_ls_ls)
+  return(s4_mthds_ls)
 }
 write_scripts_to_mk_r3_cls <- function(name_stub_1L_chr,
                                        name_pfx_1L_chr,##