miku 2011.6.19 → 2011.6.20

raw patch · 6 files changed

+13/−12 lines, 6 filesdep ~hack2dep ~hack2-contribPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: hack2, hack2-contrib

API changes (from Hackage documentation)

Files

miku.cabal +3/−3
src/Network/Miku/Config.hs +1/−1
src/Network/Miku/DSL.hs +4/−3
src/Network/Miku/Engine.hs +2/−2
src/Network/Miku/Type.hs +1/−1
src/Network/Miku/Utils.hs +2/−2

miku.cabal view

@@ -1,5 +1,5 @@ Name:                 miku-Version:              2011.6.19+Version:              2011.6.20 Build-type:           Simple Synopsis:             A minimum web dev DSL in Haskell Description:@@ -19,8 +19,8 @@ library   build-depends:      base > 4 && <= 5                     , data-default-                    , hack2 >= 2011.6.19-                    , hack2-contrib >= 2011.6.19+                    , hack2 >= 2011.6.20+                    , hack2-contrib >= 2011.6.20                     , utf8-string                     , air >= 2011.6.19                     , mtl

src/Network/Miku/Config.hs view

@@ -9,7 +9,7 @@ import Hack2.Contrib.Middleware.ContentType import Network.Miku.Utils import Prelude hiding ((.), (>), (^), (-))-import Data.ByteString.Lazy.Char8 (ByteString)+import Data.ByteString.Char8 (ByteString)   pre_installed_middlewares :: [Middleware]

src/Network/Miku/DSL.hs view

@@ -16,7 +16,8 @@ import Network.Miku.Utils import Prelude hiding ((.), (>), (^), (-)) import qualified Control.Monad.State as State-import Data.ByteString.Lazy.Char8 (ByteString)+import Data.ByteString.Char8 (ByteString)+import qualified Data.ByteString.Lazy.Char8 as Lazy  import Air.Data.Record.SimpleLabel hiding (get) @@ -52,12 +53,12 @@ text :: ByteString -> AppMonad text x = do   update - set_content_type _TextPlain-  update - set_body_bytestring x+  update - set_body_bytestring - Lazy.fromChunks [x]  html :: ByteString -> AppMonad html x = do   update - set_content_type _TextHtml-  update - set_body_bytestring x+  update - set_body_bytestring - Lazy.fromChunks [x]   captures :: AppMonadT [(ByteString, ByteString)]

src/Network/Miku/Engine.hs view

@@ -15,8 +15,8 @@ import Network.Miku.Type import Network.Miku.Utils import Prelude ()-import Data.ByteString.Lazy.Char8 (ByteString)-import qualified Data.ByteString.Lazy.Char8 as B+import Data.ByteString.Char8 (ByteString)+import qualified Data.ByteString.Char8 as B import qualified Prelude as P import Air.Data.Record.SimpleLabel hiding (get) import Data.Maybe

src/Network/Miku/Type.hs view

@@ -7,7 +7,7 @@ import Air.Data.Default import Hack2 import Hack2.Contrib.Utils-import Data.ByteString.Lazy.Char8 (ByteString)+import Data.ByteString.Char8 (ByteString)  import Air.TH

src/Network/Miku/Utils.hs view

@@ -8,8 +8,8 @@ import Prelude () import Data.ByteString.UTF8 (fromString, toString) -import qualified Data.ByteString.Lazy.Char8 as B-import Data.ByteString.Lazy.Char8 (ByteString)+import qualified Data.ByteString.Char8 as B+import Data.ByteString.Char8 (ByteString)  namespace :: ByteString -> Env -> [(ByteString, ByteString)] namespace x env =