11 files changed, 142 insertions, 109 deletions
diff --git a/examples/feedblog/hakyll.hs b/examples/feedblog/hakyll.hs
index e261c0e..e10af10 100644
--- a/examples/feedblog/hakyll.hs
+++ b/examples/feedblog/hakyll.hs
@@ -1,49 +1,72 @@
+{-# LANGUAGE OverloadedStrings #-}
 module Main where
 
-import Control.Arrow ((>>>))
-import Text.Hakyll (hakyll)
-import Text.Hakyll.Render
-import Text.Hakyll.Context
-import Text.Hakyll.File (getRecursiveContents, directory)
-import Text.Hakyll.CreateContext (createPage, createCustomPage, createListing)
-import Text.Hakyll.ContextManipulations (copyValue)
-import Text.Hakyll.Feed (FeedConfiguration (..), renderRss)
-import Data.List (sort)
-import Control.Monad (forM_, liftM)
-import Control.Monad.Reader (liftIO)
-import Data.Either (Either(..))
-
-main = hakyll "http://example.com" $ do
-    -- Static directory.
-    directory css "css"
-
-    -- Find all post paths.
-    postPaths <- liftM (reverse . sort) $ getRecursiveContents "posts"
-    let postPages = map createPage postPaths
-
-    -- Render index, including recent posts.
-    let index = createListing "index.html" ["templates/postitem.html"]
-                              (take 3 postPages) [("title", Left "Home")]
-    renderChain ["index.html", "templates/default.html"] index
-
-    -- Render all posts list.
-    let posts = createListing "posts.html" ["templates/postitem.html"]
-                              postPages [("title", Left "All posts")]
-    renderChain ["posts.html", "templates/default.html"] posts
-
-    -- Render all posts.
-    liftIO $ putStrLn "Generating posts..."
-    forM_ postPages $ renderChain [ "templates/post.html"
-                                  , "templates/default.html"
-                                  ]
-
-    -- Render RSS feed.
-    renderRss myFeedConfiguration $
-        map (>>> copyValue "body" "description") (take 3 postPages)
-
-myFeedConfiguration = FeedConfiguration
-    { feedUrl         = "rss.xml"
-    , feedTitle       = "SimpleBlog RSS feed."
+import Prelude hiding (id)
+import Control.Category (id)
+import Control.Arrow ((>>>), (***), arr)
+import Data.Monoid (mempty, mconcat)
+
+import Hakyll
+
+main :: IO ()
+main = hakyll $ do
+    -- Compress CSS
+    route   "css/*" idRoute
+    compile "css/*" compressCssCompiler
+
+    -- Render posts
+    route   "posts/*" $ setExtension ".html"
+    compile "posts/*" $
+        pageCompiler
+            >>> applyTemplateCompiler "templates/post.html"
+            >>> applyTemplateCompiler "templates/default.html"
+            >>> relativizeUrlsCompiler
+
+    -- Render posts list
+    route  "posts.html" $ idRoute
+    create "posts.html" $
+        constA mempty
+            >>> arr (setField "title" "All posts")
+            >>> requireAllA "posts/*" addPostList
+            >>> applyTemplateCompiler "templates/posts.html"
+            >>> applyTemplateCompiler "templates/default.html"
+            >>> relativizeUrlsCompiler
+
+    -- Index
+    route  "index.html" $ idRoute
+    create "index.html" $
+        constA mempty
+            >>> arr (setField "title" "Home")
+            >>> requireAllA "posts/*" (id *** arr (take 3 . reverse . sortByBaseName) >>> addPostList)
+            >>> applyTemplateCompiler "templates/index.html"
+            >>> applyTemplateCompiler "templates/default.html"
+            >>> relativizeUrlsCompiler
+
+    -- Render RSS feed
+    route  "rss.xml" $ idRoute
+    create "rss.xml" $
+        requireAll_ "posts/*" >>> renderRss feedConfiguration
+
+    -- Read templates
+    compile "templates/*" templateCompiler
+
+    -- End
+    return ()
+
+-- | Auxiliary compiler: generate a post list from a list of given posts, and
+-- add it to the current page under @$posts@
+--
+addPostList :: Compiler (Page String, [Page String]) (Page String)
+addPostList = setFieldA "posts" $
+    arr (reverse . sortByBaseName)
+        >>> require "templates/postitem.html" (\p t -> map (applyTemplate t) p)
+        >>> arr mconcat
+        >>> arr pageBody
+
+feedConfiguration :: FeedConfiguration
+feedConfiguration = FeedConfiguration
+    { feedTitle       = "SimpleBlog RSS feed."
     , feedDescription = "A simple demo of an RSS feed created with Hakyll."
     , feedAuthorName  = "Jasper Van der Jeugt"
+    , feedRoot        = "http://example.com"
     }
diff --git a/examples/feedblog/posts/2009-11-05-a-first-post.markdown b/examples/feedblog/posts/2009-11-05-a-first-post.markdown
index 56b0405..7351eb4 100644
--- a/examples/feedblog/posts/2009-11-05-a-first-post.markdown
+++ b/examples/feedblog/posts/2009-11-05-a-first-post.markdown
@@ -2,20 +2,22 @@
 title: A first post
 author: Julius Caesar
 date: November 5, 2009
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit.
 ---
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus pretium leo 
-adipiscing lectus iaculis lobortis. Vivamus scelerisque velit dignissim metus 
-gravida sit amet dapibus ligula tempor. Quisque sit amet viverra nunc. 
-Suspendisse cursus elementum ante, ut venenatis nisi dictum eu. Nulla diam 
-ligula, eleifend in varius quis, malesuada a nibh. Vivamus consequat 
-pellentesque erat non blandit. Nunc sit amet eros vel massa semper ullamcorper 
-quis iaculis magna. Vestibulum ullamcorper urna sit amet est elementum 
-pulvinar. Vestibulum consequat lacus ac quam hendrerit tincidunt. Praesent 
-bibendum vehicula diam, nec sagittis risus tempus a. Nulla quis odio sit amet 
-odio vehicula cursus ut id odio. Curabitur semper magna euismod magna mollis 
-venenatis. Nunc eget eleifend velit. Mauris sed posuere sem. Fusce id nunc 
-nisi, a aliquam orci. Suspendisse laoreet justo non enim laoreet eget consequat 
-velit porttitor. Aenean faucibus sodales metus at tincidunt. Donec vestibulum 
-leo pulvinar erat auctor ac ultrices massa euismod. Phasellus blandit cursus 
-magna, eget lacinia mi lobortis sed. Suspendisse ultricies enim ligula, vel 
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus pretium leo
+adipiscing lectus iaculis lobortis. Vivamus scelerisque velit dignissim metus
+gravida sit amet dapibus ligula tempor. Quisque sit amet viverra nunc.
+Suspendisse cursus elementum ante, ut venenatis nisi dictum eu. Nulla diam
+ligula, eleifend in varius quis, malesuada a nibh. Vivamus consequat
+pellentesque erat non blandit. Nunc sit amet eros vel massa semper ullamcorper
+quis iaculis magna. Vestibulum ullamcorper urna sit amet est elementum
+pulvinar. Vestibulum consequat lacus ac quam hendrerit tincidunt. Praesent
+bibendum vehicula diam, nec sagittis risus tempus a. Nulla quis odio sit amet
+odio vehicula cursus ut id odio. Curabitur semper magna euismod magna mollis
+venenatis. Nunc eget eleifend velit. Mauris sed posuere sem. Fusce id nunc
+nisi, a aliquam orci. Suspendisse laoreet justo non enim laoreet eget consequat
+velit porttitor. Aenean faucibus sodales metus at tincidunt. Donec vestibulum
+leo pulvinar erat auctor ac ultrices massa euismod. Phasellus blandit cursus
+magna, eget lacinia mi lobortis sed. Suspendisse ultricies enim ligula, vel
 scelerisque mauris.
diff --git a/examples/feedblog/posts/2009-11-10-another-post.markdown b/examples/feedblog/posts/2009-11-10-another-post.markdown
index 69b64c9..c4e07b6 100644
--- a/examples/feedblog/posts/2009-11-10-another-post.markdown
+++ b/examples/feedblog/posts/2009-11-10-another-post.markdown
@@ -2,14 +2,16 @@
 title: Another post
 author: Marcus Tullius Cicero
 date: November 10, 2009
+description: Vestibulum in ultrices urna. Etiam tempor enim dui, nec malesuada elit.
 ---
-Vestibulum in ultrices urna. Etiam tempor enim dui, nec malesuada elit. Donec 
-tempor ligula et quam volutpat quis fermentum eros congue. Sed ut pulvinar sem. 
-Sed aliquam ipsum id purus sollicitudin vulputate. Cras et mauris dui, vel 
-hendrerit leo. Ut metus ipsum, fermentum ac malesuada id, tempus pharetra quam. 
-Donec diam felis, consequat ac scelerisque cursus, gravida non lectus. Sed 
-faucibus elit dapibus diam elementum id varius nisi tristique. Proin consequat 
-faucibus neque in aliquam. Vestibulum ligula odio, pulvinar vel hendrerit 
-vitae, egestas ut nibh. Praesent ut velit elit, in consequat dolor. Praesent 
-sem enim, commodo in gravida sed, adipiscing vel eros. Lorem ipsum dolor sit 
+
+Vestibulum in ultrices urna. Etiam tempor enim dui, nec malesuada elit. Donec
+tempor ligula et quam volutpat quis fermentum eros congue. Sed ut pulvinar sem.
+Sed aliquam ipsum id purus sollicitudin vulputate. Cras et mauris dui, vel
+hendrerit leo. Ut metus ipsum, fermentum ac malesuada id, tempus pharetra quam.
+Donec diam felis, consequat ac scelerisque cursus, gravida non lectus. Sed
+faucibus elit dapibus diam elementum id varius nisi tristique. Proin consequat
+faucibus neque in aliquam. Vestibulum ligula odio, pulvinar vel hendrerit
+vitae, egestas ut nibh. Praesent ut velit elit, in consequat dolor. Praesent
+sem enim, commodo in gravida sed, adipiscing vel eros. Lorem ipsum dolor sit
 amet, consectetur adipiscing elit. Proin non aliquam nunc.
diff --git a/examples/feedblog/posts/2009-11-28-a-third-post.markdown b/examples/feedblog/posts/2009-11-28-a-third-post.markdown
index 76b0606..b7df45d 100644
--- a/examples/feedblog/posts/2009-11-28-a-third-post.markdown
+++ b/examples/feedblog/posts/2009-11-28-a-third-post.markdown
@@ -2,18 +2,20 @@
 title: A third post
 author: Publius Ovidius Naso
 date: November 28, 2009
+description: Pellentesque tempor blandit elit, vel ultricies arcu congue egestas.
 ---
-Pellentesque tempor blandit elit, vel ultricies arcu congue egestas. Fusce 
-vitae rutrum nisl. Fusce id mauris libero, a venenatis tellus. Fusce iaculis, 
-lorem et ornare molestie, mauris risus mollis nisi, non fermentum lacus lacus 
-sit amet ipsum. Praesent lobortis ullamcorper dolor, eget convallis ligula 
-dignissim a. Suspendisse nulla nisi, congue et pharetra vel, convallis non 
-libero. Ut a nulla ipsum. Phasellus cursus velit id neque viverra ut 
-pellentesque justo posuere. Curabitur laoreet enim et velit tempor consectetur. 
-Donec eu pretium urna. Suspendisse vitae nisi at metus vestibulum aliquam in 
-sit amet nisl. Donec convallis lacinia odio, vestibulum molestie nunc feugiat 
-a. Suspendisse vehicula, sapien id aliquet consectetur, sem sapien ullamcorper 
-arcu, scelerisque porttitor elit ipsum posuere ligula. Nulla at velit eu metus 
-tincidunt auctor ut sit amet enim. Donec placerat dapibus nisi id facilisis. 
-Maecenas pellentesque pulvinar auctor. Curabitur gravida quam sit amet purus 
+
+Pellentesque tempor blandit elit, vel ultricies arcu congue egestas. Fusce
+vitae rutrum nisl. Fusce id mauris libero, a venenatis tellus. Fusce iaculis,
+lorem et ornare molestie, mauris risus mollis nisi, non fermentum lacus lacus
+sit amet ipsum. Praesent lobortis ullamcorper dolor, eget convallis ligula
+dignissim a. Suspendisse nulla nisi, congue et pharetra vel, convallis non
+libero. Ut a nulla ipsum. Phasellus cursus velit id neque viverra ut
+pellentesque justo posuere. Curabitur laoreet enim et velit tempor consectetur.
+Donec eu pretium urna. Suspendisse vitae nisi at metus vestibulum aliquam in
+sit amet nisl. Donec convallis lacinia odio, vestibulum molestie nunc feugiat
+a. Suspendisse vehicula, sapien id aliquet consectetur, sem sapien ullamcorper
+arcu, scelerisque porttitor elit ipsum posuere ligula. Nulla at velit eu metus
+tincidunt auctor ut sit amet enim. Donec placerat dapibus nisi id facilisis.
+Maecenas pellentesque pulvinar auctor. Curabitur gravida quam sit amet purus
 consectetur blandit.
diff --git a/examples/feedblog/posts/2009-12-04-this-blog-aint-dead.markdown b/examples/feedblog/posts/2009-12-04-this-blog-aint-dead.markdown
index 015ce8d..17de991 100644
--- a/examples/feedblog/posts/2009-12-04-this-blog-aint-dead.markdown
+++ b/examples/feedblog/posts/2009-12-04-this-blog-aint-dead.markdown
@@ -2,11 +2,13 @@
 title: This blog ain't dead
 author: Marcus Antonius
 date: December 4, 2009
+description: Etiam non felis aliquet tellus dictum vestibulum.
 ---
-Etiam non felis aliquet tellus dictum vestibulum. Aliquam accumsan mauris non 
-lacus ultricies nec lacinia enim rhoncus. Curabitur vel tortor massa, elementum 
-tincidunt elit. Maecenas venenatis luctus arcu ut ullamcorper. Donec interdum 
-dolor eu enim tristique vel vehicula risus mollis. Nunc nec tortor quam. Nulla 
-a mauris arcu. Phasellus venenatis tortor vel odio tincidunt consequat. Integer 
-venenatis nibh vitae lectus laoreet eu feugiat nunc pretium. Integer nec turpis 
+
+Etiam non felis aliquet tellus dictum vestibulum. Aliquam accumsan mauris non
+lacus ultricies nec lacinia enim rhoncus. Curabitur vel tortor massa, elementum
+tincidunt elit. Maecenas venenatis luctus arcu ut ullamcorper. Donec interdum
+dolor eu enim tristique vel vehicula risus mollis. Nunc nec tortor quam. Nulla
+a mauris arcu. Phasellus venenatis tortor vel odio tincidunt consequat. Integer
+venenatis nibh vitae lectus laoreet eu feugiat nunc pretium. Integer nec turpis
 metus, in fermentum lorem.
diff --git a/examples/feedblog/posts/2009-12-23-almost-christmas.markdown b/examples/feedblog/posts/2009-12-23-almost-christmas.markdown
index cf24399..214f147 100644
--- a/examples/feedblog/posts/2009-12-23-almost-christmas.markdown
+++ b/examples/feedblog/posts/2009-12-23-almost-christmas.markdown
@@ -2,12 +2,14 @@
 title: Almost Christmas!
 author: Publius Vergilius Maro
 date: December 23, 2009
+description: Morbi tincidunt eleifend ante, eu gravida ante rutrum vel.
 ---
-Morbi tincidunt eleifend ante, eu gravida ante rutrum vel. Nunc bibendum nulla 
-tellus, eget egestas sapien. Nam rhoncus interdum libero, eget congue orci 
-imperdiet eu. Quisque pellentesque fringilla urna, ac venenatis ante ultricies 
-et. Pellentesque habitant morbi tristique senectus et netus et malesuada fames 
-ac turpis egestas. Mauris eleifend sagittis ultrices. Quisque ultrices accumsan 
-nisl, sed pellentesque metus porta vitae. Nulla facilisi. In et nibh tincidunt 
-mi volutpat pellentesque vitae nec sapien. Integer massa ipsum, pellentesque in 
+
+Morbi tincidunt eleifend ante, eu gravida ante rutrum vel. Nunc bibendum nulla
+tellus, eget egestas sapien. Nam rhoncus interdum libero, eget congue orci
+imperdiet eu. Quisque pellentesque fringilla urna, ac venenatis ante ultricies
+et. Pellentesque habitant morbi tristique senectus et netus et malesuada fames
+ac turpis egestas. Mauris eleifend sagittis ultrices. Quisque ultrices accumsan
+nisl, sed pellentesque metus porta vitae. Nulla facilisi. In et nibh tincidunt
+mi volutpat pellentesque vitae nec sapien. Integer massa ipsum, pellentesque in
 elementum at, cursus sit amet diam.
diff --git a/examples/feedblog/templates/default.html b/examples/feedblog/templates/default.html
index 1772458..b7a3c1e 100644
--- a/examples/feedblog/templates/default.html
+++ b/examples/feedblog/templates/default.html
@@ -4,20 +4,20 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>SimpleBlog - $title</title>
-        <link rel="stylesheet" type="text/css" href="$root/css/default.css" />
+        <title>SimpleBlog - $title$</title>
+        <link rel="stylesheet" type="text/css" href="/css/default.css" />
         <link rel="alternate"
               type="application/rss+xml"
               title="SimpleBlog"
-              href="$root/rss.xml" />
+              href="/rss.xml" />
     </head>
     <body>
-        <h1>SimpleBlog - $title</h1>
+        <h1>SimpleBlog - $title$</h1>
         <div id="navigation">
-            <a href="$root/index.html">Home</a>
-            <a href="$root/posts.html">All posts</a>
+            <a href="/index.html">Home</a>
+            <a href="/posts.html">All posts</a>
         </div>
 
-        $body
+        $body$
     </body>
 </html>
diff --git a/examples/feedblog/index.html b/examples/feedblog/templates/index.html
index 88cc0a2..f20adb1 100644
--- a/examples/feedblog/index.html
+++ b/examples/feedblog/templates/index.html
@@ -1,9 +1,9 @@
 <div id="posts">
     <h1>Recent posts</h1>
     <ul>
-        $body
+        $posts$
     </ul>
-    <a href="$root/posts.html">All posts...</a>
+    <p><a href="/posts.html">All posts&hellip;</a></p>
 </div>
 
 <div class="about">
diff --git a/examples/feedblog/templates/post.html b/examples/feedblog/templates/post.html
index 46797a4..e2864ba 100644
--- a/examples/feedblog/templates/post.html
+++ b/examples/feedblog/templates/post.html
@@ -1,4 +1,4 @@
-<h1>$title</h1>
-by <em>$author</em> on <strong>$date</strong>
+<h1>$title$</h1>
+by <em>$author$</em> on <strong>$date$</strong>
 
-$body
+$body$
diff --git a/examples/feedblog/templates/postitem.html b/examples/feedblog/templates/postitem.html
index 0e62418..b752d96 100644
--- a/examples/feedblog/templates/postitem.html
+++ b/examples/feedblog/templates/postitem.html
@@ -1,4 +1,4 @@
 <li>
-    <a href="$root/$url">$title</a>
-    - <em>$date</em> - by <em>$author</em>
+    <a href="/$url">$title$</a>
+    - <em>$date$</em> - by <em>$author$</em>
 </li>
diff --git a/examples/feedblog/posts.html b/examples/feedblog/templates/posts.html
index 7db1a59..2bec161 100644
--- a/examples/feedblog/posts.html
+++ b/examples/feedblog/templates/posts.html
@@ -1,4 +1,4 @@
 <h1>All posts</h1>
 <ul>
-    $body
+    $posts$
 </ul>