git.iko.soy/servant
on master help sign in
Rename one function, run custom monad code from main
5620d2dKostiantyn Rybnikov
doc/cookbook/generic/Generic.lhs+5−12
compare with master
unifiedsplit
@@ -5,7 +5,7 @@
5{-# LANGUAGE DeriveGeneric #-}
5{-# LANGUAGE DeriveGeneric #-}
6{-# LANGUAGE RankNTypes #-}
6{-# LANGUAGE RankNTypes #-}
7{-# LANGUAGE TypeOperators #-}
7{-# LANGUAGE TypeOperators #-}
8−module Main (main, api, getLink, routesLinks, cliGet, mainMyMonad) where
8+module Main (main, api, getLink, routesLinks, cliGet) where
9
9
10import Control.Exception (throwIO)
10import Control.Exception (throwIO)
11import Data.Proxy (Proxy (..))
11import Data.Proxy (Proxy (..))
@@ -102,6 +102,10 @@ main = do
102 ("run":_) -> do
102 ("run":_) -> do
103 putStrLn "Starting cookbook-generic at http://localhost:8000"
103 putStrLn "Starting cookbook-generic at http://localhost:8000"
104 run 8000 app
104 run 8000 app
105+ -- see this cookbook below for custom-monad explanation
106+ ("run-custom-monad":_) -> do
107+ putStrLn "Starting cookbook-generic with a custom monad at http://localhost:8000"
108+ run 8000 (appMyMonad AppCustomState)
105 _ -> putStrLn "To run, pass 'run' argument: cabal new-run cookbook-generic run"
109 _ -> putStrLn "To run, pass 'run' argument: cabal new-run cookbook-generic run"
106```
110```
107
111
@@ -134,14 +138,3 @@ nt s x = runReaderT x s
134
138
135appMyMonad :: AppCustomState -> Application
139appMyMonad :: AppCustomState -> Application
136appMyMonad state = genericServeT (nt state) recordMyMonad
140appMyMonad state = genericServeT (nt state) recordMyMonad
137−
138−mainMyMonad :: IO ()
139−mainMyMonad = do
140− args <- getArgs
141− case args of
142− ("run":_) -> do
143− putStrLn "Starting cookbook-generic at http://localhost:8000"
144− run 8000 (appMyMonad AppCustomState)
145− _ ->
146− putStrLn "To run, pass 'run' argument: cabal new-run cookbook-generic run"
147−```
servant-server/src/Servant/Server/Generic.hs+3−3
@@ -13,7 +13,7 @@ module Servant.Server.Generic (
13 AsServer,
13 AsServer,
14 genericServe,
14 genericServe,
15 genericServeT,
15 genericServeT,
16− genericServeT',
16+ genericServeTWithContext,
17 genericServer,
17 genericServer,
18 genericServerT,
18 genericServerT,
19 ) where
19 ) where
@@ -62,7 +62,7 @@ genericServeT f server = serve p $ hoistServer p f (genericServerT server)
62-- while using the given 'Context' to serve the application (contexts are typically
62-- while using the given 'Context' to serve the application (contexts are typically
63-- used by auth-related combinators in servant, e.g to hold auth checks) and the given
63-- used by auth-related combinators in servant, e.g to hold auth checks) and the given
64-- transformation to map all the handlers back to the 'Handler' monad.
64-- transformation to map all the handlers back to the 'Handler' monad.
65−genericServeT'
65+genericServeTWithContext
66 :: forall (routes :: * -> *) (m :: * -> *) (ctx :: [*]).
66 :: forall (routes :: * -> *) (m :: * -> *) (ctx :: [*]).
67 ( GenericServant routes (AsServerT m)
67 ( GenericServant routes (AsServerT m)
68 , GenericServant routes AsApi
68 , GenericServant routes AsApi
@@ -73,7 +73,7 @@ genericServeT'
73 -> routes (AsServerT m) -- ^ your record full of request handlers
73 -> routes (AsServerT m) -- ^ your record full of request handlers
74 -> Context ctx -- ^ the 'Context' to serve the application with
74 -> Context ctx -- ^ the 'Context' to serve the application with
75 -> Application
75 -> Application
76−genericServeT' f server ctx =
76+genericServeTWithContext f server ctx =
77 serveWithContext p ctx $
77 serveWithContext p ctx $
78 hoistServerWithContext p pctx f (genericServerT server)
78 hoistServerWithContext p pctx f (genericServerT server)
79 where
79 where