Merge branch 'nested-rules'

1 files changed, 21 insertions, 25 deletions

diff --git a/examples/simpleblog/hakyll.hs b/examples/simpleblog/hakyll.hs
index db4230f..270c3e3 100644
--- a/examples/simpleblog/hakyll.hs
+++ b/examples/simpleblog/hakyll.hs
@@ -11,42 +11,38 @@ import Hakyll
 main :: IO ()
 main = hakyll $ do
     -- Compress CSS
-    route   "css/*" idRoute
-    compile "css/*" compressCssCompiler
+    match "css/*" $ do
+        route   idRoute
+        compile compressCssCompiler
 
     -- Render posts
-    route   "posts/*" $ setExtension ".html"
-    compile "posts/*" $
-        pageCompiler
+    match "posts/*" $ do
+        route   $ setExtension ".html"
+        compile $ 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
+    match "posts.html" $ route 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
+    match "index.html" $ route 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
 
     -- Read templates
-    compile "templates/*" templateCompiler
-
-    -- End
-    return ()
+    match "templates/*" $ compile templateCompiler
 
 -- | Auxiliary compiler: generate a post list from a list of given posts, and
 -- add it to the current page under @$posts@