fix of unlabel fn

Author: matthewphamilton

NAMESPACE

@@ -137,7 +137,6 @@ importFrom(rlang,exec)
 importFrom(rlang,sym)
 importFrom(sinew,makeOxyFile)
 importFrom(sinew,makeOxygen)
-importFrom(sjlabelled,unlabel)
 importFrom(stats,setNames)
 importFrom(stringi,stri_locate_last_fixed)
 importFrom(stringi,stri_replace_first_regex)
@@ -152,6 +151,7 @@ importFrom(stringr,str_replace)
 importFrom(stringr,str_replace_all)
 importFrom(stringr,str_sub)
 importFrom(stringr,str_trim)
+importFrom(summarytools,unlabel)
 importFrom(testit,assert)
 importFrom(tibble,add_case)
 importFrom(tibble,is_tibble)

R/db_fns_dmt_tb.R

@@ -9,7 +9,7 @@
 #'   \item{title_chr}{Title (a character vector)}
 #'   \item{desc_chr}{Description (a character vector)}
 #'   \item{details_chr}{Details (a character vector)}
-#'   \item{inc_for_main_user_lgl}{Inc for main user (a logical vector)}
+#'   \item{inc_for_main_user_lgl}{Include for main user (a logical vector)}
 #'   \item{output_chr}{Output (a character vector)}
 #'   \item{example_lgl}{Example (a logical vector)}
 #'   \item{args_ls}{Arguments (a list)}

R/fn_add.R

@@ -94,7 +94,7 @@ add_indefartls_to_phrases <- function (abbreviated_phrase_1L_chr, abbreviations_
 #' @importFrom dplyr filter pull bind_rows arrange
 #' @importFrom rlang sym
 #' @importFrom Hmisc label
-#' @importFrom sjlabelled unlabel
+#' @importFrom summarytools unlabel
 #' @keywords internal
 add_lups <- function (template_lup, new_lup, key_var_nm_1L_chr, priority_lup_for_dupls_1L_chr = "template") 
 {
@@ -111,10 +111,11 @@ add_lups <- function (template_lup, new_lup, key_var_nm_1L_chr, priority_lup_for
         labels_chr <- Hmisc::label(new_lup) %>% unname()
     }
     if (!all(labels_chr %>% unique() == "")) {
-        Hmisc::label(template_lup %>% sjlabelled::unlabel()) <- as.list(Hmisc::label(labels_chr) %>% 
-            unname())
-        Hmisc::label(new_lup %>% sjlabelled::unlabel()) <- as.list(Hmisc::label(labels_chr) %>% 
+        template_lup <- template_lup %>% summarytools::unlabel()
+        new_lup <- new_lup %>% summarytools::unlabel()
+        Hmisc::label(template_lup) <- as.list(labels_chr %>% 
             unname())
+        Hmisc::label(new_lup) <- as.list(labels_chr %>% unname())
     }
     combined_lups <- dplyr::bind_rows(template_lup, new_lup) %>% 
         dplyr::arrange(!!rlang::sym(key_var_nm_1L_chr))

R/fn_make.R

@@ -241,7 +241,7 @@ make_depnt_fns_ls <- function (arg_ls, pkg_depcy_ls)
 #'    force_false_chr = NA_character_), args_ls_ls = NULL)
 #' @param fn_type_lup_tb Function type lookup table (a tibble)
 #' @param abbreviations_lup Abbreviations (a lookup table), Default: NULL
-#' @param inc_all_mthds_1L_lgl Inc all mthds (a logical vector of length one), Default: T
+#' @param inc_all_mthds_1L_lgl Include all methods (a logical vector of length one), Default: T
 #' @return All functions documentation (a tibble)
 #' @rdname make_dmt_for_all_fns
 #' @export 
@@ -930,12 +930,12 @@ make_pkg_desc_ls <- function (pkg_nm_1L_chr = get_dev_pkg_nm(), pkg_title_1L_chr
         URL = paste0(urls_chr, collapse = ", "))
     return(pkg_desc_ls)
 }
-#' Make ret object description
-#' @description make_ret_obj_desc() is a Make function that creates a new R object. Specifically, this function implements an algorithm to make ret object description. The function returns Ret object description (a character vector of length one).
+#' Make return object description
+#' @description make_ret_obj_desc() is a Make function that creates a new R object. Specifically, this function implements an algorithm to make return object description. The function returns Return object description (a character vector of length one).
 #' @param fn Function (a function)
 #' @param abbreviations_lup Abbreviations (a lookup table)
 #' @param starts_sentence_1L_lgl Starts sentence (a logical vector of length one), Default: T
-#' @return Ret object description (a character vector of length one)
+#' @return Return object description (a character vector of length one)
 #' @rdname make_ret_obj_desc
 #' @export 
 

R/fn_update.R

@@ -144,7 +144,7 @@ update_fn_dmt_with_slots <- function (fn_name_1L_chr, fn_dmt_1L_chr)
 #' @param title_ls Title (a list), Default: NULL
 #' @param desc_ls Description (a list), Default: NULL
 #' @param details_ls Details (a list), Default: NULL
-#' @param inc_for_main_user_lgl_ls Inc for main user (a list of logical vectors), Default: NULL
+#' @param inc_for_main_user_lgl_ls Include for main user (a list of logical vectors), Default: NULL
 #' @param output_ls Output (a list), Default: NULL
 #' @param example_ls Example (a list), Default: NULL
 #' @param args_ls_ls Arguments (a list of lists), Default: NULL

R/fn_write.R

@@ -440,8 +440,8 @@ write_from_tmp <- function (temp_path_1L_chr, dest_path_1L_chr, edit_fn = functi
     writeLines(txt_chr, fileConn)
     close(fileConn)
 }
-#' Write inst directory
-#' @description write_inst_dir() is a Write function that writes a file to a specified local directory. Specifically, this function implements an algorithm to write inst directory. 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
+#' Write instance directory
+#' @description write_inst_dir() is a Write function that writes a file to a specified local directory. Specifically, this function implements an algorithm to write instance directory. 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
 #' @param path_to_pkg_rt_1L_chr Path to package root (a character vector of length one), Default: getwd()
 #' @return NULL
 #' @rdname write_inst_dir
@@ -508,7 +508,7 @@ write_links_for_website <- function (path_to_pkg_rt_1L_chr = getwd(), user_manua
 #' @param dir_path_chr Directory path (a character vector)
 #' @param rt_dev_dir_path_1L_chr Root development directory path (a character vector of length one), Default: normalizePath("../../../")
 #' @param pkg_nm_1L_chr Package name (a character vector of length one)
-#' @param inc_fns_idx_dbl Inc functions idx (a double vector), Default: NA
+#' @param inc_fns_idx_dbl Include functions index (a double vector), Default: NA
 #' @return Function arguments to rnm (a list)
 #' @rdname write_new_arg_sfxs
 #' @export 

data-raw/DATASET.R

@@ -142,9 +142,11 @@ write_and_doc_fn_fls(fns_dmt_tb,
                      dev_pkgs_chr = NA_character_,
                      update_pkgdown_1L_lgl = T)
 #
-# write_links_for_website(user_manual_url_1L_chr = "https://github.com/ready4-dev/ready4fun/releases/download/v0.0.0.9279/ready4fun_user_0.0.0.9279.pdf",
-#                         developer_manual_url_1L_chr = "https://github.com/ready4-dev/ready4fun/releases/download/v0.0.0.9279/ready4fun_developer_0.0.0.9279.pdf",
-#                         project_website_url_1L_chr = "https://www.ready4-dev.com/")
+# PAUSE FOR INTERACTIVE
+#
+write_links_for_website(user_manual_url_1L_chr = "https://github.com/ready4-dev/ready4fun/releases/download/v0.0.0.9279/ready4fun_user_0.0.0.9279.pdf",
+                        developer_manual_url_1L_chr = "https://github.com/ready4-dev/ready4fun/releases/download/v0.0.0.9279/ready4fun_developer_0.0.0.9279.pdf",
+                        project_website_url_1L_chr = "https://www.ready4-dev.com/")
 
 # 12. Create vignettes
 # NOTE TO SELF: Currently Vignettes are overwritten by this last step. Need to implement more sophisticated workflow.

data-raw/fns/add.R

@@ -149,8 +149,10 @@ add_lups <- function(template_lup,
     labels_chr <- Hmisc::label(new_lup) %>% unname()
     }
   if(!all(labels_chr %>% unique() =="")){
-    Hmisc::label(template_lup %>% sjlabelled::unlabel()) <- as.list(Hmisc::label(labels_chr) %>% unname())
-    Hmisc::label(new_lup %>% sjlabelled::unlabel()) <- as.list(Hmisc::label(labels_chr) %>% unname())
+    template_lup <- template_lup %>% summarytools::unlabel()
+    new_lup <- new_lup %>% summarytools::unlabel()
+    Hmisc::label(template_lup) <-  as.list(labels_chr %>% unname())
+    Hmisc::label(new_lup) <- as.list(labels_chr %>% unname())
   }
   combined_lups <- dplyr::bind_rows(template_lup,
                    new_lup) %>%