Merge branch 'article-order'

src/App.hs

@@ -4,6 +4,7 @@ module App where
 import Control.Monad.State
 
 import qualified Data.ByteString.Char8 as B
+import Data.List
 import Data.Maybe
 import qualified Data.Text as T
 import Data.Time
@@ -86,8 +87,9 @@ article date slug = do
 articleList :: (Article -> Bool) -> AppPart Response
 articleList articleFilter = do
     articles <- lift $ getFiltered articleFilter
+    let sorted = sortBy reverseCompare articles
     language <- languageHeaderM
-    articleListDisplay language articles >>= html
+    articleListDisplay language sorted >>= html
 
 meta :: String -> AppPart Response
 meta slug = do

src/Models.hs

@@ -30,6 +30,9 @@ data Article = Article { arSlug     :: String
                        }
     deriving (Eq, Show)
 
+instance Ord Article where
+    a `compare` b = (arAuthored a, arSlug a) `compare` (arAuthored b, arSlug b)
+
 data Meta = Meta { mtSlug    :: String
                  , mtContent :: LanguageContent
                  }

src/Utils.hs

@@ -35,3 +35,6 @@ isSpecial :: FilePath -> Bool
 isSpecial "." = True
 isSpecial ".." = True
 isSpecial _ = False
+
+reverseCompare :: Ord a => a -> a -> Ordering
+reverseCompare a b = compare b a

testsuite/Integration/Base.hs

@@ -40,6 +40,12 @@ assertContains needle haystack =
         (show needle ++ " not found in:\n" ++ show haystack)
         (needle `isInfixOf` haystack)
 
+assertContainsBefore :: (Eq a, Show a) => [a] -> [a] -> [a] -> Assertion
+assertContainsBefore first second haystack =
+    subAssert $ assertBoolVerbose
+        (show first ++ " does not precede " ++ show second ++ " in:\n" ++ show haystack)
+        (second `isInfixOf` (head $ dropWhile (first `isInfixOf`) $ tails haystack))
+
 -- Create a request with a specified URL
 -- Happstack doesn't make it easy
 mkRequest :: String -> IO Request

testsuite/Integration/TestHome.hs

@@ -16,6 +16,7 @@ test_home = do
     home <- testRequest req
     resp <- responseContent home
     assertContains "Test site" resp
+    assertContainsBefore "Another article" "First test article" resp
 
 test_home_lang = do
     req <- liftM (withLang1 RU) (mkRequest "/")

testsuite/Integration/content/2015-02-01-another-en.md

@@ -0,0 +1,9 @@
+---
+lang: en
+slug: second-article
+---
+
+Another article
+---------------
+
+This article should appear above the first one.