X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=Lucu.git;a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FUtils.hs;h=d6e571dd0fcf3ab0a2ad30c4cd1ac8188516d96c;hp=a488aafbb64161feee9e67404c05f29a065236ec;hb=51eda5b;hpb=0ff03469c29b791f2c609a659bbf59be97e306f2

diff --git a/Network/HTTP/Lucu/Utils.hs b/Network/HTTP/Lucu/Utils.hs
index a488aaf..d6e571d 100644
--- a/Network/HTTP/Lucu/Utils.hs
+++ b/Network/HTTP/Lucu/Utils.hs
@@ -1,59 +1,53 @@
 {-# LANGUAGE
-    BangPatterns
-  , OverloadedStrings
+    OverloadedStrings
+  , TemplateHaskell
   , 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
     , quoteStr
     , parseWWWFormURLEncoded
     , splitPathInfo
-    , show3
+    , trim
+    , liftCIAscii
+    , liftText
+    , liftMap
     )
     where
-import Blaze.ByteString.Builder.ByteString as B
-import Blaze.Text.Int as BT
 import Control.Monad
-import Data.Ascii (Ascii, AsciiBuilder)
+import Data.Ascii (Ascii, CIAscii, AsciiBuilder)
 import qualified Data.Ascii as A
 import Data.ByteString (ByteString)
 import qualified Data.ByteString.Char8 as BS
+import Data.Char
 import Data.List hiding (last)
+import Data.Map (Map)
+import qualified Data.Map as M
 import Data.Monoid.Unicode
 import Data.Text (Text)
-import Data.Text.Encoding as T
+import qualified Data.Text as T
+import Language.Haskell.TH.Lib
+import Language.Haskell.TH.Syntax
 import Network.URI
 import Prelude hiding (last)
 import Prelude.Unicode
 
--- |> splitBy (== ':') "ab:c:def"
---  > ==> ["ab", "c", "def"]
+-- |>>> splitBy (== ':') "ab:c:def"
+-- ["ab", "c", "def"]
 splitBy ∷ (a → Bool) → [a] → [[a]]
+{-# INLINEABLE splitBy #-}
 splitBy isSep src
-    = case break isSep src
-      of (last , []       ) → [last]
-         (first, _sep:rest) → first : splitBy isSep rest
+    = case break isSep src of
+        (last , []       ) → [last]
+        (first, _sep:rest) → first : splitBy isSep rest
 
--- |> joinWith ":" ["ab", "c", "def"]
---  > ==> "ab:c:def"
-joinWith ∷ Ascii → [AsciiBuilder] → AsciiBuilder
-{-# INLINEABLE joinWith #-}
-joinWith sep = flip go (∅)
-    where
-      go ∷ [AsciiBuilder] → AsciiBuilder → AsciiBuilder
-      {-# INLINE go #-}
-      go []     ab = ab
-      go (x:[]) ab = ab ⊕ x
-      go (x:xs) ab = go xs (ab ⊕ A.toAsciiBuilder sep ⊕ x)
-
--- |> quoteStr "abc"
---  > ==> "\"abc\""
+-- |>>> quoteStr "abc"
+-- "\"abc\""
 --
---  > quoteStr "ab\"c"
---  > ==> "\"ab\\\"c\""
+-- >>> quoteStr "ab\"c"
+-- "\"ab\\\"c\""
 quoteStr ∷ Ascii → AsciiBuilder
 quoteStr str = A.toAsciiBuilder "\"" ⊕
                go (A.toByteString str) (∅) ⊕
@@ -70,8 +64,8 @@ quoteStr str = A.toAsciiBuilder "\"" ⊕
       b2ab ∷ BS.ByteString → AsciiBuilder
       b2ab = A.toAsciiBuilder ∘ A.unsafeFromByteString
 
--- |> parseWWWFormURLEncoded "aaa=bbb&ccc=ddd"
---  > ==> [("aaa", "bbb"), ("ccc", "ddd")]
+-- |>>> parseWWWFormURLEncoded "aaa=bbb&ccc=ddd"
+-- [("aaa", "bbb"), ("ccc", "ddd")]
 parseWWWFormURLEncoded ∷ Ascii → [(ByteString, ByteString)]
 parseWWWFormURLEncoded src
     -- THINKME: We could gain some performance by using attoparsec
@@ -92,22 +86,40 @@ parseWWWFormURLEncoded src
       plusToSpace '+' = ' '
       plusToSpace c   = c
 
--- |> splitPathInfo "http://example.com/foo/bar"
---  > ==> ["foo", "bar"]
-splitPathInfo ∷ URI → [Text]
+-- |>>> splitPathInfo "http://example.com/foo/bar"
+-- ["foo", "bar"]
+splitPathInfo ∷ URI → [ByteString]
 splitPathInfo uri
     = let reqPathStr = uriPath uri
           reqPath    = [unEscapeString x | x ← splitBy (≡ '/') reqPathStr, (¬) (null x)]
       in
-        map (T.decodeUtf8 ∘ BS.pack) reqPath
+        map BS.pack reqPath
+
+-- |>>> trim "  ab c d "
+-- "ab c d"
+trim ∷ String → String
+trim = reverse ∘ f ∘ reverse ∘ f
+    where
+      f = dropWhile isSpace
+
+-- |Convert a 'CIAscii' to an 'Exp' representing it as a literal.
+liftCIAscii ∷ CIAscii → Q Exp
+liftCIAscii a = [| A.toCIAscii (A.unsafeFromString $(strLit a)) |]
+    where
+      strLit ∷ CIAscii → Q Exp
+      strLit = liftString ∘ A.toString ∘ A.fromCIAscii
+
+-- |Convert a 'Text' to an 'Exp' representing it as a literal.
+liftText ∷ Text → Q Exp
+liftText t = [| T.pack $(strLit t) |]
+    where
+      strLit ∷ Text → Q Exp
+      strLit = liftString ∘ T.unpack
 
--- |> show3 5
---  > ==> "005"
-show3 ∷ Integral n ⇒ n → AsciiBuilder
-{-# INLINEABLE show3 #-}
-show3 = A.unsafeFromBuilder ∘ go
+-- |Convert an arbitrary 'Map' to an 'Exp' representing it as a
+-- literal, using a given key lifter and a value lifter.
+liftMap ∷ Eq k ⇒ (k → Q Exp) → (v → Q Exp) → Map k v → Q Exp
+liftMap liftK liftV m = [| M.fromAscList $(liftPairs $ M.toAscList m) |]
     where
-      go i | i ≥ 0 ∧ i < 10   = B.fromByteString "00" ⊕ BT.digit    i
-           | i ≥ 0 ∧ i < 100  = B.fromByteString "0"  ⊕ BT.integral i
-           | i ≥ 0 ∧ i < 1000 =                         BT.integral i
-           | otherwise        = error ("show3: the integer i must satisfy 0 <= i < 1000: " ⧺ show i)
+      liftPairs       = listE ∘ map liftPair
+      liftPair (k, v) = tupE [liftK k, liftV v]