Bugfix: parseWWWFormURLEncoded now replaces each '+' to ' ', that were previously...

[Lucu.git] / Network / HTTP / Lucu / Utils.hs

diff --git a/Network/HTTP/Lucu/Utils.hs b/Network/HTTP/Lucu/Utils.hs
index d7ace3f8309aab60c21f2c8c6c4362189a05bc73..dbc65ac17ad8a52f553af26e5506a33df9aab137 100644 (file)
--- a/Network/HTTP/Lucu/Utils.hs
+++ b/Network/HTTP/Lucu/Utils.hs
@@ -1,54 +1,54 @@
+{-# LANGUAGE
+    BangPatterns
+  , UnicodeSyntax
+  #-}
 -- |Utility functions used internally in the Lucu httpd. These
 -- functions may be useful too for something else.
 module Network.HTTP.Lucu.Utils
     ( splitBy
     , joinWith
     , trim
-    , noCaseEq
     , isWhiteSpace
     , quoteStr
     , parseWWWFormURLEncoded
     )
     where
-
-import Control.Monad.Trans
-import Data.Char
-import Data.List
-import Foreign
-import Foreign.C
+import Control.Monad
+import Data.List     hiding (last)
 import Network.URI
+import Prelude       hiding (last)
+import Prelude.Unicode
 
 -- |> splitBy (== ':') "ab:c:def"
 --  > ==> ["ab", "c", "def"]
 splitBy :: (a -> Bool) -> [a] -> [[a]]
-splitBy isSeparator src
-    = case break isSeparator src
-      of (last , []      ) -> last  : []
-         (first, sep:rest) -> first : splitBy isSeparator rest
+splitBy isSep src
+    = case break isSep src
+      of (last , []       ) -> [last]
+         (first, _sep:rest) -> first : splitBy isSep rest
 
--- |> joinWith ':' ["ab", "c", "def"]
+-- |> joinWith ":" ["ab", "c", "def"]
 --  > ==> "ab:c:def"
 joinWith :: [a] -> [[a]] -> [a]
-joinWith separator xs
-    = foldr (++) [] $ intersperse separator xs
+joinWith = (join .) . intersperse
 
 -- |> trim (== '_') "__ab_c__def___"
 --  > ==> "ab_c__def"
 trim :: (a -> Bool) -> [a] -> [a]
-trim p = trimTail . trimHead
+trim !p = trimTail . trimHead
     where
       trimHead = dropWhile p
       trimTail = reverse . trimHead . reverse
 
--- |@'noCaseEq' a b@ is equivalent to @(map toLower a) == (map toLower
--- b)@
-noCaseEq :: String -> String -> Bool
-noCaseEq a b
-    = (map toLower a) == (map toLower b)
-
--- |@'isWhiteSpace' c@ is True iff c is one of SP, HT, CR and LF.
+-- |@'isWhiteSpace' c@ is 'Prelude.True' iff c is one of SP, HT, CR
+-- and LF.
 isWhiteSpace :: Char -> Bool
-isWhiteSpace = flip elem " \t\r\n"
+isWhiteSpace ' '  = True
+isWhiteSpace '\t' = True
+isWhiteSpace '\r' = True
+isWhiteSpace '\n' = True
+isWhiteSpace _    = False
+{-# INLINE isWhiteSpace #-}
 
 -- |> quoteStr "abc"
 --  > ==> "\"abc\""
@@ -56,7 +56,7 @@ isWhiteSpace = flip elem " \t\r\n"
 --  > quoteStr "ab\"c"
 --  > ==> "\"ab\\\"c\""
 quoteStr :: String -> String
-quoteStr str = foldr (++) "" (["\""] ++ map quote str ++ ["\""])
+quoteStr !str = concat (["\""] ++ map quote str ++ ["\""])
     where
       quote :: Char -> String
       quote '"' = "\\\""
@@ -65,11 +65,20 @@ quoteStr str = foldr (++) "" (["\""] ++ map quote str ++ ["\""])
 
 -- |> parseWWWFormURLEncoded "aaa=bbb&ccc=ddd"
 --  > ==> [("aaa", "bbb"), ("ccc", "ddd")]
-parseWWWFormURLEncoded :: String -> [(String, String)]
+parseWWWFormURLEncoded ∷ String → [(String, String)]
 parseWWWFormURLEncoded src
-    | src == "" = []
-    | otherwise = do pairStr <- splitBy (\ c -> c == ';' || c == '&') src
-                     let pair = break (== '=') pairStr
-                     return ( unEscapeString $ fst pair
-                            , unEscapeString $ snd pair
+    | null src  = []
+    | otherwise = do pairStr ← splitBy (\ c → c ≡ ';' ∨ c ≡ '&') src
+                     let (key, value) = break (≡ '=') pairStr
+                     return ( unescape key
+                            , unescape $ case value of
+                                           ('=':val) → val
+                                           val       → val
                             )
+    where
+      unescape ∷ String → String
+      unescape = unEscapeString ∘ map plusToSpace
+
+      plusToSpace ∷ Char → Char
+      plusToSpace '+' = ' '
+      plusToSpace c   = c