Skip to content

#25 Local links #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dokkillo wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

#25 Local links #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
899bf69
#25 Local links
dokkillo Feb 8, 2017
5f10e4b
Merge remote-tracking branch 'refs/remotes/hmol/develop' into develop
dokkillo Feb 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions LinkCrawler/LinkCrawler.Tests/UtilsTests/HelpersTests/ValidUrlParserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,26 @@ public void Parse_UrlOnlyRelativePath_True()

Assert.That(parsed, Is.EqualTo(validUrl));
}

[Test]
public void Parse_UrlOnlyLocalPath_True()
{
var relativeUrl = "home";
string parsed;
var result = ValidUrlParser.Parse(relativeUrl, out parsed);
Assert.That(result, Is.True);
var validUrl = string.Format("{0}/{1}", ValidUrlParser.BaseUrl, relativeUrl);

Assert.That(parsed, Is.EqualTo(validUrl));
}

[Test]
public void Parse_UrlOnlyEmailPath_False()
{
var relativeUrl = "mailto:name@email.com";
string parsed;
var result = ValidUrlParser.Parse(relativeUrl, out parsed);
Assert.That(result, Is.False);
}
}
}
12 changes: 10 additions & 2 deletions LinkCrawler/LinkCrawler/Utils/Parsers/ValidUrlParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,15 @@ public bool Parse(string url, out string validUrl)

Uri parsedUri;

if (Regex.IsNotMatch(url)
if (Regex.IsNotMatch(url)
|| !Uri.TryCreate(url, UriKind.RelativeOrAbsolute, out parsedUri))
return false;
{
if (!(url.Contains("@")))
{
return Parse(string.Concat(BaseUrl, "/", url), out validUrl);
}
return false;
}

if (parsedUri.IsAbsoluteUri)
{
Expand All @@ -48,5 +54,7 @@ public bool Parse(string url, out string validUrl)
}
return false;
}


}
}