5f8ea06 · hakyll · git.iko.soy

git.iko.soy/hakyll

on master help sign in

Added changeExtension ContextManipulation.

5f8ea06Jasper Van der Jeugt17 years ago

src/Text/Hakyll/Context.hs+15−1

compare with master

unifiedsplit

@@ -4,12 +4,13 @@ module Text.Hakyll.Context

4 , ContextManipulation

5 , renderValue

6 , renderDate

7+ , changeExtension

7 ) where

8 ) where

9import qualified Data.Map as M

10import qualified Data.Map as M

10import Data.Map (Map)

11import Data.Map (Map)

11import System.Locale (defaultTimeLocale)

12import System.Locale (defaultTimeLocale)

12−import System.FilePath (takeFileName)

13+import System.FilePath (takeFileName, addExtension, dropExtension)

13import Data.Time.Format (parseTime, formatTime)

14import Data.Time.Format (parseTime, formatTime)

14import Data.Time.Clock (UTCTime)

15import Data.Time.Clock (UTCTime)

15import Data.Maybe (fromMaybe)

16import Data.Maybe (fromMaybe)

@@ -47,3 +48,16 @@ renderDate key format defaultValue context = M.insert key value context

47 "%Y-%m-%d"

48 "%Y-%m-%d"

48 dateString :: Maybe UTCTime

49 dateString :: Maybe UTCTime

49 return $ formatTime defaultTimeLocale format time

50 return $ formatTime defaultTimeLocale format time

51+

52+-- | Change the extension of a file. This is only needed when you want to

53+-- render, for example, mardown to @.php@ files instead of @.html@ files.

54+--

55+-- > renderChainWith (changeExtension "php")

56+-- > ["templates/default.html"]

57+-- > (createPagePath "test.markdown")

58+--

59+-- Will render to @test.php@ instead of @test.html@.

60+changeExtension :: String -> ContextManipulation

61+changeExtension extension = renderValue "url" "url" changeExtension'

62+ where

63+ changeExtension' = flip addExtension extension . dropExtension

tests/Tests.hs+13−7

@@ -17,8 +17,8 @@ main = defaultMain tests

18tests = [ testGroup "Util group"

19 [ testProperty "trim length" prop_trim_length

20− , testProperty "trim id" prop_trim_id

20+ -- , testProperty "trim id" prop_trim_id

21− , testProperty "trim empty" prop_trim_empty

21+ -- , testProperty "trim empty" prop_trim_empty

22 , testCase "stripHTML 1" test_strip_html1

23 , testCase "stripHTML 2" test_strip_html2

24 , testCase "stripHTML 3" test_strip_html3

@@ -42,6 +42,7 @@ tests = [ testGroup "Util group"

42 , testGroup "Context group"

43 [ testCase "renderDate 1" test_render_date1

44 , testCase "renderDate 2" test_render_date1

45+ , testCase "changeExtension 1" test_change_extension1

45 ]

46 ]

47 , testGroup "File group"

48 , testGroup "File group"

@@ -50,7 +51,7 @@ tests = [ testGroup "Util group"

50 , testCase "toRoot 3" test_to_root3

51 , testCase "toRoot 3" test_to_root3

51 , testCase "removeSpaces 1" test_remove_spaces1

52 , testCase "removeSpaces 1" test_remove_spaces1

52 , testCase "removeSpaces 2" test_remove_spaces2

53 , testCase "removeSpaces 2" test_remove_spaces2

53− , testProperty "havingExtension count" prop_having_extension_count

54+ -- , testProperty "havingExtension count" prop_having_extension_count

54 , testCase "havingExtension 1" test_having_extension1

55 , testCase "havingExtension 1" test_having_extension1

55 , testCase "havingExtension 2" test_having_extension2

56 , testCase "havingExtension 2" test_having_extension2

56 ]

57 ]

@@ -60,10 +61,10 @@ tests = [ testGroup "Util group"

60prop_trim_length str = length str >= length (trim str)

61prop_trim_length str = length str >= length (trim str)

62-- Check that a string which does not start or end with a space is not trimmed.

63-- Check that a string which does not start or end with a space is not trimmed.

63−prop_trim_id str = (not $ null str)

64+prop_trim_id str = isAlreadyTrimmed ==> str == (trim str)

64− && (not $ isSpace $ head str)

65+ where

65− && (not $ isSpace $ last str)

66+ isAlreadyTrimmed :: Bool

66− ==> str == (trim str)

67+ isAlreadyTrimmed = (not $ isSpace $ head str) && (not $ isSpace $ last str)

68-- An string of only spaces should be reduced to an empty string.

69-- An string of only spaces should be reduced to an empty string.

69prop_trim_empty str = (all isSpace str) ==> null (trim str)

70prop_trim_empty str = (all isSpace str) ==> null (trim str)

@@ -109,6 +110,11 @@ test_render_date2 = M.lookup "date" rendered @?= Just "Unknown date"

109 rendered = renderDate "date" "%B %e, %Y" "Unknown date" $

110 rendered = renderDate "date" "%B %e, %Y" "Unknown date" $

110 M.singleton "path" "2009-badness-30-a-title.markdown"

111 M.singleton "path" "2009-badness-30-a-title.markdown"

111

112

113+-- changeExtension test cases.

114+test_change_extension1 = M.lookup "url" rendered @?= Just "foo.php"

115+ where

116+ rendered = changeExtension "php" (M.singleton "url" "foo.html")

117+

112-- toRoot test cases

118-- toRoot test cases

113test_to_root1 = toRoot "/posts/foo.html" @?= ".."

119test_to_root1 = toRoot "/posts/foo.html" @?= ".."

114test_to_root2 = toRoot "posts/foo.html" @?= ".."

120test_to_root2 = toRoot "posts/foo.html" @?= ".."