lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 19:04:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Adding a test for slugs

Browse Source 
--HG--
branch : dev
This commit is contained in:
Sebastien Ros
2010-10-14 16:55:09 -07:00
parent a49112c177
commit ff91690cfb
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Orchard.Core.Tests/Routable/Services/RoutableServiceTests.cs
View File

@@ -84,6 +84,13 @@ namespace Orchard.Core.Tests.Routable.Services {
Assert.That(_routableService.IsSlugValid("some/page"), Is.True);
}
[Test]
public void DotsAroundSlugAreAllowed() {
Assert.That(_routableService.IsSlugValid(".slug"), Is.False);
Assert.That(_routableService.IsSlugValid("slug."), Is.False);
Assert.That(_routableService.IsSlugValid("slug.slug"), Is.True);
}
[Test]
public void EmptySlugsShouldBeConsideredValid() {
// so that automatic generation on Publish occurs

8
src/Orchard.Web/Core/Routable/Services/RoutableService.cs
View File

@@ -66,13 +66,7 @@ namespace Orchard.Core.Routable.Services {
}
public bool IsSlugValid(string slug) {
slug = (slug ?? String.Empty).Trim();
return !( SlugHasProhibitedChard(slug) || slug.StartsWith(".") || slug.EndsWith(".") );
}
public bool SlugHasProhibitedChard(string slug) {
// see http://tools.ietf.org/html/rfc3987 for prohibited chars
return Regex.IsMatch(slug, @"^[^:?#\[\]@!$&'()*+,;=\s]+$");
return String.IsNullOrWhiteSpace(slug) || Regex.IsMatch(slug, @"^[^:?#\[\]@!$&'()*+,;=\s]+$") && !(slug.StartsWith(".") || slug.EndsWith("."));
}
public bool ProcessSlug(RoutePart part) {