Dash R 0.9.1 release

DESCRIPTION

@@ -25,7 +25,7 @@ Imports:
   rlang,
   utils
 Suggests:
-  testthat,
+  testthat (>= 3.1.0),
   rstudioapi
 License: MIT + file LICENSE
 Encoding: UTF-8

R/dependencies.R

@@ -12,7 +12,7 @@ setWildcardId <- function(id) {
 
 #' Input/Output/State definitions
 #'
-#' Use in conjunction with the `callback()` method from the [dash::Dash] class
+#' Use in conjunction with the `callback()` method from the [Dash] class
 #' to define the update logic in your application.
 #'
 #' The `dashNoUpdate()` function permits application developers to prevent a

R/simple_table.R

@@ -7,7 +7,7 @@
 #' if (interactive()) {
 #'     app <- dash_app() %>%
 #'       set_layout(
-#'         dash::dccChecklist(
+#'         dccChecklist(
 #'           id = "table_params",
 #'           labelStyle = list(display = "block"),
 #'           options = list(

R/utils.R

@@ -1547,7 +1547,7 @@ is_dash_app <- function(x) {
 
 assert_dash <- function(x) {
   if (!is_dash_app(x)) {
-    stop("You must provide a Dash app object (created with `dash::Dash$new()` or `dash::dash_app()`)", call. = FALSE)
+    stop("You must provide a Dash app object (created with `Dash$new()` or `dash_app()`)", call. = FALSE)
   }
   invisible(TRUE)
 }
@@ -1559,9 +1559,9 @@ componentify <- function(x) {
     stop("dash: layout cannot include Shiny tags (you might have loaded the {shiny} package after loading {dash})", call. = FALSE)
   } else if (is.list(x)) {
     x <- remove_empty(x)
-    dash::htmlDiv(children = lapply(x, componentify))
+    htmlDiv(children = lapply(x, componentify))
   } else if (length(x) == 1) {
-    dash::htmlSpan(children = x)
+    htmlSpan(children = x)
   } else if (is.null(x)) {
     return(NULL)
   } else {

R/wrappers.R

@@ -2,7 +2,7 @@
 
 #' Create a Dash application
 #'
-#' This is a convenience function that returns a [`dash::Dash`] R6 object.
+#' This is a convenience function that returns a [`Dash`] R6 object.
 #' For advanced usage, you can use the object as an R6 object directly instead
 #' of the functions provided by the `{dash}` package.
 #'
@@ -60,7 +60,7 @@ dash_app <- function(title = NULL,
     assets_ignore <- ""
   }
 
-  app <- dash::Dash$new(
+  app <- Dash$new(
     assets_folder = assets_folder,
     assets_url_path = assets_url_path,
     assets_ignore = assets_ignore,

tests/manual/callbacks-simple.R

@@ -2,7 +2,7 @@ library(dash)
 
 dash_app() %>%
   set_layout(
-    dash::dccInput(id = "text", "sample"),
+    dccInput(id = "text", "sample"),
     div("CAPS: ", span(id = "out1")),
     div("small: ", span(id = "out2"))
   ) %>%

tests/testthat/test-attributes.R

@@ -1,5 +1,3 @@
-context("attributes")
-
 test_that("stylesheets can be added with or without attributes", {
   stylesheet_pattern <- '^.*<link href="(https.*)">.*$'
   script_pattern <- '^.*<script src="(https.*)">.*$'

tests/testthat/test-callback.R

@@ -1,5 +1,3 @@
-context("callback")
-
 test_that("Callback outputs can be provided with or without output function", {
 
   app <- Dash$new()
@@ -14,7 +12,7 @@ test_that("Callback outputs can be provided with or without output function", {
       )
     )
   )
-  
+
   expect_silent(
     app$callback(output(id = 'output-state', property = 'children'),
                  list(input(id = 'submit-button', property = 'n_clicks'),
@@ -24,7 +22,7 @@ test_that("Callback outputs can be provided with or without output function", {
                    sprintf("The Button has been pressed \"%s\" times, Input 1 is \"%s\", and Input 2 is \"%s\"", n_clicks, input1, input2)
                  })
   )
-  
+
   expect_silent(
     app$callback(output=list(id = 'output-state', property = 'children'),
                  list(input(id = 'submit-button', property = 'n_clicks'),
@@ -37,9 +35,9 @@ test_that("Callback outputs can be provided with or without output function", {
 })
 
 test_that("Repeating outputs across callbacks yields an error", {
-  
+
   app <- Dash$new()
-  
+
   app$layout(
     htmlDiv(
       list(
@@ -54,7 +52,7 @@ test_that("Repeating outputs across callbacks yields an error", {
       )
     )
   )
-  
+
   app$callback(list(output(id = 'output-state', property = 'children'),
                     output(id = 'output-two', property = 'children')),
                list(input(id = 'submit-button', property = 'n_clicks'),
@@ -63,7 +61,7 @@ test_that("Repeating outputs across callbacks yields an error", {
                function(n_clicks, input1, input2) {
                  sprintf("The Button has been pressed \"%s\" times, Input 1 is \"%s\", and Input 2 is \"%s\"", n_clicks, input1, input2)
                })
-    
+
   expect_error(
     app$callback(list(output(id = 'output-state', property = 'children'),
                       output(id = 'output-three', property = 'children')),

tests/testthat/test-components.R

@@ -1,5 +1,3 @@
-context("components")
-
 test_that("Components work recursively (components can be children of components)", {
 
   # div inside a div
@@ -75,7 +73,7 @@ test_that("wildcard attributes work with children", {
 
 # test_that("Can translate arbitrary HTML string", {
 #   skip_if_not_installed("dashDangerouslySetInnerHtml")
-# 
+#
 #   html <- "<div> 1 </div>"
 #   expect_is(
 #     dashDangerouslySetInnerHtml::DangerouslySetInnerHTML(HTML(html)),

tests/testthat/test-dash.R

@@ -1,5 +1,3 @@
-context("dash-api")
-
 test_that("Can access fiery server within a dash app", {
 
   d <- Dash$new()

tests/testthat/test-index.R

@@ -1,5 +1,3 @@
-context("customindex")
-
 test_that("Omitting required template keys produces warnings", {
   string <-
     "<!DOCTYPE html>
@@ -18,24 +16,24 @@ test_that("Omitting required template keys produces warnings", {
   </footer>
   </body>
   </html>"
-  
+
   app <- Dash$new()
-  
+
   expect_error(
     app$index_string(gsub("\\{\\%config\\%\\}|\\{\\%scripts\\%\\}|\\{\\%app_entry\\%\\}", "", string)),
     "Did you forget to include app_entry, config, scripts in your index string?"
   )
-  
+
   expect_error(
     app$index_string(gsub("\\{\\%scripts\\%\\}", "", string)),
     "Did you forget to include scripts in your index string?"
   )
-  
+
   expect_error(
     app$index_string(gsub("\\{\\%app_entry\\%\\}", "", string)),
     "Did you forget to include app_entry in your index string?"
   )
-  
+
   expect_error(
     app$index_string(gsub("\\{\\%config\\%\\}", "", string)),
     "Did you forget to include config in your index string?"

tests/testthat/test-layout.R

@@ -1,5 +1,3 @@
-context("layout")
-
 test_that("layout IDs must be unique", {
 
  app <- Dash$new()
@@ -41,14 +39,14 @@ test_that("Layout errors", {
 test_that("Layout basics", {
    expect_identical(
       set_get_layout_new(div("one"), h2("two")),
-      set_get_layout_old(dash::htmlDiv(list(
-         dash::htmlDiv("one"), dash::htmlH2("two")
+      set_get_layout_old(htmlDiv(list(
+         htmlDiv("one"), htmlH2("two")
       )))
    )
    expect_identical(set_get_layout_new("one", "two"), set_get_layout_new(list("one", "two")))
    expect_identical(
       set_get_layout_new(function() div("one", "two")),
-      set_get_layout_old(function() dash::htmlDiv(list("one", "two")))
+      set_get_layout_old(function() htmlDiv(list("one", "two")))
    )
 })
 
@@ -75,15 +73,15 @@ test_that("No need to place everything in containers and lists", {
    expect_error(set_get_layout_old("test"))
    expect_identical(
       set_get_layout_new(div("one", "two")),
-      set_get_layout_old(dash::htmlDiv(list("one", "two")))
+      set_get_layout_old(htmlDiv(list("one", "two")))
    )
-   expect_identical(set_get_layout_new("test"), set_get_layout_old(dash::htmlSpan("test")))
+   expect_identical(set_get_layout_new("test"), set_get_layout_old(htmlSpan("test")))
    expect_identical(
       set_get_layout_new("one", 5, TRUE),
-      set_get_layout_old(dash::htmlDiv(list(
-         dash::htmlSpan("one"),
-         dash::htmlSpan(5),
-         dash::htmlSpan(TRUE)
+      set_get_layout_old(htmlDiv(list(
+         htmlSpan("one"),
+         htmlSpan(5),
+         htmlSpan(TRUE)
       )))
    )
 })
@@ -101,7 +99,7 @@ test_that("Function as layout works", {
    app2 <- Dash$new()
    set.seed(1000)
    runif(1)
-   app2$layout(dash::htmlDiv(runif(1)))
+   app2$layout(htmlDiv(runif(1)))
    app2_layout <- app2$layout_get()
    expect_identical(app1_layout1, app2_layout)
 
@@ -114,7 +112,7 @@ test_that("Function as layout works", {
    expect_false(identical(app1_fx_layout1, app1_fx_layout2))
    app2_fx <- Dash$new()
    set.seed(1000)
-   app2_fx$layout(function() dash::htmlDiv(runif(1)))
+   app2_fx$layout(function() htmlDiv(runif(1)))
    app2_fx_layout1 <- app2_fx$layout_get()
    app2_fx_layout2 <- app2_fx$layout_get()
    expect_identical(app1_fx_layout1, app2_fx_layout1)
@@ -124,19 +122,19 @@ test_that("Function as layout works", {
 test_that("Sample apps layout are identical with the compact syntax", {
    expect_identical(
       set_get_layout_old(
-         dash::htmlDiv(list(
-            dash::htmlDiv('Dash To-Do List'),
-            dash::dccInput(id = 'new-item'),
-            dash::htmlButton("Add", id = "add"),
-            dash::htmlButton("Clear Done", id = "clear-done"),
-            dash::htmlDiv(id = "list-container"),
-            dash::htmlDiv(id = "totals")
+         htmlDiv(list(
+            htmlDiv('Dash To-Do List'),
+            dccInput(id = 'new-item'),
+            htmlButton("Add", id = "add"),
+            htmlButton("Clear Done", id = "clear-done"),
+            htmlDiv(id = "list-container"),
+            htmlDiv(id = "totals")
          ))
       ),
 
       set_get_layout_new(
          div('Dash To-Do List'),
-         dash::dccInput(id = 'new-item'),
+         dccInput(id = 'new-item'),
          button("Add", id = "add"),
          button("Clear Done", id = "clear-done"),
          div(id = "list-container"),
@@ -146,11 +144,11 @@ test_that("Sample apps layout are identical with the compact syntax", {
 
    expect_identical(
       set_get_layout_old(
-         dash::htmlDiv(
+         htmlDiv(
             list(
-               dash::htmlH1('Hello Dash'),
-               dash::htmlDiv(children = "Dash: A web application framework for R."),
-               dash::dccGraph(
+               htmlH1('Hello Dash'),
+               htmlDiv(children = "Dash: A web application framework for R."),
+               dccGraph(
                   figure=list(
                      data=list(
                         list(
@@ -176,7 +174,7 @@ test_that("Sample apps layout are identical with the compact syntax", {
       set_get_layout_new(
          h1('Hello Dash'),
          div("Dash: A web application framework for R."),
-         dash::dccGraph(
+         dccGraph(
             figure=list(
                data=list(
                   list(

tests/testthat/test-routes.R

@@ -1,5 +1,3 @@
-context("routes")
-
 test_that("URLs are properly redirected with app$redirect", {
  app <- Dash$new()