escape characters in URLs

src/Network/GemServ.hs

@@ -42,10 +42,10 @@ encodeRequest req =
     authority = reqHost req ++ case reqPort req of
       Just port -> ':' : show port
       Nothing   -> ""
-    path = intercalate "/" $ reqPath req
+    path = intercalate "/" $ map escapeString $ reqPath req
     query = case reqQuery req of
       "" -> ""
-      q  -> '?' : q
+      q  -> '?' : escapeString q
 
 -- | add required escape sequences to a string
 escapeString :: String -> String

test/Network/GemServSpec.hs

@@ -44,6 +44,7 @@ encodeRequestSpec = describe "encodeRequest" $ mapM_
   , ( "with port",   withPortReq,   withPortExp   )
   , ( "with path",   withPathReq,   withPathExp   )
   , ( "with query",  withQueryReq,  withQueryExp  )
+  , ( "with escape", withEscapeReq, withEscapeExp )
   ]
 
   where
@@ -56,6 +57,13 @@ encodeRequestSpec = describe "encodeRequest" $ mapM_
     withQueryReq  = simpleReq { reqQuery = "foo" }
     withQueryExp  = "gemini://example.com/?foo"
 
+    withEscapeReq = simpleReq
+      { reqPath  = ["foo bar"]
+      , reqQuery = "baz quux"
+      }
+
+    withEscapeExp = "gemini://example.com/foo%20bar?baz%20quux"
+
 escapeStringSpec :: Spec
 escapeStringSpec = describe "escapeString" $ mapM_
   ( \(input, expected) -> context (show input) $