Update example & tutorials with new recentFirst

chungyc · Feb 24, 2013 · b91c8be · b91c8be
1 parent 9b60358
commit b91c8be
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/data/example/site.hs b/data/example/site.hs
@@ -1,7 +1,6 @@
 --------------------------------------------------------------------------------
 {-# LANGUAGE OverloadedStrings #-}
-import           Control.Applicative ((<$>))
-import           Data.Monoid         (mappend)
+import           Data.Monoid (mappend)
 import           Hakyll
 
 
@@ -46,7 +45,8 @@ main = hakyll $ do
     match "index.html" $ do
         route idRoute
         compile $ do
-            let indexCtx = field "posts" $ \_ -> postList (take 3 . recentFirst)
+            let indexCtx = field "posts" $ \_ ->
+                                postList $ fmap (take 3) . recentFirst
 
             getResourceBody
                 >>= applyAsTemplate indexCtx
@@ -64,9 +64,9 @@ postCtx =
 
 
 --------------------------------------------------------------------------------
-postList :: ([Item String] -> [Item String]) -> Compiler String
+postList :: ([Item String] -> Compiler [Item String]) -> Compiler String
 postList sortFilter = do
-    posts   <- sortFilter <$> loadAll "posts/*"
+    posts   <- sortFilter =<< loadAll "posts/*"
     itemTpl <- loadBody "templates/post-item.html"
     list    <- applyTemplateList itemTpl postCtx posts
     return list
diff --git a/web/site.hs b/web/site.hs
@@ -4,8 +4,9 @@ import           Control.Applicative ((<$>))
 import           Control.Arrow       (second)
 import           Control.Monad       (forM_)
 import           Data.Char           (isDigit)
-import           Data.List           (isPrefixOf, partition)
+import           Data.List           (isPrefixOf, partition, sortBy)
 import           Data.Monoid         (mappend)
+import           Data.Ord            (comparing)
 import           Hakyll
 import           System.FilePath     (dropTrailingPathSeparator, splitPath)
 import           Text.Pandoc
@@ -55,7 +56,7 @@ main = hakyllWith config $ do
             tutorials <- loadAll "tutorials/*"
             itemTpl   <- loadBody "templates/tutorial-item.html"
             let (series, articles) = partitionTutorials $
-                    chronological tutorials
+                    sortBy (comparing itemIdentifier) tutorials
 
             series'   <- applyTemplateList itemTpl defaultContext series
             articles' <- applyTemplateList itemTpl defaultContext articles

diff --git a/web/tutorials/04-compilers.markdown b/web/tutorials/04-compilers.markdown
@@ -158,18 +158,18 @@ We can reproduce a list of items in the archive using the following code:
 
 ```haskell
 compile $ do
-    posts   <- recentFirst <$> loadAll "posts/*"
+    posts   <- recentFirst =<< loadAll "posts/*"
     itemTpl <- loadBody "templates/post-item.html"
     list    <- applyTemplateList itemTpl postCtx posts
     makeItem list
 ```
 
 `recentFirst` sorts items by date. This relies on the convention that posts are
-always named `YYYY-MM-DD-title.extension` in Hakyll -- if you use some other
-format, you'll have to write some other sorting method.
+always named `YYYY-MM-DD-title.extension` in Hakyll -- or that the date must be
+present in the metadata.
 
 ```haskell
-recentFirst :: [Item a] -> [Item a]
+recentFirst :: [Item a] -> Compiler [Item a]
 ```
 
 After loading and sorting the items, we load a template for the posts.