miku 2011.6.18 → 2011.6.19

raw patch · 4 files changed

+9/−12 lines, 4 filesdep ~airdep ~hack2dep ~hack2-contribPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: air, hack2, hack2-contrib

API changes (from Hackage documentation)

Files

• miku.cabal +4/−4
• src/Network/Miku/DSL.hs +2/−5
• src/Network/Miku/Engine.hs +2/−2
• src/Network/Miku/Type.hs +1/−1

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

@@ -49,18 +49,15 @@ public :: Maybe ByteString -> [ByteString] -> MikuMonad public r xs = middleware - static r xs -io :: (MonadIO m) => IO a -> m a-io = liftIO- text :: ByteString -> AppMonad text x = do   update - set_content_type _TextPlain-  update - set_body x+  update - set_body_bytestring x  html :: ByteString -> AppMonad html x = do   update - set_content_type _TextHtml-  update - set_body x+  update - set_body_bytestring x   captures :: AppMonadT [(ByteString, ByteString)]

@@ -6,7 +6,6 @@  import Control.Monad.Reader hiding (join) import Control.Monad.State hiding (join)-import Data.Default import Hack2 import Hack2.Contrib.Middleware.UserMime import Hack2.Contrib.Middleware.NotFound@@ -21,6 +20,7 @@ import qualified Prelude as P import Air.Data.Record.SimpleLabel hiding (get) import Data.Maybe+import qualified Data.Default as Default   @@ -60,7 +60,7 @@   where          run_app_monad :: AppMonad -> Application-    run_app_monad app_monad = \env -> runReaderT app_monad env .flip execStateT def {status = 200}+    run_app_monad app_monad = \env -> runReaderT app_monad env .flip execStateT Default.def       parse_params :: ByteString -> ByteString -> Maybe (ByteString, [(ByteString, ByteString)])

@@ -4,7 +4,7 @@  import Control.Monad.Reader import Control.Monad.State-import Data.Default+import Air.Data.Default import Hack2 import Hack2.Contrib.Utils import Data.ByteString.Lazy.Char8 (ByteString)