scotty 0.6.0 → 0.6.1

raw patch · 2 files changed

+4/−7 lines, 2 filesdep −resourcetdep ~wai-extra

Dependencies removed: resourcet

Dependency ranges changed: wai-extra

Files

• Web/Scotty/Route.hs +2/−4
• scotty.cabal +2/−3

@@ -7,7 +7,6 @@ import Control.Arrow ((***)) import Control.Monad.Error import qualified Control.Monad.State as MS-import Control.Monad.Trans.Resource (runResourceT, withInternalState, MonadBaseControl)  import qualified Data.ByteString.Char8 as B import qualified Data.ByteString.Lazy.Char8 as BL@@ -109,7 +108,7 @@ path = T.fromStrict . TS.cons '/' . TS.intercalate "/" . pathInfo  -- Stolen from wai-extra, modified to accept body as lazy ByteString-parseRequestBody :: (MonadBaseControl IO m, MonadIO m)+parseRequestBody :: MonadIO m                  => BL.ByteString                  -> Parse.BackEnd y                  -> Request@@ -117,8 +116,7 @@ parseRequestBody b s r =     case Parse.getRequestBodyType r of         Nothing -> return ([], [])-        Just rbt -> runResourceT $ withInternalState $ \ is -> -                        liftIO $ liftM partitionEithers $ sourceLbs b $$ Parse.conduitRequestBody is s rbt =$ consume+        Just rbt -> liftIO $ liftM partitionEithers $ sourceLbs b $$ Parse.conduitRequestBody s rbt =$ consume  mkEnv :: MonadIO m => Request -> [Param] -> m ActionEnv mkEnv req captures = do

@@ -1,5 +1,5 @@ Name:                scotty-Version:             0.6.0+Version:             0.6.1 Synopsis:            Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp Homepage:            https://github.com/scotty-web/scotty Bug-reports:         https://github.com/scotty-web/scotty/issues@@ -78,11 +78,10 @@                        http-types       >= 0.8.2    && < 0.9,                        mtl              >= 2.1.2    && < 2.2,                        regex-compat     >= 0.95.1   && < 0.96,-                       resourcet        >= 0.4.7.2  && < 0.5,                        text             >= 0.11.3.1 && < 0.12,                        transformers     >= 0.3.0.0  && < 0.4,                        wai              >= 2.0.0    && < 2.1,-                       wai-extra        >= 2.0.0.1  && < 2.1,+                       wai-extra        >= 2.0.1    && < 2.1,                        warp             >= 2.0.0.1  && < 2.1    GHC-options: -Wall -fno-warn-orphans