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

diff --git a/Network/HTTP/Lucu/MIMEType.hs b/Network/HTTP/Lucu/MIMEType.hs
index ab0e065..d60b70e 100644
--- a/Network/HTTP/Lucu/MIMEType.hs
+++ b/Network/HTTP/Lucu/MIMEType.hs
@@ -1,12 +1,14 @@
 {-# LANGUAGE
-    OverloadedStrings
+    DeriveDataTypeable
+  , OverloadedStrings
+  , RecordWildCards
+  , TemplateHaskell
   , UnicodeSyntax
   #-}
-
--- |MIME Types
+-- |Parsing and printing MIME Media Types
+-- (<http://tools.ietf.org/html/rfc2046>).
 module Network.HTTP.Lucu.MIMEType
     ( MIMEType(..)
-    , mkMIMEType
 
     , parseMIMEType
     , printMIMEType
@@ -19,64 +21,60 @@ import Control.Applicative
 import Data.Ascii (Ascii, AsciiBuilder, CIAscii)
 import qualified Data.Ascii as A
 import Data.Attoparsec.Char8 as P
-import Data.Map (Map)
 import Data.Monoid.Unicode
-import Data.Text (Text)
+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.RFC2231
-import Prelude hiding (min)
+import Network.HTTP.Lucu.Utils
 import Prelude.Unicode
 
--- |@'MIMEType' \"major\" \"minor\" [(\"name\", \"value\"), ...]@
--- represents \"major\/minor; name=value; ...\".
-data MIMEType = MIMEType {
-      mtMajor  ∷ !CIAscii
-    , mtMinor  ∷ !CIAscii
-    , mtParams ∷ !(Map CIAscii Text)
-    } deriving (Eq)
-
-instance Show MIMEType where
-    show = A.toString ∘ A.fromAsciiBuilder ∘ printMIMEType
+-- |A media type, subtype, and parameters.
+data MIMEType
+    = MIMEType {
+        mtMedia  ∷ !CIAscii
+      , mtSub    ∷ !CIAscii
+      , mtParams ∷ !MIMEParams
+      }
+    deriving (Eq, Show, Read, Typeable)
 
--- |@'mkMIMEType' major minor@ returns a 'MIMEType' with the given
--- @major@ and @minor@ types but without any parameters.
-mkMIMEType ∷ CIAscii → CIAscii → MIMEType
-{-# INLINE mkMIMEType #-}
-mkMIMEType maj min
-    = MIMEType maj min (∅)
+instance Lift MIMEType where
+    lift (MIMEType {..})
+        = [| MIMEType {
+               mtMedia  = $(liftCIAscii mtMedia)
+             , mtSub    = $(liftCIAscii mtSub)
+             , mtParams = $(lift mtParams)
+             }
+           |]
 
 -- |Convert a 'MIMEType' to an 'AsciiBuilder'.
 printMIMEType ∷ MIMEType → AsciiBuilder
 {-# INLINEABLE printMIMEType #-}
-printMIMEType (MIMEType maj min params)
-    = A.toAsciiBuilder (A.fromCIAscii maj) ⊕
+printMIMEType (MIMEType {..})
+    = A.toAsciiBuilder (A.fromCIAscii mtMedia) ⊕
       A.toAsciiBuilder "/" ⊕
-      A.toAsciiBuilder (A.fromCIAscii min) ⊕
-      printMIMEParams params
+      A.toAsciiBuilder (A.fromCIAscii mtSub) ⊕
+      printMIMEParams mtParams
 
 -- |Parse 'MIMEType' from an 'Ascii'. This function throws an
--- exception for parse error.
+-- exception for parse error. For literals consider using
+-- 'Network.HTTP.Lucu.MIMEType.TH.mimeType'.
 parseMIMEType ∷ Ascii → MIMEType
 {-# INLINEABLE parseMIMEType #-}
 parseMIMEType str
-    = case parseOnly p $ A.toByteString str of
+    = case parseOnly (finishOff mimeType) $ A.toByteString str of
         Right  t → t
         Left err → error ("unparsable MIME Type: " ⧺ A.toString str ⧺ ": " ⧺ err)
-    where
-      p ∷ Parser MIMEType
-      {-# INLINE p #-}
-      p = do t ← mimeType
-             endOfInput
-             return t
 
 -- |'Parser' for an 'MIMEType'.
 mimeType ∷ Parser MIMEType
 {-# INLINEABLE mimeType #-}
-mimeType = do maj    ← A.toCIAscii <$> token
+mimeType = do media  ← A.toCIAscii <$> token
               _      ← char '/'
-              min    ← A.toCIAscii <$> token
+              sub    ← A.toCIAscii <$> token
               params ← mimeParams
-              return $ MIMEType maj min params
+              return $ MIMEType media sub params
 
 -- |'Parser' for a list of 'MIMEType's.
 mimeTypeList ∷ Parser [MIMEType]