geek-server 1.0.0.3 → 1.1

raw patch · 3 files changed

+14/−17 lines, 3 filesdep −hspecPVP ok

version bump matches the API change (PVP)

Dependencies removed: hspec

API changes (from Hackage documentation)

Files

• geek-server.cabal +7/−9
• src/Web/Geek/MarkupEngine/Markdown.hs +4/−5
• src/Web/Geek/ServeWithSnapServer.hs +3/−3

@@ -1,5 +1,5 @@ Name:                 geek-server-Version:              1.0.0.3+Version:              1.1 Build-type:           Simple Synopsis:             Geek blog engine server Description:          A dynamic blog engine, customizable with standard web technology, i.e. HTML, CSS and Javascript (JSON)@@ -12,12 +12,12 @@ Cabal-version:        >= 1.6 category:             Web homepage:             http://github.com/nfjinjing/geek-data-files:           +data-files:                       Nemesis                       COPYING  -Library           +Library   ghc-options:        -Wall   build-depends:      base >= 4 && < 99                     , air@@ -26,16 +26,15 @@                     , data-default                     , bytestring                     , text-                    , hspec                     , pandoc                     , hack2-                     +   hs-source-dirs:     src/-  exposed-modules:    +  exposed-modules:                       Web.Geek.ServeWithSnapServer                       Web.Geek.MarkupEngine.Markdown-                                                          + Executable            geek   ghc-options:        -threaded   build-depends:      base >= 4 && < 99@@ -45,10 +44,9 @@                     , data-default                     , bytestring                     , text-                    , hspec                     , pandoc                     , hack2 -                    +   hs-source-dirs:     src/   main-is:            MainDist.hs

@@ -1,19 +1,18 @@+{-# LANGUAGE NoImplicitPrelude #-}++ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE QuasiQuotes #-}-{-# LANGUAGE NoImplicitPrelude #-}   module Web.Geek.MarkupEngine.Markdown where  import Air.Env-import Air.TH-import Data.Text (Text, pack, unpack)+import Data.Text (unpack) import GHC.Exts( IsString(..) )-import Test.Hspec import Text.Pandoc (readMarkdown, writeHtmlString) import Web.Geek.Type-import qualified Data.ByteString.Char8 as B import qualified Data.Default as Default  markdown :: MarkupEngine

@@ -1,9 +1,9 @@ {-# LANGUAGE NoImplicitPrelude #-} + module Web.Geek.ServeWithSnapServer where  import Air.Env-import Hack2 import Hack2.Handler.SnapServer import Web.Geek.DemoMiddlewareStack import Web.Geek.Serve (serve)@@ -11,10 +11,10 @@ import qualified Data.Default as Default  serve_with_snap_server :: [MarkupEngine] -> IO ()-serve_with_snap_server markup_engines = +serve_with_snap_server _markup_engines =    let     server_backend _app _port =       runWithConfig Default.def {port = _port} _app   in   -  serve markup_engines demo_middleware_stack server_backend+  serve _markup_engines demo_middleware_stack server_backend