X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FMIMEType.hs;h=250fdbfc4033a3268412e1b933d2bca37f308918;hb=c9a269666f2d60d9c5ba817e1c43b45f6d77de22;hp=88bd5e7a600b1afd24b5a61b253db5befc8bfff4;hpb=48bc90d66a45c0b9b6f52272b46cf2949ed802e3;p=Lucu.git

diff --git a/Network/HTTP/Lucu/MIMEType.hs b/Network/HTTP/Lucu/MIMEType.hs
index 88bd5e7..250fdbf 100644
--- a/Network/HTTP/Lucu/MIMEType.hs
+++ b/Network/HTTP/Lucu/MIMEType.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE
     DeriveDataTypeable
+  , FlexibleInstances
+  , MultiParamTypeClasses
   , OverloadedStrings
   , RecordWildCards
   , TemplateHaskell
@@ -9,25 +11,23 @@
 -- (<http://tools.ietf.org/html/rfc2046>).
 module Network.HTTP.Lucu.MIMEType
     ( MIMEType(..)
-
-    , parseMIMEType
-    , 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.Attoparsec.Char8
+import Data.Convertible.Base
+import Data.Convertible.Instances.Ascii ()
+import Data.Convertible.Utils
 import Data.Monoid.Unicode
 import Data.Typeable
 import Language.Haskell.TH.Syntax
 import Network.HTTP.Lucu.MIMEParams
+import Network.HTTP.Lucu.OrphanInstances ()
 import Network.HTTP.Lucu.Parser
 import Network.HTTP.Lucu.Parser.Http
-import Network.HTTP.Lucu.Utils
 import Prelude.Unicode
 
 -- |A media type, subtype, and parameters.
@@ -42,37 +42,43 @@ data MIMEType
 instance Lift MIMEType where
     lift (MIMEType {..})
         = [| MIMEType {
-               mtMedia  = $(liftCIAscii mtMedia)
-             , mtSub    = $(liftCIAscii mtSub)
+               mtMedia  = $(lift mtMedia )
+             , mtSub    = $(lift mtSub   )
              , mtParams = $(lift mtParams)
              }
            |]
 
--- |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
+instance ConvertSuccess MIMEType Ascii where
+    {-# INLINE convertSuccess #-}
+    convertSuccess = convertSuccessVia ((⊥) ∷ AsciiBuilder)
+
+instance ConvertSuccess MIMEType AsciiBuilder where
+    {-# INLINEABLE convertSuccess #-}
+    convertSuccess (MIMEType {..})
+        = cs mtMedia       ⊕
+          cs ("/" ∷ Ascii) ⊕
+          cs mtSub         ⊕
+          cs mtParams
+
+deriveAttempts [ ([t| MIMEType |], [t| Ascii        |])
+               , ([t| MIMEType |], [t| AsciiBuilder |])
+               ]
 
--- |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)
+-- |Parse 'MIMEType' from an 'Ascii'. For MIME type literals, consider
+-- using 'Network.HTTP.Lucu.MIMEType.TH.mimeType'.
+instance ConvertAttempt Ascii MIMEType where
+    {-# INLINEABLE convertAttempt #-}
+    convertAttempt str
+        = case parseOnly (finishOff mimeType) (cs str) of
+            Right  t → return t
+            Left err → fail ("Unparsable MIME Type: " ⧺ cs str ⧺ ": " ⧺ err)
 
 -- |'Parser' for an 'MIMEType'.
 mimeType ∷ Parser MIMEType
 {-# INLINEABLE mimeType #-}
-mimeType = do media  ← A.toCIAscii <$> token
+mimeType = do media  ← cs <$> token
               _      ← char '/'
-              sub    ← A.toCIAscii <$> token
+              sub    ← cs <$> token
               params ← mimeParams
               return $ MIMEType media sub params