From 0ddb6bbb7cbf57cbfeb13abc5337cb255982e9db Mon Sep 17 00:00:00 2001
From: "Joshua M. Clulow" <jmc@oxide.computer>
Date: Fri, 2 Jul 2021 00:11:48 +0000
Subject: [PATCH] template: parameters not in last position are mishandled

---
 src/template.rs | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/template.rs b/src/template.rs
index 8fdcdc8..24b038b 100644
--- a/src/template.rs
+++ b/src/template.rs
@@ -1,4 +1,4 @@
-use anyhow::{Result, bail};
+use anyhow::{anyhow, bail, Context, Result};
 
 #[derive(Eq, PartialEq, Clone, Debug)]
 enum Component {
@@ -34,10 +34,16 @@ impl Template {
 }
 
 pub fn parse(t: &str) -> Result<Template> {
+    parse_inner(t)
+        .with_context(|| anyhow!("parse failure for template {:?}", t))
+}
+
+fn parse_inner(t: &str) -> Result<Template> {
     enum State {
         Start,
         ConstantOrParameter,
         Parameter,
+        ParameterSlash,
         Constant,
     }
 
@@ -79,19 +85,26 @@ pub fn parse(t: &str) -> Result<Template> {
                 if c == '}' {
                     components.push(Component::Parameter(a));
                     a = String::new();
-                    s = State::ConstantOrParameter;
+                    s = State::ParameterSlash;
                 } else if c == '/' || c == '{' {
                     bail!("expected parameter");
                 } else {
                     a.push(c);
                 }
             }
+            State::ParameterSlash => {
+                if c == '/' {
+                    s = State::ConstantOrParameter;
+                } else {
+                    bail!("expected a slash after parameter");
+                }
+            }
         }
     }
 
     match s {
         State::Start => bail!("empty path"),
-        State::ConstantOrParameter => (),
+        State::ConstantOrParameter | State::ParameterSlash => (),
         State::Constant => components.push(Component::Constant(a)),
         State::Parameter => bail!("unterminated parameter"),
     }
@@ -118,6 +131,13 @@ mod test {
                     Component::Parameter("number".into()),
                 ],
             }),
+            ("/one/{two}/three", Template {
+                components: vec![
+                    Component::Constant("one".into()),
+                    Component::Parameter("two".into()),
+                    Component::Constant("three".into()),
+                ],
+            }),
         ];
 
         for (path, want) in trials.iter() {