Fix empty query value parsing and add appropriate tests

Author: paluh

src/Data/URI/Query.purs

@@ -33,7 +33,7 @@ parseParts = sepBy parsePart (string ";" <|> string "&")
 
 parsePart ∷ Parser (Tuple String (Maybe String))
 parsePart = do
-  key ← rxPat "[^=]+"
+  key ← rxPat "[^=;&]+"
   value ← optionMaybe $ string "=" *> rxPat "[^;&]*"
   pure $ Tuple (prettyDecodeURI key) (prettyDecodeURI <$> value)
 

test/Main.purs

@@ -11,11 +11,12 @@ import Data.Maybe (Maybe(Nothing, Just))
 import Data.Path.Pathy (currentDir, parentDir', file, dir, rootDir, (</>))
 import Data.Tuple (Tuple(Tuple))
 import Data.URI (Authority(Authority), HierarchicalPart(HierarchicalPart), Host(IPv4Address, NameAddress, IPv6Address), Query(Query), RelativePart(RelativePart), RelativeRef(RelativeRef), URI(URI), URIScheme(URIScheme), runParseURIRef)
-import Data.URI.Query (printQuery)
+import Data.URI.Query (parseQuery, printQuery)
 import Test.Unit (suite, test, TestSuite)
 import Test.Unit.Assert (assert, equal)
 import Test.Unit.Console (TESTOUTPUT)
 import Test.Unit.Main (runTest)
+import Text.Parsing.StringParser (runParser)
 
 testRunParseURIRefParses :: forall a. String -> Either URI RelativeRef -> TestSuite a
 testRunParseURIRefParses uri expected =
@@ -29,12 +30,18 @@ testRunParseURIRefFailes uri =
     ("failes to parse: " <> uri)
     (assert ("parse should fail for: " <> uri) <<< isLeft <<< runParseURIRef $ uri)
 
-testQuerySerialization :: forall a. Query -> String -> TestSuite a
-testQuerySerialization query expected =
+testPrintQuerySerializes :: forall a. Query -> String -> TestSuite a
+testPrintQuerySerializes query expected =
   test
-    ("query " <> show query <> " serializes.")
+    ("serializes: " <> show query)
     (equal expected (printQuery query))
 
+testParseQueryParses :: forall a. String -> Query -> TestSuite a
+testParseQueryParses uri query =
+  test
+    ("parses: \"" <> uri <> "\"")
+    (equal (Right query) (runParser parseQuery uri))
+
 main :: forall eff. Eff ( console :: CONSOLE , testOutput :: TESTOUTPUT, avar :: AVAR | eff ) Unit
 main = runTest $ suite "Data.URI" do
   suite "runParseURIRef" do
@@ -282,8 +289,27 @@ main = runTest $ suite "Data.URI" do
     testRunParseURIRefFailes "mailto:[email protected]"
     testRunParseURIRefFailes "/top_story.htm"
 
-    testQuerySerialization
+  suite "printQuery" do
+    testPrintQuerySerializes
       (Query (Tuple "key1" (Just "value1") : Tuple "key2" (Just "value2") : Tuple "key1" (Just "value3") : Nil))
       "?key1=value1&key2=value2&key1=value3"
-    testQuerySerialization (Query Nil) ""
+    testPrintQuerySerializes (Query Nil) ""
+    testPrintQuerySerializes
+      (Query (Tuple "key1" (Just "") : Tuple "key2" (Just "") : Nil))
+      "?key1=&key2="
+    testPrintQuerySerializes
+      (Query (Tuple "key1" Nothing : Tuple "key2" Nothing : Nil))
+      "?key1&key2"
+
+  suite "parseQuery" do
+    testParseQueryParses
+      "key1=value1&key2=value2&key1=value3"
+      (Query (Tuple "key1" (Just "value1") : Tuple "key2" (Just "value2") : Tuple "key1" (Just "value3") : Nil))
+    testParseQueryParses
+      "key1&key2"
+      (Query (Tuple "key1" Nothing : Tuple "key2" Nothing : Nil))
+    testParseQueryParses
+      "key1=&key2="
+      (Query (Tuple "key1" (Just "") : Tuple "key2" (Just "") : Nil))
+