release 0.21

Web/Scotty.hs

@@ -23,13 +23,14 @@
     , middleware, get, post, put, delete, patch, options, addroute, matchAny, notFound, nested, setMaxRequestBodySize
       -- ** Route Patterns
     , capture, regex, function, literal
-      -- ** Accessing the Request, Captures, and Query Parameters
+      -- ** Accessing the Request and its fields
     , request, header, headers, body, bodyReader
+    , jsonData, files
+      -- ** Accessing Path, Form and Query Parameters
     , param, params
     , pathParam, captureParam, formParam, queryParam
     , pathParamMaybe, captureParamMaybe, formParamMaybe, queryParamMaybe
     , pathParams, captureParams, formParams, queryParams
-    , jsonData, files
       -- ** Modifying the Response and Redirecting
     , status, addHeader, setHeader, redirect
       -- ** Setting Response Body
@@ -149,14 +150,14 @@
 --
 -- Uncaught exceptions turn into HTTP 500 responses.
 raise :: Text -> ActionM a
 raise = Trans.raise
 {-# DEPRECATED raise "Throw an exception instead" #-}
 
 -- | Throw a 'StatusError' exception that has an associated HTTP error code and can be caught with 'catch'.
 --
 -- Uncaught exceptions turn into HTTP responses corresponding to the given status.
 raiseStatus :: Status -> Text -> ActionM a
 raiseStatus = Trans.raiseStatus
 {-# DEPRECATED raiseStatus "Use status, text, and finish instead" #-}
 
 -- | Throw an exception which can be caught within the scope of the current Action with 'catch'.
@@ -206,12 +207,12 @@
 --
 -- > raise JustKidding `catch` (\msg -> text msg)
 rescue :: E.Exception e => ActionM a -> (e -> ActionM a) -> ActionM a
 rescue = Trans.rescue
 {-# DEPRECATED rescue "Use catch instead" #-}
 
 -- | Like 'liftIO', but catch any IO exceptions and turn them into Scotty exceptions.
 liftAndCatchIO :: IO a -> ActionM a
 liftAndCatchIO = Trans.liftAndCatchIO
 {-# DEPRECATED liftAndCatchIO "Use liftIO instead" #-}
 
 -- | Redirect to given URL. Like throwing an uncatchable exception. Any code after the call to redirect
@@ -267,6 +268,8 @@
 {-# DEPRECATED param "(#204) Not a good idea to treat all parameters identically. Use pathParam, formParam and queryParam instead. "#-}
 
 -- | Synonym for 'pathParam'
+--
+-- /Since: 0.20/
 captureParam :: Trans.Parsable a => Text -> ActionM a
 captureParam = Trans.captureParam . toStrict
 
@@ -306,27 +309,29 @@
 -- NB : Doesn't throw exceptions. In particular, route pattern matching will not continue, so developers
 -- must 'raiseStatus' or 'throw' to signal something went wrong.
 --
--- /Since: FIXME/
+-- /Since: 0.21/
 pathParamMaybe :: (Trans.Parsable a) => Text -> ActionM (Maybe a)
 pathParamMaybe = Trans.pathParamMaybe . toStrict
 
 -- | Synonym for 'pathParamMaybe'
+--
+-- /Since: 0.21/
 captureParamMaybe :: (Trans.Parsable a) => Text -> ActionM (Maybe a)
 captureParamMaybe = Trans.pathParamMaybe . toStrict
 
 -- | Look up a form parameter. Returns 'Nothing' if the parameter is not found or cannot be parsed at the right type.
 --
 -- NB : Doesn't throw exceptions, so developers must 'raiseStatus' or 'throw' to signal something went wrong.
 --
--- /Since: FIXME/
+-- /Since: 0.21/
 formParamMaybe :: (Trans.Parsable a) => Text -> ActionM (Maybe a)
 formParamMaybe = Trans.formParamMaybe . toStrict
 
 -- | Look up a query parameter. Returns 'Nothing' if the parameter is not found or cannot be parsed at the right type.
 --
 -- NB : Doesn't throw exceptions, so developers must 'raiseStatus' or 'throw' to signal something went wrong.
 --
--- /Since: FIXME/
+-- /Since: 0.21/
 queryParamMaybe :: (Trans.Parsable a) => Text -> ActionM (Maybe a)
 queryParamMaybe = Trans.queryParamMaybe . toStrict
 
@@ -398,12 +403,18 @@
 
 
 -- | Access the HTTP 'Status' of the Response
+--
+-- /Since: 0.21/
 getResponseStatus :: ActionM Status
 getResponseStatus = Trans.getResponseStatus
 -- | Access the HTTP headers of the Response
+--
+-- /Since: 0.21/
 getResponseHeaders :: ActionM ResponseHeaders
 getResponseHeaders = Trans.getResponseHeaders
 -- | Access the content of the Response
+--
+-- /Since: 0.21/
 getResponseContent :: ActionM Content
 getResponseContent = Trans.getResponseContent
 

Web/Scotty/Action.hs

@@ -92,7 +92,7 @@
 import           Numeric.Natural
 
 import           Web.Scotty.Internal.Types
 import           Web.Scotty.Util (mkResponse, addIfNotPresent, add, replace, lazyTextToStrictByteString, decodeUtf8Lenient)
 import           UnliftIO.Exception (Handler(..), catch, catches, throwIO)
 
 import Network.Wai.Internal (ResponseReceived(..))
@@ -119,7 +119,7 @@
 -- | Catches 'StatusError' and produces an appropriate HTTP response.
 statusErrorHandler :: MonadIO m => ErrorHandler m
 statusErrorHandler = Handler $ \case
   StatusError s e -> do
     status s
     let code = T.pack $ show $ statusCode s
     let msg = decodeUtf8Lenient $ statusMessage s
@@ -186,7 +186,7 @@
 --
 -- Uncaught exceptions turn into HTTP responses corresponding to the given status.
 raiseStatus :: Monad m => Status -> T.Text -> ActionT m a
 raiseStatus s = E.throw . StatusError s
 {-# DEPRECATED raiseStatus "Use status, text, and finish instead" #-}
 
 -- | Throw an exception which can be caught within the scope of the current Action with 'catch'.
@@ -358,7 +358,7 @@
 -- NB : Doesn't throw exceptions. In particular, route pattern matching will not continue, so developers
 -- must 'raiseStatus' or 'throw' to signal something went wrong.
 --
--- /Since: FIXME/
+-- /Since: 0.21/
 pathParamMaybe :: (Parsable a, Monad m) => T.Text -> ActionT m (Maybe a)
 pathParamMaybe = paramWithMaybe envPathParams
 
@@ -367,23 +367,23 @@
 -- NB : Doesn't throw exceptions. In particular, route pattern matching will not continue, so developers
 -- must 'raiseStatus' or 'throw' to signal something went wrong.
 --
--- /Since: FIXME/
+-- /Since: 0.21/
 captureParamMaybe :: (Parsable a, Monad m) => T.Text -> ActionT m (Maybe a)
 captureParamMaybe = paramWithMaybe envPathParams
 
 -- | Look up a form parameter. Returns 'Nothing' if the parameter is not found or cannot be parsed at the right type.
 --
 -- NB : Doesn't throw exceptions, so developers must 'raiseStatus' or 'throw' to signal something went wrong.
 --
--- /Since: FIXME/
+-- /Since: 0.21/
 formParamMaybe :: (Parsable a, Monad m) => T.Text -> ActionT m (Maybe a)
 formParamMaybe = paramWithMaybe envFormParams
 
 -- | Look up a query parameter. Returns 'Nothing' if the parameter is not found or cannot be parsed at the right type.
 --
 -- NB : Doesn't throw exceptions, so developers must 'raiseStatus' or 'throw' to signal something went wrong.
 --
--- /Since: FIXME/
+-- /Since: 0.21/
 queryParamMaybe :: (Parsable a, Monad m) => T.Text -> ActionT m (Maybe a)
 queryParamMaybe = paramWithMaybe envQueryParams
 
@@ -428,7 +428,7 @@
 params :: Monad m => ActionT m [Param]
 params = paramsWith getParams
 {-# DEPRECATED params "(#204) Not a good idea to treat all parameters identically. Use pathParams, formParams and queryParams instead. "#-}
-  
+
 -- | Get path parameters
 pathParams :: Monad m => ActionT m [Param]
 pathParams = paramsWith envPathParams
@@ -455,12 +455,18 @@
 -- === access the fields of the Response being constructed
 
 -- | Access the HTTP 'Status' of the Response
+--
+-- /SINCE 0.21/
 getResponseStatus :: (MonadIO m) => ActionT m Status
 getResponseStatus = srStatus <$> getResponseAction
 -- | Access the HTTP headers of the Response
+--
+-- /SINCE 0.21/
 getResponseHeaders :: (MonadIO m) => ActionT m ResponseHeaders
 getResponseHeaders = srHeaders <$> getResponseAction
 -- | Access the content of the Response
+--
+-- /SINCE 0.21/
 getResponseContent :: (MonadIO m) => ActionT m Content
 getResponseContent = srContent <$> getResponseAction
 

Web/Scotty/Trans.hs

@@ -28,13 +28,14 @@ module Web.Scotty.Trans
     , middleware, get, post, put, delete, patch, options, addroute, matchAny, notFound, setMaxRequestBodySize
       -- ** Route Patterns
     , capture, regex, function, literal
-      -- ** Accessing the Request, Captures, and Query Parameters
+      -- ** Accessing the Request and its fields
     , request, Lazy.header, Lazy.headers, body, bodyReader
+    , jsonData, files
+      -- ** Accessing Path, Form and Query Parameters
     , param, params
     , pathParam, captureParam, formParam, queryParam
     , pathParamMaybe, captureParamMaybe, formParamMaybe, queryParamMaybe
     , pathParams, captureParams, formParams, queryParams
-    , jsonData, files
       -- ** Modifying the Response and Redirecting
     , status, Lazy.addHeader, Lazy.setHeader, Lazy.redirect
       -- ** Setting Response Body

Web/Scotty/Util.hs

@@ -1,5 +1,6 @@
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE LambdaCase #-}
+{-# options_ghc -Wno-unused-imports #-}
 module Web.Scotty.Util
     ( lazyTextToStrictByteString
     , strictByteStringToLazyText

changelog.md

@@ -1,19 +1,28 @@
 ## next [????.??.??]
 
-* add getResponseHeaders, getResponseStatus, getResponseContent (#214)
+
+## 0.21 [2023.12.17]
+### New
+* add `getResponseHeaders`, `getResponseStatus`, `getResponseContent` (#214)
 * add `captureParamMaybe`, `formParamMaybe`, `queryParamMaybe` (#322)
-* deprecate `rescue` and `liftAndCatchIO` (#332)
 * add `Web.Scotty.Trans.Strict` and `Web.Scotty.Trans.Lazy` (#334)
-* Reverted the `MonadReader` instance of `ActionT` so that it inherits the base monad (#342)
 * renamed `captureParam`, `captureParamMaybe`, and `captureParams` to `pathParam`, `pathParamMaybe`, `pathParams` respectively, keeping the old names as their synonyms (#344)
+
+### Deprecated
+* deprecate `rescue` and `liftAndCatchIO` (#332)
+* Deprecate `StatusError`, `raise` and `raiseStatus` (#351)
+
+### Fixes
+* Reverted the `MonadReader` instance of `ActionT` so that it inherits the base monad (#342)
 * Scotty's API such as `queryParam` now throws `ScottyException` rather than `StatusException`.
   Uncaught exceptions are handled by `scottyExceptionHandler`, resembling the existing behaviour
-* Deprecate `StatusError`, `raise` and `raiseStatus` (#351)
+
+### Documentation
 * Add doctest, refactor some inline examples into doctests (#353)
 * document "`defaultHandler` only applies to endpoints defined after it" (#237)
 
-## 0.20.1 [2023.10.03]
 
+## 0.20.1 [2023.10.03]
 * remove dependencies on 'base-compat' and 'base-compat-batteries' (#318)
 * re-add MonadFail (ActionT m) instance (#325)
 * re-add MonadError (ActionT m) instance, but the error type is now specialized to 'StatusError' (#325)

scotty.cabal

@@ -1,5 +1,5 @@
 Name:                scotty
-Version:             0.20.1
+Version:             0.21
 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

test/Web/ScottySpec.hs

@@ -140,6 +140,16 @@ spec = do
             request "POST" "/" [("Content-Type","multipart/form-data; boundary=--33")]
               large `shouldRespondWith` 200
 
+    describe "middleware" $ do
+      context "can rewrite the query string (#348)" $ do
+        withApp (do
+                    Scotty.middleware $ \app req sendResponse ->
+                      app req{queryString = [("query", Just "haskell")]} sendResponse
+                    Scotty.matchAny "/search" $ queryParam "query" >>= text
+                ) $ do
+         it "returns query parameter with given name" $ do
+           get "/search" `shouldRespondWith` "haskell"
+
 
   describe "ActionM" $ do
     context "MonadBaseControl instance" $ do
@@ -178,16 +188,6 @@ spec = do
         it "Responds with a 302 Redirect" $ do
           get "/a" `shouldRespondWith` 302 { matchHeaders = ["Location" <:> "/b"] }
 
-    describe "middleware" $ do
-      context "rewrites the query string" $ do
-        withApp (do
-                    Scotty.middleware $ \app req sendResponse ->
-                      app req{queryString = [("query", Just "haskell")]} sendResponse
-                    Scotty.matchAny "/search" $ queryParam "query" >>= text
-                ) $ do
-         it "returns query parameter with given name" $ do
-           get "/search" `shouldRespondWith` "haskell"
-
     describe "captureParam" $ do
       withApp (
         do