notice

From 3751d0a7ad5feea6a7c79d2e041c250a1d0a356f Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Fri, 10 Aug 2012 09:38:31 +0900 Subject: Bump hamlet dependency Closes #81 --- hakyll.cabal | 4 ++-- tests/Hakyll/Web/Template/Tests.hs | 17 +++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/hakyll.cabal b/hakyll.cabal index 271439c..b9d2378 100644 --- a/hakyll.cabal +++ b/hakyll.cabal @@ -74,7 +74,7 @@ Library cryptohash >= 0.7 && < 0.8, directory >= 1.0 && < 1.2, filepath >= 1.0 && < 1.4, - hamlet >= 1.0 && < 1.1, + hamlet >= 1.0 && < 1.2, mtl >= 1 && < 2.2, old-locale >= 1.0 && < 1.1, old-time >= 1.0 && < 1.2, @@ -182,7 +182,7 @@ Test-suite hakyll-tests cryptohash >= 0.7 && < 0.8, directory >= 1.0 && < 1.2, filepath >= 1.0 && < 1.4, - hamlet >= 1.0 && < 1.1, + hamlet >= 1.0 && < 1.2, mtl >= 1 && < 2.2, old-locale >= 1.0 && < 1.1, old-time >= 1.0 && < 1.2, diff --git a/tests/Hakyll/Web/Template/Tests.hs b/tests/Hakyll/Web/Template/Tests.hs index 36c4374..991a76f 100644 --- a/tests/Hakyll/Web/Template/Tests.hs +++ b/tests/Hakyll/Web/Template/Tests.hs @@ -17,17 +17,18 @@ tests :: [Test] tests = fromAssertions "applyTemplate" -- Hakyll templates [ applyTemplateAssertion readTemplate applyTemplate - "bar" "$foo$" [("foo", "bar")] + ("bar" @=?) "$foo$" [("foo", "bar")] , applyTemplateAssertion readTemplate applyTemplate - "$ barqux" "$$ $foo$$bar$" [("foo", "bar"), ("bar", "qux")] + ("$ barqux" @=?) "$$ $foo$$bar$" [("foo", "bar"), ("bar", "qux")] , applyTemplateAssertion readTemplate applyTemplate - "$foo$" "$foo$" [] + ("$foo$" @=?) "$foo$" [] -- Hamlet templates , applyTemplateAssertion readHamletTemplate applyTemplate - "noticeA paragraph" + (("noticeA paragraph" @=?) . + filter (/= '\n')) "\n\ \ #{title}\n\ \<body>\n\ @@ -39,16 +40,16 @@ tests = fromAssertions "applyTemplate" missing "bar" = "qux" missing x = reverse x in applyTemplateAssertion readTemplate (applyTemplateWith missing) - "bar foo ver" "$foo$ $bar$ $rev$" [("bar", "foo")] + ("bar foo ver" @=?) "$foo$ $bar$ $rev$" [("bar", "foo")] ] -- | Utility function to create quick template tests -- applyTemplateAssertion :: (String -> Template) -> (Template -> Page String -> Page String) - -> String + -> (String -> Assertion) -> String -> [(String, String)] -> Assertion -applyTemplateAssertion parser apply expected template page = - expected @=? pageBody (apply (parser template) (fromMap $ M.fromList page)) +applyTemplateAssertion parser apply correct template page = + correct $ pageBody (apply (parser template) (fromMap $ M.fromList page)) -- cgit v1.2.3 From f8fb0b271eab197367737bc6524661ce15da1f45 Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt <m@jaspervdj.be> Date: Fri, 10 Aug 2012 09:40:17 +0900 Subject: Remove unused imports in Store --- src/Hakyll/Core/Store.hs | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Hakyll/Core/Store.hs b/src/Hakyll/Core/Store.hs index ae94ae8..318730a 100644 --- a/src/Hakyll/Core/Store.hs +++ b/src/Hakyll/Core/Store.hs @@ -10,12 +10,9 @@ module Hakyll.Core.Store ) where import Control.Applicative ((<$>)) -import Control.Concurrent.MVar (MVar, newMVar, readMVar, modifyMVar_) import System.FilePath ((</>)) import System.Directory (doesFileExist) import Data.Maybe (fromMaybe) -import Data.Map (Map) -import qualified Data.Map as M import Data.Binary (Binary, encodeFile, decodeFile) import Data.Typeable (Typeable, TypeRep, cast, typeOf) -- cgit v1.2.3 From a2969b203cc8095938ddd08c077570a0af50904d Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt <m@jaspervdj.be> Date: Fri, 10 Aug 2012 09:41:08 +0900 Subject: Version bump (3.4.1.0) --- hakyll.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hakyll.cabal b/hakyll.cabal index b9d2378..f3a61db 100644 --- a/hakyll.cabal +++ b/hakyll.cabal @@ -1,5 +1,5 @@ Name: hakyll -Version: 3.4.0.0 +Version: 3.4.1.0 Synopsis: A static website compiler library Description: -- cgit v1.2.3 From a0f5193d970a0fc387c37c8629b37a1088a8e5f4 Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt <m@jaspervdj.be> Date: Fri, 10 Aug 2012 09:47:25 +0900 Subject: Add datahackermd.com to examples --- web/examples.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/examples.markdown b/web/examples.markdown index fc608e5..5b64de5 100644 --- a/web/examples.markdown +++ b/web/examples.markdown @@ -54,3 +54,5 @@ this list. This list has no particular ordering. [source](https://github.com/CharlesStain/alfredodinapoli.com) - <http://www.rohanjain.in/>, [source](https://github.com/crodjer/rohanjain.in) +- <http://datahackermd.com>, + [source](http://github.com/akshayjshah/datahackermd) -- cgit v1.2.3