diff options
| author | Mekeor Melire <mekeor@ymail.com> | 2012-08-11 01:31:27 +0200 |
|---|---|---|
| committer | Mekeor Melire <mekeor@ymail.com> | 2012-08-11 01:31:27 +0200 |
| commit | 0f484c49be07f0729d89d562f02a40109872737a (patch) | |
| tree | b47bab7a72db5cdb80345eda3d0822f41bbb75a3 | |
| parent | 998db08a7f0f3464515fe0328d22fb91ffd9dc11 (diff) | |
| parent | a0f5193d970a0fc387c37c8629b37a1088a8e5f4 (diff) | |
| download | hakyll-0f484c49be07f0729d89d562f02a40109872737a.tar.gz | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | hakyll.cabal | 6 | ||||
| -rw-r--r-- | src/Hakyll/Core/Store.hs | 3 | ||||
| -rw-r--r-- | tests/Hakyll/Web/Template/Tests.hs | 17 | ||||
| -rw-r--r-- | web/examples.markdown | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/hakyll.cabal b/hakyll.cabal index 271439c..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: @@ -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/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) 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 - "<head><title>notice</title></head><body>A paragraph</body>" + (("<head><title>notice</title></head><body>A paragraph</body>" @=?) . + filter (/= '\n')) "<head>\n\ \ <title>#{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)) 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) |