Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Sessions Example complete; Added transformer layering
- Loading branch information
Showing
14 changed files
with
390 additions
and
121 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| module Geordi.HandlerTable (HandlerTable, singleton, runTable) where | ||
| module Geordi.HandlerTable (HandlerTable, singleton, runTable, monadSuffixTable) where | ||
|
|
||
| import Geordi.HandlerTable.Internal | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,77 +1,93 @@ | ||
| {-# LANGUAGE GeneralizedNewtypeDeriving, DataKinds, GADTs, RankNTypes, KindSignatures, TypeOperators, OverloadedStrings #-} | ||
| {-# LANGUAGE GeneralizedNewtypeDeriving, DataKinds, GADTs, RankNTypes, KindSignatures, TypeOperators, OverloadedStrings,ScopedTypeVariables #-} | ||
| module Geordi.TableBuilder.Internal where | ||
|
|
||
| import Geordi.HandlerTable | ||
| import Geordi.UrlPattern | ||
| import Geordi.Handler | ||
|
|
||
| import Control.Arrow | ||
| import Control.Monad.Reader | ||
| import Control.Monad.Writer | ||
| import Control.Monad.Reader | ||
| import Control.Monad.Writer | ||
| import Control.Applicative | ||
|
|
||
| data GenUrlPattern (f :: * ) (x :: [SegmentType *]) where | ||
| data GenUrlPattern (f :: * ) (x :: [SegmentType *]) where | ||
| Generalise :: (forall m. UrlPattern m f x) -> GenUrlPattern f x | ||
|
|
||
| interpret :: GenUrlPattern f x -> UrlPattern m f x | ||
| interpret (Generalise x) = x | ||
|
|
||
| newtype TableBuilder p s f x = TableBuilder (ReaderT (GenUrlPattern f p, GenUrlPattern f s) (Writer (HandlerTable f)) x) | ||
| newtype TableBuilder m p s f x = TableBuilder (ReaderT (GenUrlPattern f p, GenUrlPattern f s) (Writer (HandlerTable m f)) x) | ||
| deriving ( Functor | ||
| , Monad | ||
| , Applicative | ||
| , MonadWriter (HandlerTable f) | ||
| , MonadWriter (HandlerTable m f) | ||
| , MonadFix | ||
| ) | ||
|
|
||
| prefix :: (forall m. UrlPattern m f n) -> TableBuilder (p :++: n) s f x -> TableBuilder p s f x | ||
| prefix p (TableBuilder x) | ||
| prefix :: (forall method. UrlPattern method f n) -> TableBuilder m (p :++: n) s f x -> TableBuilder m p s f x | ||
| prefix p (TableBuilder x) | ||
| = do (Generalise v, s) <- TableBuilder ask | ||
| let (r,w) = runWriter $ flip runReaderT (Generalise (v // p), s) x | ||
| tell w | ||
| return r | ||
|
|
||
| suffix :: (forall m. UrlPattern m f n) -> TableBuilder p (s :++: n) f x -> TableBuilder p s f x | ||
| suffix p (TableBuilder x) | ||
| suffix :: (forall method. UrlPattern method f n) -> TableBuilder m p (s :++: n) f x -> TableBuilder m p s f x | ||
| suffix p (TableBuilder x) | ||
| = do (px, Generalise v) <- TableBuilder ask | ||
| let (r, w) = runWriter $ flip runReaderT (px, Generalise (v // p)) x | ||
| tell w | ||
| return r | ||
|
|
||
| add :: Handler f u -> TableBuilder p s f () | ||
| add :: Handler m f u -> TableBuilder m p s f () | ||
| add = tell . singleton | ||
|
|
||
| monadSuffix :: forall m2 m f n p s x. (MonadHandler m2 f, MonadHandler m f) | ||
| => (forall method. UrlPattern method f n) | ||
| -> (m HandlerStatus -> Types n :--> m2 HandlerStatus) | ||
| -> TableBuilder m p s f x | ||
| -> TableBuilder m2 p s f x | ||
| monadSuffix p ml (TableBuilder rtw) = let f :: Handler m f ts -> Handler m2 f (ts :++: n) | ||
| f = monadSuffixH p ml | ||
| g :: HandlerTable m f -> HandlerTable m2 f | ||
| g = monadSuffixTable p f | ||
| in TableBuilder $ do x <- ask | ||
| lift $ mapWriter (second g) (runReaderT rtw x) | ||
| -- | Adds a handler to the table and returns it | ||
| handle :: MethodSingleton m -- ^ 'MethodGet' or 'MethodPost', indicating the HTTP method this handler will require | ||
| -> UrlPattern m f ts -- ^ A 'UrlPattern' for this handler to check requests against | ||
| -> (Types ((prefix :++: ts) :++: suffix) :--> HandlerM f HandlerStatus) -- ^ An action to execute if the pattern matches | ||
| -> TableBuilder prefix suffix f (Handler f ((prefix :++: ts) :++: suffix)) -- ^ Action that returns the handler and adds it to the table | ||
| handle :: (MonadHandler m f) | ||
| => MethodSingleton method -- ^ 'MethodGet' or 'MethodPost', indicating the HTTP method this handler will require | ||
| -> UrlPattern method f ts -- ^ A 'UrlPattern' for this handler to check requests against | ||
| -> (Types ((prefix :++: ts) :++: suffix) :--> m HandlerStatus) -- ^ An action to execute if the pattern matches | ||
| -> TableBuilder m prefix suffix f (Handler m f ((prefix :++: ts) :++: suffix)) -- ^ Action that returns the handler and adds it to the table | ||
| handle m p a | ||
| = do (px, sx) <- (interpret *** interpret) | ||
| <$> (TableBuilder ask :: TableBuilder prefix suffix f (GenUrlPattern f prefix, GenUrlPattern f suffix)) | ||
| let pattern = ((px // p) // sx) | ||
| = do (px, sx) <- (interpret *** interpret) | ||
| <$> (TableBuilder ask :: TableBuilder m prefix suffix f (GenUrlPattern f prefix, GenUrlPattern f suffix)) | ||
| let pattern = ((px // p) // sx) | ||
| let x = Handler m pattern a | ||
| add x | ||
| return x | ||
|
|
||
|
|
||
| -- | Simply 'handle' 'MethodGet' | ||
| get :: UrlPattern GET f ts -- ^ Url pattern | ||
| -> (Types ((prefix :++: ts) :++: suffix) :--> HandlerM f HandlerStatus) -- ^ Handler action | ||
| -> TableBuilder prefix suffix f (Handler f ((prefix :++: ts) :++: suffix)) | ||
| get :: (MonadHandler m f) | ||
| => UrlPattern GET f ts -- ^ Url pattern | ||
| -> (Types ((prefix :++: ts) :++: suffix) :--> m HandlerStatus) -- ^ Handler action | ||
| -> TableBuilder m prefix suffix f (Handler m f ((prefix :++: ts) :++: suffix)) | ||
| get = handle MethodGet | ||
| -- | Simply 'handle' 'MethodPost' | ||
| post :: UrlPattern POST f ts -- ^ Url pattern | ||
| -> (Types ((prefix :++: ts) :++: suffix) :--> HandlerM f HandlerStatus) -- ^ Handler action | ||
| -> TableBuilder prefix suffix f (Handler f ((prefix :++: ts) :++: suffix)) | ||
| post :: (MonadHandler m f) | ||
| => UrlPattern POST f ts -- ^ Url pattern | ||
| -> (Types ((prefix :++: ts) :++: suffix) :--> m HandlerStatus) -- ^ Handler action | ||
| -> TableBuilder m prefix suffix f (Handler m f ((prefix :++: ts) :++: suffix)) | ||
| post = handle MethodPost | ||
| -- | Simply 'handle' 'MethodAny' | ||
| request :: UrlPattern AnyMethod f ts -- ^ Url pattern | ||
| -> (Types ((prefix :++: ts) :++: suffix) :--> HandlerM f HandlerStatus) -- ^ Handler action | ||
| -> TableBuilder prefix suffix f (Handler f ((prefix :++: ts) :++: suffix)) | ||
| request :: (MonadHandler m f) | ||
| => UrlPattern AnyMethod f ts -- ^ Url pattern | ||
| -> (Types ((prefix :++: ts) :++: suffix) :--> m HandlerStatus) -- ^ Handler action | ||
| -> TableBuilder m prefix suffix f (Handler m f ((prefix :++: ts) :++: suffix)) | ||
| request = handle MethodAny | ||
|
|
||
| buildTable :: TableBuilder '[] '[] f r -> (r, HandlerTable f) | ||
| buildTable :: TableBuilder m '[] '[] f r -> (r, HandlerTable m f) | ||
| buildTable (TableBuilder x) = runWriter | ||
| . flip runReaderT (Generalise nil , Generalise nil ) | ||
| . flip runReaderT (Generalise nil , Generalise nil ) | ||
| $ x | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.