Allow colons in uri templates (#393)

Fixes #389
r-lib · Nov 14, 2023 · ad76565 · ad76565
1 parent 5fba4f9
commit ad76565
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,8 @@
 # httr2 (development version)
 
+* `req_template()` now works when you have a bare `:` in a template that
+  uses "uri" style (#389).
+
 # httr2 1.0.0
 
 ## Function lifecycle

diff --git a/R/req-template.R b/R/req-template.R
@@ -112,10 +112,10 @@ template_vars <- function(x, type) {
 }
 
 template_type <- function(x) {
-  if (grepl(":", x)) {
-    "colon"
-  } else if (grepl("\\{\\w+?\\}", x)) {
+  if (grepl("\\{\\w+?\\}", x)) {
     "uri"
+  } else if (grepl(":", x)) {
+    "colon"
   } else {
     "none"
   }

diff --git a/tests/testthat/test-req-template.R b/tests/testthat/test-req-template.R
@@ -54,3 +54,9 @@ test_that("supports three template styles", {
   expect_equal(template_process("/{x}/"), "/x/")
   expect_equal(template_process("/constant"), "/constant")
 })
+
+test_that("can use colon in uri style", {
+  x <- "x"
+  expect_equal(template_process("/:{x}:/"), "/:x:/")
+})
+