fb381dd · hakyll · git.iko.soy

git.iko.soy/hakyll

Changed to tibbe's style guide for imports.

commitfb381ddfd3a359ae85cd3fa0e8a0ad6ba3676631 authorJasper Van der Jeugt <jaspervdj@gmail.com> dateSun 17 Jan 2010, 14:43 (17 years ago) parentaa44d6c

12 files changed+19−19

compare with master

unifiedsplit

src/Network/Hakyll/SimpleServer.hs+1−1 src/Text/Hakyll.hs+2−3 src/Text/Hakyll/CompressCSS.hs+1 src/Text/Hakyll/Context.hs+1−1 src/Text/Hakyll/File.hs+2−1 src/Text/Hakyll/Hakyll.hs+2−1 src/Text/Hakyll/Page.hs+2−4 src/Text/Hakyll/Render.hs−2 src/Text/Hakyll/Render/Internal.hs+1 src/Text/Hakyll/Renderables.hs+2−1 src/Text/Hakyll/Tags.hs+2−2 tests/Tests.hs+3−3

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

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

55 ) where

77import Prelude hiding (log)

8−import Network

98import Control.Monad (forever)

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

10+import Network

1111import System.IO

1212import System.Directory (doesFileExist, doesDirectoryExist)

1313import Control.Concurrent (forkIO)

src/Text/Hakyll.hs+2−3

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

66import Control.Monad.Reader (runReaderT)

77import qualified Data.Map as M

8+import System.Environment (getArgs, getProgName)

9+import System.Directory (doesDirectoryExist, removeDirectoryRecursive)

810

911import Network.Hakyll.SimpleServer (simpleServer)

1012import Text.Hakyll.Hakyll

1113

12−import System.Environment (getArgs, getProgName)

13−import System.Directory (doesDirectoryExist, removeDirectoryRecursive)

14−

1514-- | Default hakyll configuration.

1615defaultHakyllConfiguration :: HakyllConfiguration

1716defaultHakyllConfiguration = HakyllConfiguration

src/Text/Hakyll/CompressCSS.hs+1

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

33 ) where

55import Data.List (isPrefixOf)

67import Text.Hakyll.Regex (substituteRegex)

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

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

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

99import qualified Data.Map as M

1010import Data.Map (Map)

11−

1211import System.Locale (defaultTimeLocale)

1312import System.FilePath (takeFileName)

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

1514import Data.Time.Clock (UTCTime)

1615import Data.Maybe (fromMaybe)

16+

1717import Text.Hakyll.Regex (substituteRegex)

1818

1919-- | Type for a context.

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

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

1717import System.FilePath

1818import Control.Monad

1919import Data.List (isPrefixOf)

20−import Text.Hakyll.Hakyll (Hakyll)

2120import Control.Monad.Reader (liftIO)

2221

22+import Text.Hakyll.Hakyll (Hakyll)

23+

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

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

2526removeLeadingSeparator :: FilePath -> FilePath

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

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

55 , askHakyll

66 ) where

8−import Text.Hakyll.Context (Context)

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

109import Control.Monad (liftM)

1110

11+import Text.Hakyll.Context (Context)

12+

1213-- | Hakyll global configuration type.

1314data HakyllConfiguration = HakyllConfiguration

1415 { -- | 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

99import qualified Data.Map as M

1010import qualified Data.List as L

1111import Data.Maybe (fromMaybe)

12−

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

1413import Control.Monad.Reader (liftIO)

15−

1614import System.FilePath (takeExtension)

1715import System.IO

1816

17+import Text.Pandoc

18+

1919import Text.Hakyll.Hakyll (Hakyll)

2020import Text.Hakyll.File

2121import Text.Hakyll.Util (trim)

2222import Text.Hakyll.Context (Context)

2323import Text.Hakyll.Renderable

24−import Text.Pandoc

25−

2624

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

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

src/Text/Hakyll/Render.hs−2

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

1212

1313import Control.Monad (unless)

1414import Control.Monad.Reader (liftIO)

15−

1615import System.Directory (copyFile)

1716

1817import Text.Hakyll.Hakyll (Hakyll)

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

2120import Text.Hakyll.Renderable

2221import Text.Hakyll.File

2322import Text.Hakyll.CompressCSS

24−

2523import Text.Hakyll.Render.Internal

2624

2725-- | 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')

1616import Data.Char (isAlpha)

1717import Data.Maybe (fromMaybe)

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

19+

1920import Text.Hakyll.Renderable

2021import Text.Hakyll.Page

2122import Text.Hakyll.File

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

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

55 , createPagePath

66 ) where

8−import Text.Hakyll.Hakyll (Hakyll)

98import qualified Data.Map as M

10+import Text.Hakyll.Hakyll (Hakyll)

1011import Text.Hakyll.Page

1112import Text.Hakyll.Renderable

1213import Text.Hakyll.File

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

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

99import qualified Data.Map as M

1010import Data.List (intercalate)

1111import Control.Monad (foldM)

12−import Text.Hakyll.Hakyll (Hakyll)

12+import Control.Arrow (second)

1313

14+import Text.Hakyll.Hakyll (Hakyll)

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

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

1617import Text.Hakyll.Regex

1718import Text.Hakyll.Util

1819import Text.Hakyll.Page

19−import Control.Arrow (second)

2020

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

2222-- 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

14import Test.Framework (defaultMain, testGroup)

25import Test.Framework.Providers.QuickCheck2

36import Test.Framework.Providers.HUnit

47import Test.QuickCheck

58import Test.HUnit

7−import Data.Char

8−import qualified Data.Map as M

9−

1010import Text.Hakyll.CompressCSS

1111import Text.Hakyll.Util

1212import Text.Hakyll.Regex