packages feed

trasa-server 0.2 → 0.4

raw patch · 5 files changed

+117/−241 lines, 5 filesdep −doctestdep −http-clientdep −tastydep ~basedep ~bytestringdep ~containersnew-uploader

Dependencies removed: doctest, http-client, tasty, tasty-hunit, tasty-quickcheck, trasa-server, vinyl, warp

Dependency ranges changed: base, bytestring, containers, http-media, http-types, text, trasa

Files

LICENSE view
@@ -1,30 +1,8 @@-Copyright Andrew Martin (c) 2017--All rights reserved.--Redistribution and use in source and binary forms, with or without-modification, are permitted provided that the following conditions are met:--    * Redistributions of source code must retain the above copyright-      notice, this list of conditions and the following disclaimer.+Copyright 2017-2019 Andrew Martin+Copyright 2017-2019 Kyle McKean -    * Redistributions in binary form must reproduce the above-      copyright notice, this list of conditions and the following-      disclaimer in the documentation and/or other materials provided-      with the distribution.+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -    * Neither the name of Andrew Martin nor the names of other-      contributors may be used to endorse or promote products derived-      from this software without specific prior written permission.+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
src/Trasa/Server.hs view
@@ -1,19 +1,15 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE LambdaCase #-}-{-# LANGUAGE DataKinds #-}-{-# LANGUAGE PolyKinds #-}-{-# LANGUAGE GADTs #-}-{-# LANGUAGE TypeOperators #-}-{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE RankNTypes #-}-{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE DeriveFunctor #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-}+{-# LANGUAGE ScopedTypeVariables #-}  {-# OPTIONS_GHC -Wall -Werror #-} module Trasa.Server   ( TrasaT   , runTrasaT+  , mapTrasaT   , serveWith   ) where @@ -24,6 +20,7 @@ import Network.HTTP.Types.Header (hAccept,hContentType) import qualified Network.HTTP.Types.Status as N import qualified Network.HTTP.Media.Accept as N+import qualified Network.HTTP.Media.MediaType as N import qualified Network.HTTP.Media.RenderHeader as N import Data.CaseInsensitive (CI) import qualified Network.Wai as WAI@@ -31,9 +28,9 @@ import qualified Data.Text as T import qualified Data.Text.Encoding as TE import qualified Data.Map.Strict as M-import Control.Monad.Reader (ReaderT,runReaderT,MonadReader(..),MonadTrans(..))-import Control.Monad.Except (ExceptT,runExceptT,MonadError(..),MonadIO(..))-import Control.Monad.State.Strict (StateT,runStateT,MonadState(..))+import Control.Monad.Reader (ReaderT,runReaderT,mapReaderT,MonadReader(..),MonadTrans(..))+import Control.Monad.Except (ExceptT,runExceptT,mapExceptT,MonadError(..),MonadIO(..))+import Control.Monad.State.Strict (StateT,runStateT,mapStateT,MonadState(..))  import Trasa.Core @@ -59,13 +56,11 @@   -> m (Either TrasaErr a, M.Map (CI BS.ByteString) T.Text) runTrasaT trasa headers = (flip runReaderT headers . flip runStateT M.empty . runExceptT  . unTrasaT) trasa +mapTrasaT :: (forall x. m x -> n x) -> TrasaT m a -> TrasaT n a+mapTrasaT eta = TrasaT . mapExceptT (mapStateT (mapReaderT eta)) . unTrasaT+ serveWith-  :: (forall caps qrys req resp. route caps qrys req resp -> Rec (Query CaptureDecoding) qrys)-  -- ^ How to decode the query parameters from a route-  -> (forall caps qrys req resp. route caps qrys req resp -> RequestBody (Many BodyDecoding) req)-  -- ^ How to decode the request body from a route-  -> (forall caps qrys req resp. route caps qrys req resp -> ResponseBody (Many BodyEncoding) resp)-  -- ^ How to encode the response body from a route+  :: (forall caps qrys req resp. route caps qrys req resp -> MetaServer caps qrys req resp)   -> (forall caps qrys req resp.          route caps qrys req resp       -> Rec Identity caps@@ -75,7 +70,7 @@   -- ^ Actions to perform when requests come in   -> Router route -- ^ Router   -> WAI.Application -- ^ WAI Application-serveWith toQuerys toReqBody toRespBody makeResponse router =+serveWith toMeta makeResponse madeRouter =   \req respond ->     case decodeMethod <$> TE.decodeUtf8' (WAI.requestMethod req) of       Left _ -> respond (WAI.responseLBS N.status400 [] "Non utf8 encoded request method")@@ -87,7 +82,7 @@             content <- for (M.lookup hContentType headers >>= N.parseAccept . TE.encodeUtf8) $ \typ ->               Content typ <$> WAI.strictRequestBody req             let url = Url (WAI.pathInfo req) (decodeQuery (WAI.queryString req))-                dispatch = dispatchWith toQuerys toReqBody toRespBody makeResponse router method accepts url content+                dispatch = dispatchWith toMeta makeResponse madeRouter method accepts url content             runTrasaT dispatch headers >>= \case               (resErr,newHeaders) -> case join resErr of                 Left (TrasaErr stat errBody) ->@@ -99,6 +94,8 @@   where     encodeHeaders = M.toList . fmap TE.encodeUtf8     parseHeaders = traverse TE.decodeUtf8' . M.fromList . WAI.requestHeaders-    parseAccepts headers = do-      accept <- M.lookup hAccept headers-      (traverse N.parseAccept . fmap (TE.encodeUtf8 . T.dropAround (' '==)) . T.splitOn ",") accept+    parseAccepts :: Headers+                 -> Maybe [N.MediaType]+    parseAccepts headers = case M.lookup hAccept headers of+      Nothing -> Just ["*/*"]+      Just accept -> (traverse N.parseAccept . fmap (TE.encodeUtf8 . T.dropAround (' '==)) . T.splitOn ",") accept
+ src/Trasa/Server/Implicit.hs view
@@ -0,0 +1,35 @@+{-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE RankNTypes #-}+{-# LANGUAGE TypeFamilies #-}+module Trasa.Server.Implicit+  (+    serve+  ) where++import Data.Functor.Identity (Identity)+import qualified Network.Wai as WAI++import Trasa.Core+import Trasa.Core.Implicit+import Trasa.Server++serve+  :: ( HasMeta route+     , HasCaptureDecoding (CaptureStrategy route)+     , HasCaptureDecoding (QueryStrategy route)+     , RequestBodyStrategy route ~ Many requestBodyStrat+     , HasBodyDecoding requestBodyStrat+     , ResponseBodyStrategy route ~ Many responseBodyStrat+     , HasBodyEncoding responseBodyStrat+     , EnumerableRoute route )+  => (forall caps qrys req resp+     .  route caps qrys req resp+     -> Rec Identity caps+     -> Rec Parameter qrys+     -> RequestBody Identity req+     -> TrasaT IO resp)+  -> WAI.Application+serve makeResponse = serveWith (transformMeta . meta) makeResponse router+  where transformMeta = mapMeta captureDecoding captureDecoding (mapMany bodyDecoding) (mapMany bodyEncoding)++
− test/Main.hs 
@@ -1,153 +0,0 @@-{-# LANGUAGE OverloadedStrings #-}-{-# LANGUAGE DataKinds #-}-{-# LANGUAGE KindSignatures #-}-{-# LANGUAGE GADTs #-}-{-# LANGUAGE TypeOperators #-}-{-# LANGUAGE FlexibleInstances #-}-{-# LANGUAGE FlexibleContexts #-}--import Trasa.Core-import qualified Trasa.Method as M-import Trasa.Server-import Data.Vinyl-import Data.Functor.Identity-import Data.Kind (Type)-import Text.Read (readMaybe)-import Network.Wai.Handler.Warp (withApplication)-import qualified Data.Text as T-import qualified Data.ByteString.Lazy.Char8 as LBSC-import qualified Network.HTTP.Client as HC--main :: IO ()-main = do-  putStrLn "\nStarting trasa server test suite"-  let app = serveWith-        (mapQuery captureCodecToCaptureDecoding . metaQuery . meta)-        (mapRequestBody (Many . pure . bodyCodecToBodyDecoding) . metaRequestBody . meta)-        (mapResponseBody (Many . pure . bodyCodecToBodyEncoding) . metaResponseBody . meta)-        handle-        router-  withApplication (return app) $ \port -> do-    manager <- HC.newManager HC.defaultManagerSettings-    attempt manager ("GET http://127.0.0.1:" ++ show port ++ "/") $ \x -> x-      { HC.requestHeaders = [("Accept","text/plain"),("ContentType","*/*")]-      }-    attempt manager ("GET http://127.0.0.1:" ++ show port ++ "/hello") $ \x -> x-      { HC.requestHeaders = [("Accept","text/plain"),("ContentType","text/plain")]-      }-    return ()--attempt :: HC.Manager -> String -> (HC.Request -> HC.Request) -> IO ()-attempt mngr url modify = do-  req <- HC.parseUrlThrow url-  let req' = modify req-  _ <- HC.httpLbs req' mngr-  return ()--handle :: Route caps qrys req resp -> Rec Identity caps -> Rec Parameter qrys -> RequestBody Identity req -> TrasaT IO resp-handle r = case r of-  EmptyR -> \_ _ _ -> return (55 :: Int)-  HelloR -> \_ _ _ -> return (67 :: Int)--data Route :: [Type] -> [Param] -> Bodiedness -> Type -> Type where-  EmptyR :: Route '[] '[] Bodyless Int-  HelloR :: Route '[] '[] Bodyless Int-  AdditionR :: Route '[Int,Int] '[Optional Int] Bodyless Int-  IdentityR :: Route '[String] '[] Bodyless String-  LeftPadR :: Route '[Int] '[] (Body String) String-  TrickyOneR :: Route '[Int] '[] Bodyless String-  TrickyTwoR :: Route '[Int,Int] '[] Bodyless String---prepare :: Route cs qs rq rp -> Arguments cs qs rq (Prepared Route rp)-prepare = prepareWith (metaPath . meta) (metaQuery . meta) (metaRequestBody . meta)--link :: Prepared Route rp -> Url-link = linkWith-  (mapPath (CaptureEncoding . captureCodecEncode) . metaPath . meta)-  (mapQuery captureCodecToCaptureEncoding . metaQuery . meta)--parse :: T.Text -> Maybe Content -> Either TrasaErr (Concealed Route)-parse url = parseWith-  (mapQuery captureCodecToCaptureDecoding . metaQuery . meta)-  (mapRequestBody (Many . pure . bodyCodecToBodyDecoding) . metaRequestBody . meta)-  router-  M.get-  (decodeUrl url)--allRoutes :: [Constructed Route]-allRoutes =-  [ Constructed HelloR-  , Constructed AdditionR-  , Constructed IdentityR-  , Constructed LeftPadR-  , Constructed TrickyOneR-  , Constructed TrickyTwoR-  , Constructed EmptyR-  ]--router :: Router Route-router = routerWith-  (metaMethod . meta)-  (mapPath (CaptureDecoding . captureCodecDecode) . metaPath . meta)-  allRoutes--data Meta ps qs rq rp = Meta-  { metaPath :: Path CaptureCodec ps-  , metaQuery :: Rec (Query CaptureCodec) qs-  , metaRequestBody :: RequestBody BodyCodec rq-  , metaResponseBody :: ResponseBody BodyCodec rp-  , metaMethod :: Method-  }--meta :: Route ps qs rq rp -> Meta ps qs rq rp-meta x = case x of-  EmptyR -> Meta-    end-    qend-    bodyless (resp bodyInt) M.get-  HelloR -> Meta-    (match "hello" ./ end)-    qend-    bodyless (resp bodyInt) M.get-  AdditionR -> Meta-    (match "add" ./ capture int ./ capture int ./ end)-    (optional "more" int .& qend)-    bodyless (resp bodyInt) M.get-  IdentityR -> Meta-    (match "identity" ./ capture string ./ end)-    qend-    bodyless (resp bodyString) M.get-  LeftPadR -> Meta-    (match "pad" ./ match "left" ./ capture int ./ end)-    qend-    (body bodyString) (resp bodyString) M.get-  TrickyOneR -> Meta-    (match "tricky" ./ capture int ./ match "one" ./ end)-    qend-    bodyless (resp bodyString) M.get-  TrickyTwoR -> Meta-    (capture int ./ capture int ./ match "two" ./ end)-    qend-    bodyless (resp bodyString) M.get---int :: CaptureCodec Int-int = CaptureCodec (T.pack . show) (readMaybe . T.unpack)--string :: CaptureCodec String-string = CaptureCodec T.pack (Just . T.unpack)--bodyString :: BodyCodec String-bodyString = BodyCodec (pure "text/plain") LBSC.pack (Right . LBSC.unpack)--bodyUnit :: BodyCodec ()-bodyUnit = BodyCodec (pure "text/plain") (const "") (const (Right ()))--note :: e -> Maybe a -> Either e a-note e Nothing = Left e-note _ (Just x) = Right x--bodyInt :: BodyCodec Int-bodyInt = BodyCodec (pure "text/plain") (LBSC.pack . show)-                    (note "Could not decode int" . readMaybe . LBSC.unpack)
trasa-server.cabal view
@@ -1,52 +1,71 @@-name: trasa-server-version: 0.2-synopsis: Type safe web server-homepage: https://github.com/haskell-trasa/trasa#readme-license: BSD3-license-file: LICENSE-author: Kyle McKean-maintainer: mckean.kylej@gmail.com-copyright: 2017 Kyle McKean-category: Web-build-type: Simple-cabal-version: >=1.10-description: WAI integration for trasa+cabal-version: 2.2+name:+  trasa-server+version:+  0.4+synopsis:+  Type safe web server+description:+  WAI integration for trasa+homepage:+  https://github.com/haskell-trasa/trasa+author:+  Andrew Martin+  Kyle McKean+maintainer:+  Andrew Martin <andrew.thaddeus@gmail.com>+  Kyle McKean <mckean.kylej@gmail.com>+  chessai <chessai1996@gmail.com>+license:+  MIT+license-file:+  LICENSE+copyright:+  © 2017-2019 Andrew Martin+  © 2017-2019 Kyle McKean+category:+  Web+build-type:+  Simple  library-  hs-source-dirs: src+  hs-source-dirs:+    src   exposed-modules:-    Trasa.Server+      Trasa.Server+    , Trasa.Server.Implicit   build-depends:-      base >= 4.7 && < 5+    , base >= 4.9 && < 5     , bytestring == 0.10.*-    , text == 1.2.*-    , wai == 3.2.*-    , http-types == 0.9.*-    , http-media == 0.6.*     , case-insensitive == 1.2.*-    , containers == 0.5.*+    , containers >= 0.5 && < 0.7+    , http-media >= 0.6 && < 0.8+    , http-types >= 0.9      , mtl == 2.2.*-    , trasa == 0.2.*-  default-language: Haskell2010+    , text == 1.2.*+    , trasa == 0.4.*+    , wai == 3.2.*+  default-language:+    Haskell2010 -test-suite test-  type: exitcode-stdio-1.0-  hs-source-dirs: test-  main-is: Main.hs-  build-depends: -      base-    , trasa-    , trasa-server-    , tasty-    , tasty-quickcheck-    , tasty-hunit-    , bytestring-    , text-    , vinyl-    , doctest-    , warp-    , http-client-  default-language: Haskell2010+--test-suite test+--  type: exitcode-stdio-1.0+--  hs-source-dirs: test+--  main-is: Main.hs+--  build-depends: +--      base+--    , trasa+--    , trasa-server+--    , tasty+--    , tasty-quickcheck+--    , tasty-hunit+--    , bytestring+--    , text+--    , quantification+--    , doctest+--    , warp+--    , http-client+--  default-language: Haskell2010  source-repository head   type:     git