Still working on Rakka.Utils...

[Rakka.git] / Rakka / Page.hs

diff --git a/Rakka/Page.hs b/Rakka/Page.hs
index a9dbe4ff2967c9b83909b8d831fbfcfeba57fd50..24f037bc4a31096cd9f7c60b527062fce3dda1e9 100644 (file)
--- a/Rakka/Page.hs
+++ b/Rakka/Page.hs
@@ -1,3 +1,8 @@
+-- -*- coding: utf-8 -*-
+{-# LANGUAGE
+    Arrows
+  , UnicodeSyntax
+  #-}
 module Rakka.Page
     ( PageName
     , Page(..)
@@ -12,7 +17,6 @@ module Rakka.Page
     , pageUpdateInfo
     , pageRevision
 
-    , isSafeChar
     , encodePageName
     , decodePageName
 
@@ -28,35 +32,31 @@ module Rakka.Page
     , parseXmlizedPage
     )
     where
-
-import qualified Codec.Binary.UTF8.String as UTF8
-import           Control.Arrow
-import           Control.Arrow.ArrowIO
-import           Control.Arrow.ArrowList
+import Control.Arrow
+import qualified Data.Ascii as Ascii
+import qualified Data.Text as T
 import qualified Data.ByteString.Lazy as Lazy (ByteString)
 import qualified Data.ByteString.Lazy as L hiding (ByteString)
 import qualified Data.ByteString.Lazy.Char8 as L8 hiding (ByteString)
-import           Data.Char
-import           Data.Map (Map)
+import Data.Char
+import Data.Map (Map)
 import qualified Data.Map as M
-import           Data.Maybe
-import           Data.Time
-import           Network.HTTP.Lucu hiding (redirect)
-import           Network.URI hiding (fragment)
-import           OpenSSL.EVP.Base64
-import           Rakka.Utils
-import           Rakka.W3CDateTime
-import           Subversion.Types
-import           System.FilePath.Posix
-import           Text.XML.HXT.Arrow.XmlArrow
-import           Text.XML.HXT.Arrow.XmlNodeSet
-import           Text.XML.HXT.DOM.TypeDefs
-
+import Data.Time
+import qualified Data.Time.W3C as W3C
+import Network.HTTP.Lucu hiding (redirect)
+import Network.URI hiding (fragment)
+import Rakka.Utils
+import Subversion.Types
+import System.FilePath.Posix
+import Text.XML.HXT.DOM.TypeDefs
+import Text.XML.HXT.XPath
+import Text.XML.HXT.Arrow.XmlArrow
+import Prelude.Unicode
 
-type PageName = String
+type PageName = T.Text
 
-type LanguageTag  = String -- See RFC 3066: http://www.ietf.org/rfc/rfc3066.txt
-type LanguageName = String -- i.e. "日本語"
+type LanguageTag  = Ascii -- See RFC 3066: http://www.ietf.org/rfc/rfc3066.txt
+type LanguageName = T.Text -- i.e. "日本語"
 
 
 data Page
@@ -133,15 +133,6 @@ encodePageName = escapeURIString isSafeChar . UTF8.encodeString . fixPageName
       fixPageName = (\ (x:xs) -> toUpper x : xs) . map (\ c -> if c == ' ' then '_' else c)
 
 
-isSafeChar :: Char -> Bool
-isSafeChar c
-    | c == '/'            = True
-    | isReserved c        = False
-    | c > ' ' && c <= '~' = True
-    | otherwise           = False
-
-
--- URI unescape して UTF-8 から decode する。
 decodePageName :: FilePath -> PageName
 decodePageName = UTF8.decodeString . unEscapeString
 
@@ -252,7 +243,7 @@ xmlizePage
                        += sattr "redirect" (redirDest page)
                        += sattr "isLocked" (yesOrNo $ redirIsLocked page)
                        += sattr "revision" (show $ redirRevision page)
-                       += sattr "lastModified" (formatW3CDateTime lastMod)
+                       += sattr "lastModified" (W3C.format lastMod)
                      )) -<< ()
 
       xmlizeEntity :: (ArrowXml a, ArrowChoice a, ArrowIO a) => a Page XmlTree
@@ -278,7 +269,7 @@ xmlizePage
                        += sattr "isLocked" (yesOrNo $ entityIsLocked page)
                        += sattr "isBinary" (yesOrNo $ entityIsBinary page)
                        += sattr "revision" (show $ entityRevision page)
-                       += sattr "lastModified" (formatW3CDateTime lastMod)
+                       += sattr "lastModified" (W3C.format lastMod)
                        += ( case entitySummary page of
                               Just s  -> eelem "summary" += txt s
                               Nothing -> none
@@ -381,15 +372,10 @@ parseEntity
                       , entityContent    = content
                       , entityUpdateInfo = updateInfo
                       }
-    where
-      dropWhitespace :: String -> String
-      dropWhitespace [] = []
-      dropWhitespace (x:xs)
-          | x == ' ' || x == '\t' || x == '\n'
-              = dropWhitespace xs
-          | otherwise
-              = x : dropWhitespace xs
 
+dropWhitespace :: String -> String
+{-# INLINE dropWhitespace #-}
+dropWhitespace = filter ((¬) ∘ isSpace)
 
 parseUpdateInfo :: (ArrowXml a, ArrowChoice a) => a XmlTree UpdateInfo
 parseUpdateInfo 
@@ -401,5 +387,3 @@ parseUpdateInfo
                         uiOldRevision = oldRev
                       , uiOldName     = oldName
                       }
-
-      
\ No newline at end of file