wip: route handling via regex

This is a work in progress. The goal is to allow for route handling via regex. This will allow for more flexibility in the routing of requests. Issue #3
ColinFay · Mar 22, 2023 · ecd7157 · ecd7157
1 parent 332ba62
commit ecd7157
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/R/brochureApp.R b/R/brochureApp.R
@@ -64,12 +64,13 @@ brochureApp <- function(
         request$PATH_INFO,
         ...multipage$pages
       )$ui
+
       if (is.function(ui)) {
         ui <- ui(request)
       }
 
       ...multipage_opts$wrapped(
-        tags$head(
+        shiny::tags$head(
           tagList(
             shiny::includeScript(
               system.file(
@@ -100,7 +101,7 @@ brochureApp <- function(
       )
 
       set_params(
-        brochure_server,
+        brochure_server$extract(),
         session = session
       )
 

diff --git a/R/match_route.R b/R/match_route.R
@@ -13,7 +13,7 @@
 match_route <- function(
   href,
   routes
-) {
+    ) {
   for (route in routes) {
     if (route$matches(href)) {
       return(route)

diff --git a/R/route.R b/R/route.R
@@ -83,7 +83,7 @@ Route <- R6::R6Class(
       )[[1]]
       list(
         route = matches[1],
-        params = matches[-1]
+        params = as.list(matches[-1])
       )
     }
   )

diff --git a/dev/flat_handler.Rmd b/dev/flat_handler.Rmd
@@ -13,6 +13,7 @@ library(testthat)
 # Load already included functions if relevant
 pkgload::load_all(export_all = FALSE)
 ```
+## Routing in `{brochure}`
 
 # Route
 
@@ -92,7 +93,7 @@ Route <- R6::R6Class(
       )[[1]]
       list(
         route = matches[1],
-        params = matches[-1]
+        params = as.list(matches[-1])
       )
     }
   )
@@ -162,7 +163,7 @@ test_that("Route works", {
   )
   expect_equal(
     extracted$params,
-    c(id = "aaa", postid = "aaa")
+    list(id = "aaa", postid = "aaa")
   )
 
   r_with_regex <- Route$new(
@@ -198,7 +199,7 @@ test_that("Route works", {
   )
   expect_equal(
     extracted$params,
-    character(0)
+    list()
   )
 
   # Test the `initialize` method with missing arguments
@@ -550,7 +551,7 @@ test_that("set_params works", {
   session <- shiny::MockShinySession$new()
   expect_equal(
       set_params(
-        list(params = c(id = "aaa", postid = "aaa")),
+        list(params = list(id = "aaa", postid = "aaa")),
         session = session
     ),
     NULL
@@ -559,7 +560,7 @@ test_that("set_params works", {
     get_params(
       session
     ),
-    c(id = "aaa", postid = "aaa")
+    list(id = "aaa", postid = "aaa")
   )
 })
 ```

diff --git a/tests/testthat/test-params.R b/tests/testthat/test-params.R
@@ -4,7 +4,7 @@ test_that("set_params works", {
   session <- shiny::MockShinySession$new()
   expect_equal(
       set_params(
-        list(params = c(id = "aaa", postid = "aaa")),
+        list(params = list(id = "aaa", postid = "aaa")),
         session = session
     ),
     NULL
@@ -13,6 +13,6 @@ test_that("set_params works", {
     get_params(
       session
     ),
-    c(id = "aaa", postid = "aaa")
+    list(id = "aaa", postid = "aaa")
   )
 })
diff --git a/tests/testthat/test-route.R b/tests/testthat/test-route.R
@@ -51,7 +51,7 @@ test_that("Route works", {
   )
   expect_equal(
     extracted$params,
-    c(id = "aaa", postid = "aaa")
+    list(id = "aaa", postid = "aaa")
   )
 
   r_with_regex <- Route$new(
@@ -87,7 +87,7 @@ test_that("Route works", {
   )
   expect_equal(
     extracted$params,
-    character(0)
+    list()
   )
 
   # Test the `initialize` method with missing arguments
-Original file line number
+Diff line change
@@ Expand Up / @@ -83,7 +83,7 @@ Route <- R6::R6Class( @@
           )[[1]]
           list(
             route = matches[1],
-            params = matches[-1]
+            params = as.list(matches[-1])
           )
         }
       )
@@ Expand Down @@