Use base64-bytestring instead of dataenc

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

diff --git a/Network/HTTP/Lucu/Utils.hs b/Network/HTTP/Lucu/Utils.hs
index 5dc1584683b5b23082cc3ae63cbd57ad293fe2e2..c85c9a72b6a023241857ba1c613eb1e4d5a2485e 100644 (file)
--- a/Network/HTTP/Lucu/Utils.hs
+++ b/Network/HTTP/Lucu/Utils.hs
@@ -1,52 +1,77 @@
+{-# 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      -- (a -> Bool) -> [a] -> [[a]]
-    , joinWith     -- [a] -> [[a]] -> [a]
-    , trim         -- (a -> Bool) -> [a] -> [a]
-    , noCaseEq     -- String -> String -> Bool
-    , isWhiteSpace -- Char -> Bool
-    , quoteStr     -- String -> String
+    ( splitBy
+    , joinWith
+    , trim
+    , 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)
 
-
+-- |> 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"]
+--  > ==> "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 :: String -> String -> Bool
-noCaseEq a b
-    = (map toLower a) == (map toLower b)
-
-
+-- |@'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\""
+--
+--  > 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 '"' = "\\\""
-      quote c   = [c]
\ No newline at end of file
+      quote c   = [c]
+
+
+-- |> parseWWWFormURLEncoded "aaa=bbb&ccc=ddd"
+--  > ==> [("aaa", "bbb"), ("ccc", "ddd")]
+parseWWWFormURLEncoded :: String -> [(String, String)]
+parseWWWFormURLEncoded src
+    | src == "" = []
+    | otherwise = do pairStr <- splitBy (\ c -> c == ';' || c == '&') src
+                     let (key, value) = break (== '=') pairStr
+                     return ( unEscapeString key
+                            , unEscapeString $ case value of
+                                                 ('=':val) -> val
+                                                 val       -> val
+                            )