Skip to content

Make param remove Query once all parameters have been consumed #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 9, 2020
Merged

Make param remove Query once all parameters have been consumed #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/Routing/Match.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,12 @@ param key = Match \route ->
case M.lookup key map of
Nothing ->
invalid $ free $ KeyNotFound key
Just el ->
pure $ Tuple (Cons (Query <<< M.delete key $ map) rs) el
Just el -> do
let remainingParams = M.delete key map
pure $
if M.isEmpty remainingParams
then Tuple rs el
else Tuple (Cons (Query remainingParams) rs) el
_ ->
invalid $ free ExpectedQuery

Expand Down
6 changes: 5 additions & 1 deletion test/Test/Main.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ instance showMyRoutes :: Show MyRoutes where show = genericShow
routing :: Match MyRoutes
routing = oneOf
[ Foo <$> (lit "foo" *> num) <*> params
, Bar <$> (lit "bar" *> bool) <*> (param "baz")
, Bar <$> (lit "bar" *> bool) <*> (param "baz") <* end
, Baz <$> (lit "list" *> list num)
, Quux <$> (lit "" *> lit "quux" *> int)
, Corge <$> (lit "corge" *> str)
Expand All @@ -57,6 +57,10 @@ main = do
{ actual: match routing "bar/true?baz=test"
, expected: Right (Bar true "test")
}
assertEqual
{ actual: lmap (const unit) (match routing "bar/true?baz=test&oof=true")
, expected: Left unit
}
assertEqual
{ actual: match routing "bar/false?baz=%D0%B2%D1%80%D0%B5%D0%BC%D0%B5%D0%BD%D0%BD%D1%8B%D0%B9%20%D1%84%D0%B0%D0%B9%D0%BB"
, expected: Right (Bar false "временный файл")
Expand Down