Merge branch 'strip-header'

src/Models.hs

@@ -6,10 +6,12 @@ import Control.Monad
 import Control.Monad.State
 
 import qualified Data.Map as M
+import Data.Maybe
 import qualified Data.Set as S
 import Data.Time
 
 import Text.Pandoc hiding (Meta, readers)
+import Text.Pandoc.Walk
 
 import Language
 import Utils
@@ -114,3 +116,29 @@ allLanguages app = S.union articleLangs metaLangs
           allContentLangs = S.unions . map contentLangs
           contentLangs :: HasContent a => a -> S.Set Language
           contentLangs = S.fromList . M.keys . getContent
+
+langTitle :: HasContent a => LanguagePreference -> a -> String
+langTitle lang = fromMaybe "untitled" . listToMaybe . query extractTitle . langContent lang
+    where extractTitle (Header _ _ title) = [inlineToStr title]
+          extractTitle _ = []
+
+-- TODO: Might be a better way to do this in Pandoc
+inlineToStr :: [Inline] -> String
+inlineToStr inline = writePlain def $ Pandoc undefined [Plain inline]
+
+stripTitle :: Pandoc -> Pandoc
+stripTitle (Pandoc meta blocks) = Pandoc meta blocks'
+    where blocks' = catMaybes $ evalState (mapM stripFirst blocks) True
+          stripFirst :: Block -> State Bool (Maybe Block)
+          stripFirst block = do
+              isFirst <- get
+              if isFirst
+                  then case block of
+                      Header _ _ _ -> do
+                          put False
+                          return Nothing
+                      _ -> return $ Just block
+                  else return $ Just block
+
+langContent :: HasContent a => LanguagePreference -> a -> Pandoc
+langContent lang = fromJust . matchLanguage lang . getContent

src/Views.hs

@@ -95,18 +95,6 @@ metaDisplay :: (MonadRoute m, URL m ~ Sitemap, MonadState AppState m, MonadPlus
 metaDisplay lang meta = template lang $
     mkPage (Just $ langTitle lang meta) $(hamletFile "templates/meta.hamlet")
 
-langTitle :: HasContent a => LanguagePreference -> a -> String
-langTitle lang = fromMaybe "untitled" . listToMaybe . query extractTitle . langContent lang
-    where extractTitle (Header _ _ title) = [inlineToStr title]
-          extractTitle _ = []
-
--- TODO: Might be a better way to do this in Pandoc
-inlineToStr :: [Inline] -> String
-inlineToStr inline = writePlain def $ Pandoc undefined [Plain inline]
-
-langContent :: HasContent a => LanguagePreference -> a -> Pandoc
-langContent lang = fromJust . matchLanguage lang . getContent
-
 -- Generate a link to some content
 linkTo :: (Linkable a, MonadRoute m, URL m ~ Sitemap)
        => a

src/Views/Feed.hs

@@ -47,7 +47,7 @@ articleEntry lang article = do
     articleLink <- linkTo article
     authorName <- getLangString lpref "authorName"
     let entry = nullEntry articleLink (TextString $ langTitle lpref article) (atomDate $ arAuthored article)
-    let content = renderMarkup $ writeHtml def $ langContent lpref article
+    let content = renderMarkup $ writeHtml def $ stripTitle $ langContent lpref article
     return entry { entryContent = Just $ HTMLContent content
                  , entryLinks = [nullLink articleLink]
                  , entryAuthors = [nullPerson { personName = authorName }]

testsuite/Arbitrary.hs

@@ -4,17 +4,13 @@ module Arbitrary where
 
 import Prelude hiding (LT)
 
-import Control.Applicative
-
 import Data.DeriveTH
 import Data.LanguageCodes
 import qualified Data.Map as M
 import Data.Time
 
 import Text.Pandoc
 
-import Language
-
 import Test.Framework
 
 instance (Ord k, Arbitrary k, Arbitrary v) => Arbitrary (M.Map k v) where

testsuite/Integration/TestRSS.hs

@@ -38,3 +38,6 @@ test_home = do
     let entry1 = head entries
     assertEqual ["Author Name"]
         $ map personName $ entryAuthors entry1
+    let Just (HTMLContent content) = entryContent entry1
+    assertEqual "<p>This article should appear above the first one.</p>"
+        $ content