X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FResource.hs;h=8448ea11d137d53dae3866bdd4ea9f11994602ba;hb=ed76b2142889f565bb226bd72c0ff862ff6e862a;hp=c79b215cfe5fb5e1bce74101982c18ee3cc7922c;hpb=03585f9c5773f6c0b59497f4f563909576c402b5;p=Rakka.git

diff --git a/Rakka/Resource.hs b/Rakka/Resource.hs
index c79b215..8448ea1 100644
--- a/Rakka/Resource.hs
+++ b/Rakka/Resource.hs
@@ -1,5 +1,7 @@
 module Rakka.Resource
     ( runIdempotentA
+    , runXmlA
+    , getEntityType
     , outputXmlPage
     )
     where
@@ -10,18 +12,26 @@ import           Control.Monad
 import           Control.Monad.Trans
 import           Network.HTTP.Lucu
 import           Network.HTTP.Lucu.Utils
-import           Network.URI
+import           Network.URI hiding (path)
+import           Rakka.Environment
+import           Rakka.Validation
+import           System.Log.Logger
+import           Text.XML.HXT.Arrow.ReadDocument
 import           Text.XML.HXT.Arrow.WriteDocument
 import           Text.XML.HXT.Arrow.XmlIOStateArrow
 import           Text.XML.HXT.DOM.TypeDefs
 import           Text.XML.HXT.DOM.XmlKeywords
 
 
--- /         ==> /
--- /foo      ==> /foo.html
--- /foo/     ==> /foo.html
--- /foo.bar/ ==> /foo.bar
--- /foo.bar  ==> /foo.bar
+logger :: String
+logger = "Rakka.Resource"
+
+
+-- "/"         ==> "/"
+-- "/foo"      ==> "/foo.html"
+-- "/foo/"     ==> "/foo.html"
+-- "/foo.bar/" ==> "/foo.bar"
+-- "/foo.bar"  ==> "/foo.bar"
 canonicalizeURI :: Resource ()
 canonicalizeURI 
     = do uri <- getRequestURI
@@ -52,6 +62,59 @@ runIdempotentA a
          rsrc
 
 
+runXmlA :: Environment -> FilePath -> IOSArrow XmlTree (Resource c) -> Resource c
+runXmlA env schemaPath a
+    = do inputA <- getInputXmlA env schemaPath
+         [rsrc] <- liftIO $ runX ( inputA
+                                   >>>
+                                   setErrorMsgHandler False fail
+                                   >>>
+                                   a
+                                 )
+         rsrc
+
+
+-- well-formed でない時は 400 Bad Request になり、valid でない時は 422
+-- Unprocessable Entity になる。入力の型が XML でない時は 415
+-- Unsupported Media Type を返す。
+getInputXmlA :: Environment -> FilePath -> Resource (IOSArrow b XmlTree)
+getInputXmlA env schemaPath
+    = do reader    <- getInputReader
+         validator <- getValidator env schemaPath
+         return ( setErrorMsgHandler False (abort BadRequest [] . Just)
+                  >>>
+                  reader
+                  >>>
+                  setErrorMsgHandler False (abort UnprocessableEntitiy [] . Just)
+                  >>>
+                  validator
+                )
+
+
+getInputReader :: Resource (IOSArrow b XmlTree)
+getInputReader 
+    = do mimeType <- getContentType
+         case mimeType of
+           Nothing
+               -> getFailingReader BadRequest [] (Just "Missing Content-Type")
+           Just (MIMEType "text" "xml" _)
+               -> getXmlReader
+           Just (MIMEType "application" "xml" _)
+               -> getXmlReader
+           Just t
+               -> getFailingReader UnsupportedMediaType [] (Just $ "Unsupported media type: " ++ show t)
+    where
+      getXmlReader
+          = do req <- input defaultLimit
+               liftIO $ debugM logger req
+               return $ readString [ (a_validate         , v_0)
+                                   , (a_check_namespaces , v_1)
+                                   , (a_remove_whitespace, v_0)
+                                   ] req
+      getFailingReader code headers msg
+          = return $ proc _ -> abortA -< (code, (headers, msg))
+
+
 getEntityType :: Resource MIMEType
 getEntityType
     = do uri <- getRequestURI
@@ -70,10 +133,10 @@ outputXmlPage :: XmlTree -> IOSArrow XmlTree XmlTree -> Resource ()
 outputXmlPage tree toXHTML
     = do mType <- getEntityType
          setContentType mType
-         let formatter = if mType == read "text/xml" then
-                             this
-                         else
-                             toXHTML
+         let formatter = case mType of
+                           MIMEType "application" "xhtml+xml" _ -> toXHTML
+                           MIMEType "text"        "xml"       _ -> this
+                           _                                    -> undefined
          [resultStr] <- liftIO $ runX ( setErrorMsgHandler False fail
                                         >>>
                                         constA tree