Implemented makeDraft and others

[Rakka.git] / Rakka / Page.hs

diff --git a/Rakka/Page.hs b/Rakka/Page.hs
index 380d4a5d2a3967eb08c875916a165be0945223da..ff1c0ac8a0140fab0cc77c599b556a3ccc73ef80 100644 (file)
--- a/Rakka/Page.hs
+++ b/Rakka/Page.hs
@@ -10,6 +10,7 @@ module Rakka.Page
     , mkPageFragmentURI
     , mkObjectURI
     , mkAuxiliaryURI
+    , mkRakkaURI
     )
     where
 
@@ -47,7 +48,7 @@ data Page
       , pageIsLocked  :: !Bool
       , pageIsBoring  :: !Bool
       , pageIsBinary  :: !Bool
-      , pageRevision  :: !(Maybe RevNum)
+      , pageRevision  :: !RevNum
       , pageLastMod   :: !CalendarTime
       , pageSummary   :: !(Maybe String)
       , pageOtherLang :: !(Map LanguageTag PageName)
@@ -61,6 +62,8 @@ encodePageName = escapeURIString isSafe . C8.unpack . encode UTF8
     where
       isSafe :: Char -> Bool
       isSafe c
+          | c == '/'             = True
+          | isReserved c         = False
           | c >= ' ' && c <= '~' = True
           | otherwise            = False
 
@@ -95,3 +98,13 @@ mkAuxiliaryURI baseURI basePath name
     = baseURI {
         uriPath = foldl combine "/" ([uriPath baseURI] ++ basePath ++ [encodePageName name])
       }
+
+
+mkRakkaURI :: PageName -> URI
+mkRakkaURI name = URI {
+                    uriScheme    = "rakka:"
+                  , uriAuthority = Nothing
+                  , uriPath      = encodePageName name
+                  , uriQuery     = ""
+                  , uriFragment  = ""
+                  }