diff --git a/src/gemini/package.lisp b/src/gemini/package.lisp index c14ee47..de0b4c6 100644 --- a/src/gemini/package.lisp +++ b/src/gemini/package.lisp @@ -31,6 +31,7 @@ :config :constants :text-utils + :iri-parser :misc :alexandria :gemini-constants) diff --git a/src/package.lisp b/src/package.lisp index 3a0acb0..8e5e20f 100644 --- a/src/package.lisp +++ b/src/package.lisp @@ -709,7 +709,6 @@ :path :query :fragment - :normalize-path :make-uri)) (defpackage :iri-parser @@ -720,6 +719,7 @@ :cl-ppcre :text-utils) (:nicknames :iri) + (:import-from :fs :normalize-path) (:export :+segment-separator+ :iri @@ -727,6 +727,7 @@ :render-iri :make-iri :iri-parse + :normalize-path :absolute-url-p :ipv4-address-p :ipv6-address-p)) diff --git a/src/tests/uri-tests.lisp b/src/tests/uri-tests.lisp index b75a5b5..760494e 100644 --- a/src/tests/uri-tests.lisp +++ b/src/tests/uri-tests.lisp @@ -66,7 +66,7 @@ (assert-true (test-uri a b) a))) (defun normalize (path expected) - (string= (uri:normalize-path path) + (string= (fs:normalize-path path) expected)) (deftest test-normalize-path (uri-suite)