eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wip-either

Browse source
This commit is contained in:
Oswyn Brent 2015-06-24 12:02:03 +10:00
parent 7399f30cc4
commit 757d924302
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
servant-server/src/Servant/Server/Internal.hs
View file

@ -284,12 +284,17 @@ instance (KnownSymbol sym, FromText a, HasServer sublayout)
=> HasServer (Header sym a :> sublayout) where => HasServer (Header sym a :> sublayout) where
type ServerT (Header sym a :> sublayout) m = type ServerT (Header sym a :> sublayout) m =
Maybe a -> ServerT sublayout m Either String (Maybe a) -> ServerT sublayout m
route Proxy subserver = WithRequest $ \ request -> route Proxy subserver = WithRequest $ \ request ->
let mheader = fromText . decodeUtf8 =<< lookup str (requestHeaders request) let mheader = case lookup str (requestHeaders request) of
Nothing -> Right Nothing
Just x -> case fromText $ decodeUtf8 x of
Nothing -> Left $ "Failed to decode " <> headerVal <> " header"
Just v -> Right $ Just v
in route (Proxy :: Proxy sublayout) (feedTo subserver mheader) in route (Proxy :: Proxy sublayout) (feedTo subserver mheader)
where str = fromString $ symbolVal (Proxy :: Proxy sym) where headerVal = symbolVal (Proxy :: Proxy sym)
str = fromString headerVal
-- | When implementing the handler for a 'Post' endpoint, -- | When implementing the handler for a 'Post' endpoint,
-- just like for 'Servant.API.Delete.Delete', 'Servant.API.Get.Get' -- just like for 'Servant.API.Delete.Delete', 'Servant.API.Get.Get'

12
servant-server/test/Servant/ServerSpec.hs
View file

@ -452,13 +452,13 @@ headerApi = Proxy
headerSpec :: Spec headerSpec :: Spec
headerSpec = describe "Servant.API.Header" $ do headerSpec = describe "Servant.API.Header" $ do
let expectsInt :: Maybe Int -> EitherT ServantErr IO () let expectsInt :: Either String (Maybe Int) -> EitherT ServantErr IO ()
expectsInt (Just x) = when (x /= 5) $ error "Expected 5" expectsInt (Right (Just x)) = when (x /= 5) $ error "Expected 5"
expectsInt Nothing = error "Expected an int" expectsInt _ = error "Expected an int"
let expectsString :: Maybe String -> EitherT ServantErr IO () let expectsString :: Either String (Maybe String) -> EitherT ServantErr IO ()
expectsString (Just x) = when (x /= "more from you") $ error "Expected more from you" expectsString (Right (Just x)) = when (x /= "more from you") $ error "Expected more from you"
expectsString Nothing = error "Expected a string" expectsString _ = error "Expected a string"
with (return (serve headerApi expectsInt)) $ do with (return (serve headerApi expectsInt)) $ do
let delete' x = Test.Hspec.Wai.request methodDelete x [("MyHeader" ,"5")] let delete' x = Test.Hspec.Wai.request methodDelete x [("MyHeader" ,"5")]