X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=Lucu.git;a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FMIMEType.hs;h=d60b70e5d5f21d4704ee6bb269f271692d35e58e;hp=e28238e53297237f633dc4bcca4f581f4f0f102f;hb=b1fac0a;hpb=1196f43ecedbb123515065f0440844864af906fb

diff --git a/Network/HTTP/Lucu/MIMEType.hs b/Network/HTTP/Lucu/MIMEType.hs
index e28238e..d60b70e 100644
--- a/Network/HTTP/Lucu/MIMEType.hs
+++ b/Network/HTTP/Lucu/MIMEType.hs
@@ -1,74 +1,82 @@
-{-# OPTIONS_HADDOCK prune #-}
-
--- |Manipulation of MIME Types.
+{-# LANGUAGE
+    DeriveDataTypeable
+  , OverloadedStrings
+  , RecordWildCards
+  , TemplateHaskell
+  , UnicodeSyntax
+  #-}
+-- |Parsing and printing MIME Media Types
+-- (<http://tools.ietf.org/html/rfc2046>).
 module Network.HTTP.Lucu.MIMEType
     ( MIMEType(..)
+
     , parseMIMEType
-    , mimeTypeP
-    , mimeTypeListP
+    , printMIMEType
+
+    , mimeType
+    , mimeTypeList
     )
     where
+import Control.Applicative
+import Data.Ascii (Ascii, AsciiBuilder, CIAscii)
+import qualified Data.Ascii as A
+import Data.Attoparsec.Char8 as P
+import Data.Monoid.Unicode
+import Data.Typeable
+import Language.Haskell.TH.Syntax
+import Network.HTTP.Lucu.MIMEParams
+import Network.HTTP.Lucu.Parser
+import Network.HTTP.Lucu.Parser.Http
+import Network.HTTP.Lucu.Utils
+import Prelude.Unicode
 
-import qualified Data.ByteString.Lazy as B
-import           Network.HTTP.Lucu.Parser
-import           Network.HTTP.Lucu.Parser.Http
-import           Network.HTTP.Lucu.Utils
-import           Prelude hiding (min)
-
--- |@'MIMEType' \"major\" \"minor\" [(\"name\", \"value\")]@
--- represents \"major\/minor; name=value\".
-data MIMEType = MIMEType {
-      mtMajor  :: !String
-    , mtMinor  :: !String
-    , mtParams :: ![ (String, String) ]
-    } deriving (Eq)
+-- |A media type, subtype, and parameters.
+data MIMEType
+    = MIMEType {
+        mtMedia  ∷ !CIAscii
+      , mtSub    ∷ !CIAscii
+      , mtParams ∷ !MIMEParams
+      }
+    deriving (Eq, Show, Read, Typeable)
 
+instance Lift MIMEType where
+    lift (MIMEType {..})
+        = [| MIMEType {
+               mtMedia  = $(liftCIAscii mtMedia)
+             , mtSub    = $(liftCIAscii mtSub)
+             , mtParams = $(lift mtParams)
+             }
+           |]
 
-instance Show MIMEType where
-    show (MIMEType maj min params)
-        = maj ++ "/" ++ min ++
-          if null params then
-              ""
-          else
-              "; " ++ joinWith "; " (map showPair params)
-        where
-          showPair :: (String, String) -> String
-          showPair (name, value)
-              = name ++ "=" ++ if any (not . isToken) value then
-                                   quoteStr value
-                               else
-                                   value
+-- |Convert a 'MIMEType' to an 'AsciiBuilder'.
+printMIMEType ∷ MIMEType → AsciiBuilder
+{-# INLINEABLE printMIMEType #-}
+printMIMEType (MIMEType {..})
+    = A.toAsciiBuilder (A.fromCIAscii mtMedia) ⊕
+      A.toAsciiBuilder "/" ⊕
+      A.toAsciiBuilder (A.fromCIAscii mtSub) ⊕
+      printMIMEParams mtParams
 
+-- |Parse 'MIMEType' from an 'Ascii'. This function throws an
+-- exception for parse error. For literals consider using
+-- 'Network.HTTP.Lucu.MIMEType.TH.mimeType'.
+parseMIMEType ∷ Ascii → MIMEType
+{-# INLINEABLE parseMIMEType #-}
+parseMIMEType str
+    = case parseOnly (finishOff mimeType) $ A.toByteString str of
+        Right  t → t
+        Left err → error ("unparsable MIME Type: " ⧺ A.toString str ⧺ ": " ⧺ err)
 
-instance Read MIMEType where
-    readsPrec _ s = [(parseMIMEType s, "")]
-
--- |Parse 'MIMEType' from a 'Prelude.String'. This function throws an
--- exception for parse error.
-parseMIMEType :: String -> MIMEType
-parseMIMEType str = case parseStr mimeTypeP str of
-                      (# Success t, r #) -> if B.null r
-                                            then t
-                                            else error ("unparsable MIME Type: " ++ str)
-                      (# _        , _ #) -> error ("unparsable MIME Type: " ++ str)
-
-
-mimeTypeP :: Parser MIMEType
-mimeTypeP = allowEOF $!
-            do maj <- token
-               char '/'
-               min <- token
-               params <- many paramP
-               return $ MIMEType maj min params
-    where
-      paramP :: Parser (String, String)
-      paramP = do many lws
-                  char ';'
-                  many lws
-                  name <- token
-                  char '='
-                  value <- token <|> quotedStr
-                  return (name, value)
+-- |'Parser' for an 'MIMEType'.
+mimeType ∷ Parser MIMEType
+{-# INLINEABLE mimeType #-}
+mimeType = do media  ← A.toCIAscii <$> token
+              _      ← char '/'
+              sub    ← A.toCIAscii <$> token
+              params ← mimeParams
+              return $ MIMEType media sub params
 
-mimeTypeListP :: Parser [MIMEType]
-mimeTypeListP = allowEOF $! listOf mimeTypeP
+-- |'Parser' for a list of 'MIMEType's.
+mimeTypeList ∷ Parser [MIMEType]
+{-# INLINE mimeTypeList #-}
+mimeTypeList = listOf mimeType