Renamed withProgress2() to withProgressShiny()

Author: HenrikBengtsson

NAMESPACE

@@ -23,7 +23,7 @@ export(slow_sum)
 export(tkprogressbar_handler)
 export(txtprogressbar_handler)
 export(winprogressbar_handler)
-export(withProgress2)
+export(withProgressShiny)
 export(with_progress)
 export(without_progress)
 importFrom(digest,digest)

NEWS

@@ -1,7 +1,11 @@
 Package: progressr
 ==================
 
-Version: 0.1.5-9000 [2019-11-02]
+Version: 0.1.5-9000 [2020-01-04]
+
+SIGNIFICANT CHANGES:
+
+ * Renamed  withProgress2() to withProgressShiny().
 
 NEW FEATURES:
 

R/withProgress2.R R/withProgressShiny.RR/withProgress2.R renamed to R/withProgressShiny.R

@@ -6,10 +6,10 @@
 #'
 #' @return The value of `[shiny::withProgress]`.
 #'
-#' @example incl/shiny-withProgress.R
+#' @example incl/withProgressShiny.R
 #'
 #' @export
-withProgress2 <- function(expr, ..., env = parent.frame(), quoted = FALSE, handlers = c(shiny = shiny_handler, progressr::handlers(default = NULL))) {
+withProgressShiny <- function(expr, ..., env = parent.frame(), quoted = FALSE, handlers = c(shiny = shiny_handler, progressr::handlers(default = NULL))) {
   if (!quoted) expr <- substitute(expr)
   expr <- bquote(progressr::with_progress({.(expr)}, handlers = .(handlers)))
   res <- withVisible(shiny::withProgress(expr, ..., env = env, quoted = TRUE))

incl/shiny-withProgress.R incl/withProgressShiny.Rincl/shiny-withProgress.R renamed to incl/withProgressShiny.R

@@ -9,8 +9,8 @@ app <- shinyApp(
   server = function(input, output) {
     output$plot <- renderPlot({
       X <- 1:15
-      withProgress2(message = "Calculation in progress",
-                    detail = "This may take a while ...", value = 0, {
+      withProgressShiny(message = "Calculation in progress",
+                        detail = "This may take a while ...", value = 0, {
         p <- progressor(along = X)
         y <- lapply(X, FUN=function(x) {
           p()