jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow parsing URIs without authority

Browse source
This commit is contained in:
pgkos 2017-10-25 18:54:34 +02:00 • committed by GitHub
commit a20326e268
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/pure/uri.nim
View file

@ -135,9 +135,8 @@ proc parseUri*(uri: string, result: var Uri) =
i.inc(2) # Skip // i.inc(2) # Skip //
var authority = "" var authority = ""
i.inc parseUntil(uri, authority, {'/', '?', '#'}, i) i.inc parseUntil(uri, authority, {'/', '?', '#'}, i)
if authority == "": if authority.len > 0:
raise newException(ValueError, "Expected authority got nothing.") parseAuthority(authority, result)
parseAuthority(authority, result)
else: else:
result.opaque = true result.opaque = true
@ -412,6 +411,15 @@ when isMainModule:
doAssert test.hostname == "github.com" doAssert test.hostname == "github.com"
doAssert test.port == "dom96" doAssert test.port == "dom96"
doAssert test.path == "/packages" doAssert test.path == "/packages"
block:
let str = "file:///foo/bar/baz.txt"
let test = parseUri(str)
doAssert test.scheme == "file"
doAssert test.username == ""
doAssert test.hostname == ""
doAssert test.port == ""
doAssert test.path == "/foo/bar/baz.txt"
# Remove dot segments tests # Remove dot segments tests
block: block:
@ -524,4 +532,4 @@ when isMainModule:
doAssert "https://example.com/about/staff.html?".parseUri().isAbsolute == true doAssert "https://example.com/about/staff.html?".parseUri().isAbsolute == true
doAssert "https://example.com/about/staff.html?parameters".parseUri().isAbsolute == true doAssert "https://example.com/about/staff.html?parameters".parseUri().isAbsolute == true
echo("All good!") echo("All good!")