Update the _inputs_ and _values_ regular expr to support a trailing = (#3648)

Author: schloerke

R/bookmark-state.R

@@ -321,34 +321,38 @@ RestoreContext <- R6Class("RestoreContext",
       if (substr(queryString, 1, 1) == '?')
         queryString <- substr(queryString, 2, nchar(queryString))
 
+      # The "=" after "_inputs_" is optional. Shiny doesn't generate URLs with
+      # "=", but httr always adds "=".
+      inputs_reg <- "(^|&)_inputs_=?(&|$)"
+      values_reg <- "(^|&)_values_=?(&|$)"
 
       # Error if multiple '_inputs_' or '_values_'. This is needed because
       # strsplit won't add an entry if the search pattern is at the end of a
       # string.
-      if (length(gregexpr("(^|&)_inputs_(&|$)", queryString)[[1]]) > 1)
+      if (length(gregexpr(inputs_reg, queryString)[[1]]) > 1)
         stop("Invalid state string: more than one '_inputs_' found")
-      if (length(gregexpr("(^|&)_values_(&|$)", queryString)[[1]]) > 1)
+      if (length(gregexpr(values_reg, queryString)[[1]]) > 1)
         stop("Invalid state string: more than one '_values_' found")
 
       # Look for _inputs_ and store following content in inputStr
-      splitStr <- strsplit(queryString, "(^|&)_inputs_(&|$)")[[1]]
+      splitStr <- strsplit(queryString, inputs_reg)[[1]]
       if (length(splitStr) == 2) {
         inputStr <- splitStr[2]
         # Remove any _values_ (and content after _values_) that may come after
         # _inputs_
-        inputStr <- strsplit(inputStr, "(^|&)_values_(&|$)")[[1]][1]
+        inputStr <- strsplit(inputStr, values_reg)[[1]][1]
 
       } else {
         inputStr <- ""
       }
 
       # Look for _values_ and store following content in valueStr
-      splitStr <- strsplit(queryString, "(^|&)_values_(&|$)")[[1]]
+      splitStr <- strsplit(queryString, values_reg)[[1]]
       if (length(splitStr) == 2) {
         valueStr <- splitStr[2]
         # Remove any _inputs_ (and content after _inputs_) that may come after
         # _values_
-        valueStr <- strsplit(valueStr, "(^|&)_inputs_(&|$)")[[1]][1]
+        valueStr <- strsplit(valueStr, inputs_reg)[[1]][1]
 
       } else {
         valueStr <- ""

man/downloadHandler.Rd

@@ -1,23 +1,33 @@
 test_that("Inputs and values in query string", {
-  # Normal format
-  vals <- RestoreContext$new("?_inputs_&a=1&b=2&_values_&x=3")$asList()
-  expect_true(contents_identical(vals$input, list(a=1L, b=2L)))
-  expect_identical(as.list(vals$values), list(x=3L))
-
-  # No leading '?', trailing '&', and values before inputs
-  vals <- RestoreContext$new("_values_&x=3&_inputs_&a=1&b=2&")$asList()
-  expect_true(contents_identical(vals$input, list(a=1L, b=2L)))
-  expect_identical(as.list(vals$values), list(x=3L))
-
-  # Just inputs, no values, and leading '&'
-  vals <- RestoreContext$new("&_inputs_&a=1&b=2")$asList()
-  expect_true(contents_identical(vals$input, list(a=1L, b=2L)))
-  expect_identical(as.list(vals$values), list())
 
-  # No inputs, just values
-  vals <- RestoreContext$new("?_values_&x=3")$asList()
-  expect_identical(vals$input, list())
-  expect_identical(as.list(vals$values), list(x=3L))
+  restore_context <- function(...) {
+    RestoreContext$new(paste0(...))$asList()
+  }
+
+  for (input_str in c("_inputs_", "_inputs_=")) {
+    for (value_str in c("_values_", "_values_=")) {
+
+      # Normal format
+      vals <- restore_context("?", input_str, "&a=1&b=2&", value_str, "&x=3")
+      expect_true(contents_identical(vals$input, list(a=1L, b=2L)))
+      expect_identical(as.list(vals$values), list(x=3L))
+
+      # No leading '?', trailing '&', and values before inputs
+      vals <- restore_context(value_str, "&x=3&", input_str, "&a=1&b=2&")
+      expect_true(contents_identical(vals$input, list(a=1L, b=2L)))
+      expect_identical(as.list(vals$values), list(x=3L))
+
+      # Just inputs, no values, and leading '&'
+      vals <- restore_context("&", input_str, "&a=1&b=2")
+      expect_true(contents_identical(vals$input, list(a=1L, b=2L)))
+      expect_identical(as.list(vals$values), list())
+
+      # No inputs, just values
+      vals <- restore_context("?", value_str, "&x=3")
+      expect_identical(vals$input, list())
+      expect_identical(as.list(vals$values), list(x=3L))
+    }
+  }
 
   # Empty query string
   vals <- RestoreContext$new("")$asList()