Code clean-up using convertible-text.

[Lucu.git] / Network / HTTP / Lucu / MIMEType.hs

diff --git a/Network/HTTP/Lucu/MIMEType.hs b/Network/HTTP/Lucu/MIMEType.hs
index 396a1646dbe7a5b297c2d27c8f1b834b37131b4c..1c448eedecde5435e0889cffdd49d126df7bc25e 100644 (file)
--- a/Network/HTTP/Lucu/MIMEType.hs
+++ b/Network/HTTP/Lucu/MIMEType.hs
@@ -1,70 +1,89 @@
--- #prune
-
--- |Manipulation of MIME Types.
+{-# LANGUAGE
+    DeriveDataTypeable
+  , FlexibleInstances
+  , MultiParamTypeClasses
+  , 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
+    , 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.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 Prelude.Unicode
 
-import           Network.HTTP.Lucu.Parser
-import           Network.HTTP.Lucu.Parser.Http
-import           Network.HTTP.Lucu.Utils
-
--- |@'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  = $(lift mtMedia )
+             , mtSub    = $(lift 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
+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
 
-instance Read MIMEType where
-    readsPrec _ s = [(parseMIMEType s, "")]
+deriveAttempts [ ([t| MIMEType |], [t| Ascii        |])
+               , ([t| MIMEType |], [t| AsciiBuilder |])
+               ]
 
--- |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, _) -> t
-                      _              -> error ("Unparsable MIME Type: " ++ str)
+-- |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
+              _      ← char '/'
+              sub    ← A.toCIAscii <$> token
+              params ← mimeParams
+              return $ MIMEType media sub params
 
-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)
-
-mimeTypeListP :: Parser [MIMEType]
-mimeTypeListP = allowEOF $! listOf mimeTypeP
+-- |'Parser' for a list of 'MIMEType's.
+mimeTypeList ∷ Parser [MIMEType]
+{-# INLINE mimeTypeList #-}
+mimeTypeList = listOf mimeType