Updates path info builder on attribute

Author: scottoffen

README.md

@@ -10,12 +10,12 @@ Grapevine is available on [NuGet.org](https://www.nuget.org/packages/Grapevine/)
 
 Powershell:
 ```powershell
-Install-Package Grapevine -Version 5.0.0-rc.2
+Install-Package Grapevine -Version 5.0.0-rc.3
 ```
 
 .NET CLI
 ```cmd
-> dotnet add package Grapevine --version 5.0.0-rc.2
+> dotnet add package Grapevine --version 5.0.0-rc.3
 ```
 
 ## Usage

src/Grapevine/InternalExtensions.cs

@@ -8,7 +8,7 @@ namespace Grapevine
 {
     public static class InternalExtensions
     {
-        private static readonly Regex ParseForParams = new Regex(@"\[(\w+)\]", RegexOptions.IgnoreCase);
+        private static readonly Regex ParseForParams = new Regex(@"\{(\w+)\}", RegexOptions.IgnoreCase);
 
         internal static string SanitizePath(this string path)
         {

src/Grapevine/RestRouteAttribute.cs

@@ -72,9 +72,19 @@ public static object[] GenerateRouteConstructorArguments(this RestRouteAttribute
 
             args[1] = attribute.HttpMethod;
 
-            args[2] = (string.IsNullOrWhiteSpace(basePath))
-                ? attribute.PathInfo.SanitizePath()
-                : $"{basePath.SanitizePath()}{attribute.PathInfo.SanitizePath()}";
+            var basepath = basePath.SanitizePath();
+            if (!string.IsNullOrWhiteSpace(attribute.PathInfo))
+            {
+                var appendStart = "";
+                if (attribute.PathInfo.StartsWith("^"))
+                {
+                    appendStart = "^";
+                    attribute.PathInfo = attribute.PathInfo.TrimStart('^');
+                }
+                basepath = $"{appendStart}{basepath}{attribute.PathInfo.SanitizePath()}";
+            }
+
+            args[2] = basepath;
 
             args[3] = attribute.Enabled;
             args[4] = (!string.IsNullOrWhiteSpace(attribute.Name))

src/Samples/Resources/TransientResource.cs

@@ -17,34 +17,53 @@ public TransientResource()
             Counter++;
         }
 
-        [RestRoute]
+        [RestRoute("Get", "{key}/{value}")]
         public async Task TransientCallA(IHttpContext context)
         {
-            // You can store anything in locals!
             if (!context.Contains("Call-Order")) context.Set("Call-Order", new StringBuilder());
             context.GetAs<StringBuilder>("Call-Order").Append($"A-{Counter}{Environment.NewLine}");
+
+            if (!context.Contains("PathParameters")) context.Set("PathParameters", new StringBuilder());
+            var sb = context.GetAs<StringBuilder>("PathParameters");
+
+            sb.Append($"A: Count: {context.Request.PathParameters.Count}{Environment.NewLine}");
+            sb.Append($"\tkey: {context.Request.PathParameters["key"]}{Environment.NewLine}");
+            sb.Append($"\tvalue: {context.Request.PathParameters["value"]}{Environment.NewLine}");
+
             await Task.CompletedTask;
         }
 
-        [RestRoute]
+        [RestRoute("Get", @"^/([a-zA-Z]+)/(\d{1,})")]
         public async Task TransientCallB(IHttpContext context)
         {
-            // You can store anything in locals!
             if (!context.Contains("Call-Order")) context.Set("Call-Order", new StringBuilder());
             context.GetAs<StringBuilder>("Call-Order").Append($"B-{Counter}{Environment.NewLine}");
+
+            if (!context.Contains("PathParameters")) context.Set("PathParameters", new StringBuilder());
+            var sb = context.GetAs<StringBuilder>("PathParameters");
+
+            sb.Append($"B: Count: {context.Request.PathParameters.Count}{Environment.NewLine}");
+            sb.Append($"\tp0: {context.Request.PathParameters["p0"]}{Environment.NewLine}");
+            sb.Append($"\tp1: {context.Request.PathParameters["p1"]}{Environment.NewLine}");
+
             await Task.CompletedTask;
         }
 
-        [RestRoute]
+        [RestRoute("Get", "{thing1}/{thing2}")]
         public async Task TransientCallC(IHttpContext context)
         {
-            // You can store anything in locals!
             if (!context.Contains("Call-Order")) context.Set("Call-Order", new StringBuilder());
+            var co = context.GetAs<StringBuilder>("Call-Order");
+            co.Append($"C-{Counter}{Environment.NewLine}");
+
+            if (!context.Contains("PathParameters")) context.Set("PathParameters", new StringBuilder());
+            var sb = context.GetAs<StringBuilder>("PathParameters");
 
-            var sb = context.GetAs<StringBuilder>("Call-Order");
-            sb.Append($"C-{Counter}{Environment.NewLine}");
+            sb.Append($"C: Count: {context.Request.PathParameters.Count}{Environment.NewLine}");
+            sb.Append($"\tthing1: {context.Request.PathParameters["thing1"]}{Environment.NewLine}");
+            sb.Append($"\tthing2: {context.Request.PathParameters["thing2"]}{Environment.NewLine}");
 
-            await context.Response.SendResponseAsync(sb.ToString());
+            await context.Response.SendResponseAsync($"{sb.ToString()}{Environment.NewLine}{co.ToString()}");
         }
     }
 }