Merge branch 'main' into rstudio_addin

CHANGELOG.md

@@ -15,6 +15,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 -   Removed ... in reload function
 
+
+## v0.5.1
+
+### Improvements
+
+-   Fixed `reload()` function for dsoParams
+
 ## v0.5.0
 
 ### New Features

NAMESPACE

@@ -17,7 +17,6 @@ export(set_stage)
 export(stage_here)
 exportClasses(dsoParams)
 exportMethods(as.list)
-exportMethods(reload)
 exportMethods(show)
 importFrom(glue,glue)
 importFrom(here,here)

R/class-dsoParams.R

@@ -108,30 +108,4 @@ setMethod(
       }
     })
   }
-)
-
-
-#' @title reload function
-#' @description
-#' Generic function for reloading configurations.
-#'
-#' @param object dsoParams config object
-#' @export
-setGeneric("reload", function(object) standardGeneric("reload"))
-
-
-#' @title reload dso params
-#' @description
-#' reloads the current dsoParams config into object
-#'
-#' @param object dsoParams object
-#' @export
-setMethod("reload", "dsoParams", function(object) {
-  if (!inherits(object, "dsoParams")) {
-    stop("The object is not of class 'dsoParams'")
-  }
-
-  object <<- read_params()
-
-  invisible(object)
-})
+)

R/read_params.R

@@ -33,7 +33,7 @@ read_params <- function(stage_path = NULL, return_list = FALSE) {
     if (is.null(config_env$stage_dir)) {
       stop("stage_path argument missing.")
     } else {
-      cat(paste("reloading from already set stage_path:", config_env$stage_dir))
+      message(glue::glue("Reloading from already set stage_path: {config_env$stage_dir}"))
       stage_path <- config_env$stage_dir
     }
   }

R/reload.R

@@ -0,0 +1,17 @@
+#' @title Reload dsoParams
+#' @description
+#' Reloads the current dsoParams configuration into the object.
+#'
+#' @param params dsoParams object
+#' @param env environment in which object is located, caller_env() by default
+#' @return The updated dsoParams object.
+#' @export
+reload <- function(params, env = caller_env()) {
+  if (!inherits(params, "dsoParams")) {
+    stop("The object is not of class 'dsoParams'")
+  }
+  var_name <- deparse(substitute(params))
+  assign(var_name, value = read_params(), envir = env)
+
+  invisible(get(var_name, envir = env))
+}