git.iko.soy/hakyll
on master help sign in
Merged CustomPage and RenderableFilePath into one file.
commit333c19d0c1d88ea35e3e811c2100b514ffe738c1 authorJasper Van der Jeugt <jaspervdj@gmail.com> dateSat 12 Dec 2009, 14:48 (17 years ago) parentd988921
3 files changed+18−20
compare with master
unifiedsplit
hakyll.cabal+1−2 src/Text/Hakyll/RenderableFilePath.hs−16 src/Text/Hakyll/CustomPage.hs → src/Text/Hakyll/Renderables.hs+17−2
hakyll.cabal+1−2
@@ -22,7 +22,6 @@ library
2222 pandoc >= 1
2323 exposed-modules: Text.Hakyll.Render
2424 Text.Hakyll.Renderable
25+ Text.Hakyll.Renderables
2526 Text.Hakyll.Page
26− Text.Hakyll.CustomPage
27− Text.Hakyll.RenderableFilePath
2827 Text.Hakyll.Util
src/Text/Hakyll/RenderableFilePath.hsdeleted−16
@@ -1,16 +0,0 @@
1−module Text.Hakyll.RenderableFilePath
2− ( RenderableFilePath (..)
3− ) where
4−
5−import System.FilePath
6−import Text.Hakyll.Renderable
7−import Text.Hakyll.Util
8−import Text.Hakyll.Page
9−
10−newtype RenderableFilePath = RenderableFilePath FilePath
11−
12−-- We can render filepaths
13−instance Renderable RenderableFilePath where
14− getDependencies (RenderableFilePath path) = return path
15− getURL (RenderableFilePath path) = toURL path
16− toContext (RenderableFilePath path) = readPage path >>= toContext
src/Text/Hakyll/CustomPage.hs → src/Text/Hakyll/Renderables.hsrenamed+17−2
@@ -1,12 +1,16 @@
1−module Text.Hakyll.CustomPage
1+module Text.Hakyll.Renderables
22 ( CustomPage,
3− createCustomPage
3+ createCustomPage,
4+ PagePath,
5+ createPagePath
46 ) where
57
68import System.FilePath
79import qualified Data.ByteString.Lazy.Char8 as B
810import qualified Data.Map as M
911import Control.Monad
12+import Text.Hakyll.Util
13+import Text.Hakyll.Page
1014import Text.Hakyll.Renderable
1115
1216data CustomPage = CustomPage { url :: String,
@@ -27,3 +31,14 @@ instance Renderable CustomPage where
2731 values <- mapM (either (return . B.pack) (>>= return) . snd) (mapping page)
2832 let keys = map (B.pack . fst) (mapping page)
2933 return $ M.fromList $ (B.pack "url", B.pack $ url page) : zip keys values
34+
35+data PagePath = PagePath FilePath
36+
37+createPagePath :: FilePath -> PagePath
38+createPagePath = PagePath
39+
40+-- We can render filepaths
41+instance Renderable PagePath where
42+ getDependencies (PagePath path) = return path
43+ getURL (PagePath path) = toURL path
44+ toContext (PagePath path) = readPage path >>= toContext