fb381dd · hakyll · git.iko.soy

src/Network/Hakyll/SimpleServer.hs+1−1

compare with master

unifiedsplit

@@ -5,9 +5,9 @@ module Network.Hakyll.SimpleServer

5 ) where

6

7import Prelude hiding (log)

8−import Network

9import Control.Monad (forever)

8import Control.Monad (forever)

10import Control.Monad.Reader (ReaderT, runReaderT, ask, liftIO)

9import Control.Monad.Reader (ReaderT, runReaderT, ask, liftIO)

10+import Network

11import System.IO

12import System.Directory (doesFileExist, doesDirectoryExist)

13import Control.Concurrent (forkIO)

src/Text/Hakyll.hs+2−3

@@ -5,13 +5,12 @@ module Text.Hakyll

5

6import Control.Monad.Reader (runReaderT)

7import qualified Data.Map as M

8+import System.Environment (getArgs, getProgName)

9+import System.Directory (doesDirectoryExist, removeDirectoryRecursive)

8

10

9import Network.Hakyll.SimpleServer (simpleServer)

11import Network.Hakyll.SimpleServer (simpleServer)

10import Text.Hakyll.Hakyll

12import Text.Hakyll.Hakyll

11

13

12−import System.Environment (getArgs, getProgName)

13−import System.Directory (doesDirectoryExist, removeDirectoryRecursive)

14−

15-- | Default hakyll configuration.

14-- | Default hakyll configuration.

16defaultHakyllConfiguration :: HakyllConfiguration

15defaultHakyllConfiguration :: HakyllConfiguration

17defaultHakyllConfiguration = HakyllConfiguration

16defaultHakyllConfiguration = HakyllConfiguration

src/Text/Hakyll/CompressCSS.hs+1

@@ -3,6 +3,7 @@ module Text.Hakyll.CompressCSS

3 ) where

4

5import Data.List (isPrefixOf)

6+

6import Text.Hakyll.Regex (substituteRegex)

7import Text.Hakyll.Regex (substituteRegex)

7

8

8-- | Compress CSS to speed up your site.

9-- | Compress CSS to speed up your site.

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

@@ -8,12 +8,12 @@ module Text.Hakyll.Context

8

9import qualified Data.Map as M

10import Data.Map (Map)

11−

12import System.Locale (defaultTimeLocale)

11import System.Locale (defaultTimeLocale)

13import System.FilePath (takeFileName)

12import System.FilePath (takeFileName)

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

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

15import Data.Time.Clock (UTCTime)

14import Data.Time.Clock (UTCTime)

16import Data.Maybe (fromMaybe)

15import Data.Maybe (fromMaybe)

16+

17import Text.Hakyll.Regex (substituteRegex)

18

19-- | Type for a context.

src/Text/Hakyll/File.hs+2−1

@@ -17,9 +17,10 @@ import System.Directory

17import System.FilePath

18import Control.Monad

19import Data.List (isPrefixOf)

20−import Text.Hakyll.Hakyll (Hakyll)

21import Control.Monad.Reader (liftIO)

20import Control.Monad.Reader (liftIO)

22

21

22+import Text.Hakyll.Hakyll (Hakyll)

23+

23-- | Auxiliary function to remove pathSeparators form the start. We don't deal

24-- | Auxiliary function to remove pathSeparators form the start. We don't deal

24-- with absolute paths here. We also remove $root from the start.

25-- with absolute paths here. We also remove $root from the start.

25removeLeadingSeparator :: FilePath -> FilePath

26removeLeadingSeparator :: FilePath -> FilePath

src/Text/Hakyll/Hakyll.hs+2−1

@@ -5,10 +5,11 @@ module Text.Hakyll.Hakyll

5 , askHakyll

6 ) where

7

8−import Text.Hakyll.Context (Context)

9import Control.Monad.Reader (ReaderT, ask)

8import Control.Monad.Reader (ReaderT, ask)

10import Control.Monad (liftM)

9import Control.Monad (liftM)

11

10

11+import Text.Hakyll.Context (Context)

12+

12-- | Hakyll global configuration type.

13-- | Hakyll global configuration type.

13data HakyllConfiguration = HakyllConfiguration

14data HakyllConfiguration = HakyllConfiguration

14 { -- | An additional context to use when rendering. This additional context

15 { -- | An additional context to use when rendering. This additional context

src/Text/Hakyll/Page.hs+2−4

@@ -9,20 +9,18 @@ module Text.Hakyll.Page

9import qualified Data.Map as M

10import qualified Data.List as L

11import Data.Maybe (fromMaybe)

12−

13import Control.Parallel.Strategies (rdeepseq, ($|))

12import Control.Parallel.Strategies (rdeepseq, ($|))

14import Control.Monad.Reader (liftIO)

13import Control.Monad.Reader (liftIO)

15−

16import System.FilePath (takeExtension)

14import System.FilePath (takeExtension)

17import System.IO

15import System.IO

18

16

17+import Text.Pandoc

18+

19import Text.Hakyll.Hakyll (Hakyll)

20import Text.Hakyll.File

21import Text.Hakyll.Util (trim)

22import Text.Hakyll.Context (Context)

23import Text.Hakyll.Renderable

24−import Text.Pandoc

25−

26

24

27-- | A Page is basically key-value mapping. Certain keys have special

25-- | A Page is basically key-value mapping. Certain keys have special

28-- meanings, like for example url, body and title.

26-- meanings, like for example url, body and title.

src/Text/Hakyll/Render.hs−2

@@ -12,7 +12,6 @@ module Text.Hakyll.Render

12

13import Control.Monad (unless)

14import Control.Monad.Reader (liftIO)

15−

16import System.Directory (copyFile)

15import System.Directory (copyFile)

17

16

18import Text.Hakyll.Hakyll (Hakyll)

17import Text.Hakyll.Hakyll (Hakyll)

@@ -21,7 +20,6 @@ import Text.Hakyll.Page

21import Text.Hakyll.Renderable

20import Text.Hakyll.Renderable

22import Text.Hakyll.File

21import Text.Hakyll.File

23import Text.Hakyll.CompressCSS

22import Text.Hakyll.CompressCSS

24−

25import Text.Hakyll.Render.Internal

23import Text.Hakyll.Render.Internal

26

24

27-- | Execute an IO action only when the cache is invalid.

25-- | Execute an IO action only when the cache is invalid.

src/Text/Hakyll/Render/Internal.hs+1

@@ -16,6 +16,7 @@ import Data.List (isPrefixOf, foldl')

16import Data.Char (isAlpha)

17import Data.Maybe (fromMaybe)

18import Control.Parallel.Strategies (rdeepseq, ($|))

19+

19import Text.Hakyll.Renderable

20import Text.Hakyll.Renderable

20import Text.Hakyll.Page

21import Text.Hakyll.Page

21import Text.Hakyll.File

22import Text.Hakyll.File

src/Text/Hakyll/Renderables.hs+2−1

@@ -5,8 +5,9 @@ module Text.Hakyll.Renderables

5 , createPagePath

6 ) where

7

8−import Text.Hakyll.Hakyll (Hakyll)

9import qualified Data.Map as M

8import qualified Data.Map as M

9+

10+import Text.Hakyll.Hakyll (Hakyll)

10import Text.Hakyll.Page

11import Text.Hakyll.Page

11import Text.Hakyll.Renderable

12import Text.Hakyll.Renderable

12import Text.Hakyll.File

13import Text.Hakyll.File

src/Text/Hakyll/Tags.hs+2−2

@@ -9,14 +9,14 @@ module Text.Hakyll.Tags

9import qualified Data.Map as M

10import Data.List (intercalate)

11import Control.Monad (foldM)

12−import Text.Hakyll.Hakyll (Hakyll)

12+import Control.Arrow (second)

13

14+import Text.Hakyll.Hakyll (Hakyll)

14import Text.Hakyll.Context (ContextManipulation, renderValue)

15import Text.Hakyll.Context (ContextManipulation, renderValue)

15import Text.Hakyll.Render.Internal (finalSubstitute)

16import Text.Hakyll.Render.Internal (finalSubstitute)

16import Text.Hakyll.Regex

17import Text.Hakyll.Regex

17import Text.Hakyll.Util

18import Text.Hakyll.Util

18import Text.Hakyll.Page

19import Text.Hakyll.Page

19−import Control.Arrow (second)

20

21-- | Read a tag map. This creates a map from tags to page paths. This function

22-- assumes the tags are located in the @tags@ metadata field, separated by

tests/Tests.hs+3−3

@@ -1,12 +1,12 @@

1+import Data.Char

2+import qualified Data.Map as M

3+

1import Test.Framework (defaultMain, testGroup)

4import Test.Framework (defaultMain, testGroup)

2import Test.Framework.Providers.QuickCheck2

5import Test.Framework.Providers.QuickCheck2

3import Test.Framework.Providers.HUnit

6import Test.Framework.Providers.HUnit

4import Test.QuickCheck

7import Test.QuickCheck

5import Test.HUnit

8import Test.HUnit

6

9

7−import Data.Char

8−import qualified Data.Map as M

9−

10import Text.Hakyll.CompressCSS

11import Text.Hakyll.Util

12import Text.Hakyll.Regex