MontoyaTech/Rest.Net
MontoyaTech/Rest.Net
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improved RouteMatcher and added more unit tests to cover some edge cases. Cleaned up code. Bumped package version to 1.7.0

Browse Source
This commit is contained in:
MattMo 2023-07-09 11:14:33 -07:00
parent 8c44d56ab4
commit 69a1d9c3a8
6 changed files with 66 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Rest.Net.Tests/RestClientGeneratorTests.cs
View File

@ -8,7 +8,7 @@ using FluentAssertions;
using MontoyaTech.Rest.Net;
using System.Net;
namespace Rest.Net.Tests
namespace MontoyaTech.Rest.Net.Tests
{
public class RestClientGeneratorTests
{

37
Rest.Net.Tests/RouteMatcherTests.cs
View File

@ -22,6 +22,12 @@ namespace MontoyaTech.Rest.Net.Tests
RouteMatcher.Matches("http://localhost/", "/", out _).Should().BeTrue();
}
[Fact]
public void SyntaxWithRootNoSlashShouldMatch()
{
RouteMatcher.Matches("http://localhost", "/", out _).Should().BeTrue();
}
[Fact]
public void SyntaxWithRootCatchAllShouldMatch()
{
@ -29,9 +35,33 @@ namespace MontoyaTech.Rest.Net.Tests
}
[Fact]
public void SyntaxCatchAllEmptyShouldMatch()
public void SyntaxNonSlashShouldNotMatch()
{
RouteMatcher.Matches("http://localhost/test1", "/test1/**", out _).Should().BeTrue();
RouteMatcher.Matches("http://localhost/test1/", "/test1", out _).Should().BeFalse();
}
[Fact]
public void SyntaxSlashShouldMatch()
{
RouteMatcher.Matches("http://localhost/test1/", "/test1/", out _).Should().BeTrue();
}
[Fact]
public void SyntaxSlashExtraRouteShouldNotMatch()
{
RouteMatcher.Matches("http://localhost/test1/test2", "/test1/", out _).Should().BeFalse();
}
[Fact]
public void SyntaxSlashCatchAllEmptyShouldMatch()
{
RouteMatcher.Matches("http://localhost/test1/", "/test1/**", out _).Should().BeTrue();
}
[Fact]
public void SyntaxSlashCatchAllEmptyNoSlashShouldNotMatch()
{
RouteMatcher.Matches("http://localhost/test1", "/test1/**", out _).Should().BeFalse();
}
[Fact]
@ -43,7 +73,7 @@ namespace MontoyaTech.Rest.Net.Tests
[Fact]
public void SyntaxWildCardEmptyShouldMatch()
{
RouteMatcher.Matches("http://localhost/test1", "/test1/*", out _).Should().BeTrue();
RouteMatcher.Matches("http://localhost/test1/", "/test1/*", out _).Should().BeTrue();
}
[Fact]
@ -117,6 +147,7 @@ namespace MontoyaTech.Rest.Net.Tests
public void SyntaxWithOrShouldMatch()
{
RouteMatcher.Matches("http://localhost/a/b", "/a/b|c", out _).Should().BeTrue();
RouteMatcher.Matches("http://localhost/a/c", "/a/b|c", out _).Should().BeTrue();
}

2
Rest.Net.Tests/ServeFileTests.cs
View File

@ -8,7 +8,7 @@ using FluentAssertions;
using MontoyaTech.Rest.Net;
using Xunit;
namespace Rest.Net.Tests
namespace MontoyaTech.Rest.Net.Tests
{
public class ServeFileTests
{

2
Rest.Net/Rest.Net.csproj
View File

@ -17,7 +17,7 @@
<AssemblyName>MontoyaTech.Rest.Net</AssemblyName>
<RootNamespace>MontoyaTech.Rest.Net</RootNamespace>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<Version>1.6.9</Version>
<Version>1.7.0</Version>
<PackageReleaseNotes></PackageReleaseNotes>
<PackageIcon>Logo_Symbol_Black_Outline.png</PackageIcon>
</PropertyGroup>

4
Rest.Net/Route.cs
View File

@ -49,9 +49,9 @@ namespace MontoyaTech.Rest.Net
if (target == null)
throw new ArgumentNullException(nameof(target));
else if (string.IsNullOrWhiteSpace(method))
throw new ArgumentException("Cannot be null or empty", nameof(method));
throw new ArgumentException("Method cannot be null or empty", nameof(method));
else if (string.IsNullOrWhiteSpace(syntax))
throw new ArgumentException("Cannot be null or empty", nameof(syntax));
throw new ArgumentException("Syntax cannot be null or empty", nameof(syntax));
this.Method = method;
this.Syntax = syntax;

35
Rest.Net/RouteMatcher.cs
View File

@ -34,6 +34,10 @@ namespace MontoyaTech.Rest.Net
//Set the arguments to null, initially.
arguments = null;
//If the input url is invalid, default to false.
if (string.IsNullOrWhiteSpace(url))
return false;
//Trim the url and the syntax.
url = url.Trim();
syntax = syntax.Trim();
@ -42,17 +46,27 @@ namespace MontoyaTech.Rest.Net
if (url.StartsWith("http://"))
{
url = url.Substring(7);
url = url.Substring(url.IndexOf('/'));
//If there is a slash, skip to the first one, or default to empty path.
if (url.Contains('/'))
url = url.Substring(url.IndexOf('/'));
else
url = "/";
}
else if (url.StartsWith("https://"))
{
url = url.Substring(8);
url = url.Substring(url.IndexOf('/'));
//If there is a slash, skip to the first one, or default to empty path.
if (url.Contains('/'))
url = url.Substring(url.IndexOf('/'));
else
url = "/";
}
//Split the url and the syntax into path segments
var urlSegments = url.Split('/').Where(segment => segment.Length > 0).Select(segment => segment.Trim()).ToArray();
var syntaxSegments = syntax.Split('/').Where(segment => segment.Length > 0).Select(segment => segment.Trim()).ToArray();
var urlSegments = url.Split('/').Select(segment => segment.Trim()).ToArray();
var syntaxSegments = syntax.Split('/').Select(segment => segment.Trim()).ToArray();
//If we have no url segments, and we have no syntax segments, this is a root match which is fine.
if (urlSegments.Length == 0 && syntaxSegments.Length == 0)
@ -85,20 +99,25 @@ namespace MontoyaTech.Rest.Net
return false;
}
//If the segments syntax is a double wild card then everything after this is a match.
else if (syntaxSegment == "**")
else if (syntaxSegment == "**" && urlSegment != null)
{
return true;
}
//If we ran out of url segments, and this syntax segment is a wild card, this is okay.
else if (urlSegment == null && syntaxSegment == "*")
//If we ran out of url segments, and this syntax segment is a wild card, this is not a match.
else if (syntaxSegment == "*" && urlSegment != null)
{
return true;
//Allowed
}
//If we have a syntaxSegment but no urlSegment, this can't be a match.
else if (urlSegment == null && syntaxSegment != null)
{
return false;
}
//If both the url segment and syntax segment are empty then this is allowed
else if (urlSegment != null && urlSegment.Length == 0 && syntaxSegment.Length == 0)
{
//Allowed
}
//If we have a url segment see if it matches against the syntax segment.
else if (urlSegment != null)
{