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

start using import {.all.} (#17736)

Browse source
This commit is contained in:
Timothee Cour 2021-04-16 03:54:49 -07:00 • committed by GitHub
commit 611b88763f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/pure/uri.nim
View file

@ -555,25 +555,3 @@ proc getDataUri*(data, mime: string, encoding = "utf-8"): string {.since: (1, 3)
runnableExamples: static: doAssert getDataUri("Nim", "text/plain") == "data:text/plain;charset=utf-8;base64,Tmlt" runnableExamples: static: doAssert getDataUri("Nim", "text/plain") == "data:text/plain;charset=utf-8;base64,Tmlt"
assert encoding.len > 0 and mime.len > 0 # Must *not* be URL-Safe, see RFC-2397 assert encoding.len > 0 and mime.len > 0 # Must *not* be URL-Safe, see RFC-2397
result = "data:" & mime & ";charset=" & encoding & ";base64," & base64.encode(data) result = "data:" & mime & ";charset=" & encoding & ";base64," & base64.encode(data)
when isMainModule and defined(testing):
# needed (pending https://github.com/nim-lang/Nim/pull/11865) because
# `removeDotSegments` is private, the other tests are in `turi`.
block: # removeDotSegments
# `removeDotSegments` is exported for -d:testing only
doAssert removeDotSegments("/foo/bar/baz") == "/foo/bar/baz"
doAssert removeDotSegments("") == "" # empty test
doAssert removeDotSegments(".") == "." # trailing period
doAssert removeDotSegments("a1/a2/../a3/a4/a5/./a6/a7/././") == "a1/a3/a4/a5/a6/a7/"
doAssert removeDotSegments("https://a1/a2/../a3/a4/a5/./a6/a7/././") == "https://a1/a3/a4/a5/a6/a7/"
doAssert removeDotSegments("http://a1/a2") == "http://a1/a2"
doAssert removeDotSegments("http://www.ai.") == "http://www.ai."
when false: # xxx these cases are buggy
# this should work, refs https://webmasters.stackexchange.com/questions/73934/how-can-urls-have-a-dot-at-the-end-e-g-www-bla-de
doAssert removeDotSegments("http://www.ai./") == "http://www.ai./" # fails
echo removeDotSegments("http://www.ai./") # http://www.ai/
echo removeDotSegments("a/b.../c") # b.c
echo removeDotSegments("a/b../c") # bc
echo removeDotSegments("a/.../c") # .c
echo removeDotSegments("a//../b") # a/b
echo removeDotSegments("a/b/c//") # a/b/c//

19
tests/stdlib/turi.nim
View file

@ -3,6 +3,7 @@ discard """
""" """
import std/uri import std/uri
from std/uri {.all.} as uri2 import removeDotSegments
from std/sequtils import toSeq from std/sequtils import toSeq
template main() = template main() =
@ -14,6 +15,24 @@ template main() =
doAssert decodeUrl(encodeUrl(test1, false), false) == test1 doAssert decodeUrl(encodeUrl(test1, false), false) == test1
doAssert decodeUrl(encodeUrl(test1)) == test1 doAssert decodeUrl(encodeUrl(test1)) == test1
block: # removeDotSegments
doAssert removeDotSegments("/foo/bar/baz") == "/foo/bar/baz"
doAssert removeDotSegments("") == "" # empty test
doAssert removeDotSegments(".") == "." # trailing period
doAssert removeDotSegments("a1/a2/../a3/a4/a5/./a6/a7/././") == "a1/a3/a4/a5/a6/a7/"
doAssert removeDotSegments("https://a1/a2/../a3/a4/a5/./a6/a7/././") == "https://a1/a3/a4/a5/a6/a7/"
doAssert removeDotSegments("http://a1/a2") == "http://a1/a2"
doAssert removeDotSegments("http://www.ai.") == "http://www.ai."
when false: # xxx these cases are buggy
# this should work, refs https://webmasters.stackexchange.com/questions/73934/how-can-urls-have-a-dot-at-the-end-e-g-www-bla-de
doAssert removeDotSegments("http://www.ai./") == "http://www.ai./" # fails
echo removeDotSegments("http://www.ai./") # http://www.ai/
echo removeDotSegments("a/b.../c") # b.c
echo removeDotSegments("a/b../c") # bc
echo removeDotSegments("a/.../c") # .c
echo removeDotSegments("a//../b") # a/b
echo removeDotSegments("a/b/c//") # a/b/c//
block: # parseUri block: # parseUri
block: block:
let org = "udp://[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:8080" let org = "udp://[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:8080"