X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FUtils.hs;h=7537eafcffacf7d8edf755e2bb8fea30cd636547;hb=c9a2696;hp=1070d66f28042193a0337b02f1e9d858d63c9403;hpb=b22e702f8161447a460847c6e6c97104c150534f;p=Lucu.git

diff --git a/Network/HTTP/Lucu/Utils.hs b/Network/HTTP/Lucu/Utils.hs
index 1070d66..7537eaf 100644
--- a/Network/HTTP/Lucu/Utils.hs
+++ b/Network/HTTP/Lucu/Utils.hs
@@ -5,9 +5,14 @@
   #-}
 -- |Utility functions used internally in this package.
 module Network.HTTP.Lucu.Utils
-    ( splitBy
+    ( Host
+    , PathSegment
+    , Path
+
+    , splitBy
     , quoteStr
     , parseWWWFormURLEncoded
+    , uriHost
     , uriPathSegments
     , trim
 
@@ -24,19 +29,35 @@ import Control.Monad hiding (mapM)
 import Data.Ascii (Ascii, AsciiBuilder)
 import qualified Data.Ascii as A
 import Data.ByteString (ByteString)
-import qualified Data.ByteString.Char8 as Strict
+import qualified Data.ByteString.Char8 as BS
+import Data.CaseInsensitive (CI)
+import qualified Data.CaseInsensitive as CI
 import Data.Char
 import Data.Collections
 import Data.Collections.BaseInstances ()
+import Data.Convertible.Base
+import Data.Convertible.Instances.Ascii ()
+import Data.Convertible.Instances.Text ()
+import Data.Convertible.Instances.Time ()
+import Data.Maybe
 import Data.Monoid.Unicode
-import Data.Ratio
+import Data.Text (Text)
 import Data.Time
-import Data.Time.Clock.POSIX
 import Network.URI
 import Prelude hiding (last, mapM, null, reverse)
 import Prelude.Unicode
 import System.Directory
-import System.Time (ClockTime(..))
+
+-- |'Host' represents an IP address or a host name in an URI
+-- authority.
+type Host = CI Text
+
+-- |'PathSegment' represents an URI path segment, split by slashes and
+-- percent-decoded.
+type PathSegment = ByteString
+
+-- |'Path' is a list of URI path segments.
+type Path = [PathSegment]
 
 -- |>>> splitBy (== ':') "ab:c:def"
 -- ["ab", "c", "def"]
@@ -53,22 +74,22 @@ splitBy isSep src
 -- >>> quoteStr "ab\"c"
 -- "\"ab\\\"c\""
 quoteStr ∷ Ascii → AsciiBuilder
-quoteStr str = A.toAsciiBuilder "\"" ⊕
-               go (A.toByteString str) (∅) ⊕
-               A.toAsciiBuilder "\""
+quoteStr str = cs ("\"" ∷ Ascii) ⊕
+               go (cs str) (∅)   ⊕
+               cs ("\"" ∷ Ascii)
     where
-      go ∷ Strict.ByteString → AsciiBuilder → AsciiBuilder
+      go ∷ ByteString → AsciiBuilder → AsciiBuilder
       go bs ab
-          = case Strict.break (≡ '"') bs of
+          = case BS.break (≡ '"') bs of
               (x, y)
-                  | Strict.null y
+                  | BS.null y
                       → ab ⊕ b2ab x
                   | otherwise
-                      → go (Strict.tail y)
-                           (ab ⊕ b2ab x ⊕ A.toAsciiBuilder "\\\"")
+                      → go (BS.tail y)
+                           (ab ⊕ b2ab x ⊕ cs ("\\\"" ∷ Ascii))
 
-      b2ab ∷ Strict.ByteString → AsciiBuilder
-      b2ab = A.toAsciiBuilder ∘ A.unsafeFromByteString
+      b2ab ∷ ByteString → AsciiBuilder
+      b2ab = cs ∘ A.unsafeFromByteString
 
 -- |>>> parseWWWFormURLEncoded "aaa=bbb&ccc=ddd"
 -- [("aaa", "bbb"), ("ccc", "ddd")]
@@ -77,7 +98,7 @@ parseWWWFormURLEncoded src
     -- THINKME: We could gain some performance by using attoparsec
     -- here.
     | src ≡ ""  = []
-    | otherwise = do pairStr ← splitBy (\ c → c ≡ ';' ∨ c ≡ '&') (A.toString src)
+    | otherwise = do pairStr ← splitBy (\ c → c ≡ ';' ∨ c ≡ '&') (cs src)
                      let (key, value) = break (≡ '=') pairStr
                      return ( unescape key
                             , unescape $ case value of
@@ -86,20 +107,27 @@ parseWWWFormURLEncoded src
                             )
     where
       unescape ∷ String → ByteString
-      unescape = Strict.pack ∘ unEscapeString ∘ (plusToSpace <$>)
+      unescape = BS.pack ∘ unEscapeString ∘ (plusToSpace <$>)
 
       plusToSpace ∷ Char → Char
       plusToSpace '+' = ' '
       plusToSpace c   = c
 
+-- |>>> uriHost "http://example.com/foo/bar"
+-- "example.com"
+uriHost ∷ URI → Host
+{-# INLINE uriHost #-}
+uriHost = CI.mk ∘ cs ∘ uriRegName ∘ fromJust ∘ uriAuthority
+
 -- |>>> uriPathSegments "http://example.com/foo/bar"
 -- ["foo", "bar"]
-uriPathSegments ∷ URI → [ByteString]
+uriPathSegments ∷ URI → Path
 uriPathSegments uri
     = let reqPathStr = uriPath uri
-          reqPath    = [unEscapeString x | x ← splitBy (≡ '/') reqPathStr, (¬) (null x)]
+          reqPath    = [ unEscapeString x
+                         | x ← splitBy (≡ '/') reqPathStr, (¬) (null x) ]
       in
-        Strict.pack <$> reqPath
+        BS.pack <$> reqPath
 
 -- |>>> trim "  ab c d "
 -- "ab c d"
@@ -109,21 +137,21 @@ trim = reverse ∘ f ∘ reverse ∘ f
       f = dropWhile isSpace
 
 infixr 5 ⊲
--- | (&#22B2;) = ('<|')
+-- | (&#x22B2;) = ('<|')
 --
 -- U+22B2, NORMAL SUBGROUP OF
 (⊲) ∷ Sequence α a ⇒ a → α → α
 (⊲) = (<|)
 
 infixl 5 ⊳
--- | (&#22B3;) = ('|>')
+-- | (&#x22B3;) = ('|>')
 --
 -- U+22B3, CONTAINS AS NORMAL SUBGROUP
 (⊳) ∷ Sequence α a ⇒ α → a → α
 (⊳) = (|>)
 
 infixr 5 ⋈
--- | (&#22C8;) = ('><')
+-- | (&#x22C8;) = ('><')
 --
 -- U+22C8, BOWTIE
 (⋈) ∷ Sequence α a ⇒ α → α → α
@@ -138,9 +166,4 @@ mapM = flip foldrM empty ∘ (flip ((<$>) ∘ flip insert) ∘)
 
 -- |Get the modification time of a given file.
 getLastModified ∷ FilePath → IO UTCTime
-getLastModified = (clockTimeToUTC <$>) ∘ getModificationTime
-    where
-      clockTimeToUTC ∷ ClockTime → UTCTime
-      clockTimeToUTC (TOD sec picoSec)
-          = posixSecondsToUTCTime ∘ fromRational
-            $ sec % 1 + picoSec % (1000 ⋅ 1000 ⋅ 1000 ⋅ 1000)
+getLastModified = (cs <$>) ∘ getModificationTime