Commit graph

121 commits

Author SHA1 Message Date
Sönke Hahn
7bf389090b server/config: only have one combinator exposed (and renamings) 2016-01-14 23:32:25 +01:00
Sönke Hahn
4f78e487a4 server/config: tiny tweak 2016-01-14 22:28:43 +01:00
Sönke Hahn
58b43cf64c server: add test modules to cabal file 2016-01-13 21:44:16 +01:00
Sönke Hahn
cebcfc0b4c typo in comment 2016-01-13 21:44:16 +01:00
Sönke Hahn
6ca120f08f server: use {c,C}onfig instead of {c,C}fg everywhere 2016-01-13 21:44:12 +01:00
Sönke Hahn
d8db0fa779 server/config: add an experimental Descend combinator 2016-01-13 21:22:01 +01:00
Sönke Hahn
56c8fbea02 server/tests: tiny refactoring 2016-01-13 19:15:38 +01:00
Sönke Hahn
94dbfd4fde whitespace change 2016-01-13 19:13:53 +01:00
Sönke Hahn
7de2f79daf server/cabal: remove unneded dependency 2016-01-13 19:10:11 +01:00
Sönke Hahn
4a2a27d147 tests: style of test names 2016-01-13 19:07:36 +01:00
Sönke Hahn
eb286d4741 servant/config: remove unused language pragmas 2016-01-13 19:05:23 +01:00
Sönke Hahn
eb201517ed server/config: remove unneeded signature 2016-01-13 18:54:25 +01:00
Sönke Hahn
81f8c43531 server/config: moved code around 2016-01-13 17:25:16 +01:00
Sönke Hahn
787c5b55a0 server/config: remove general tagging from Config 2016-01-13 16:54:15 +01:00
Sönke Hahn
188f4eca5f server/config: implement descending into subconfigs 2016-01-13 16:26:12 +01:00
Sönke Hahn
c3d8b1eda6 server/config: always tag, but provide (.:.) for convenience 2016-01-13 15:58:28 +01:00
Sönke Hahn
5e7d1c1081 server/config: allow injecting tagged config entries 2016-01-13 15:40:40 +01:00
Sönke Hahn
d5441f4871 server/config: added test for a combinator that puts an entry into the config 2016-01-13 15:30:48 +01:00
Sönke Hahn
6eab78a79b server/config: some refactoring 2016-01-11 14:10:15 +01:00
Sönke Hahn
deb6b89cc7 server/config: implemented Config with optionally tagged entries 2016-01-11 13:59:23 +01:00
Sönke Hahn
678914209a fix travis 2016-01-11 02:13:48 +01:00
Sönke Hahn
d74a458eed remove unneeded imports 2016-01-10 16:59:12 +01:00
Sönke Hahn
88dda2f9c6 server/config: renamings 2016-01-10 16:50:17 +01:00
Sönke Hahn
9dc022bcdd server/config: implemented newtypes instead of tags 2016-01-10 16:40:56 +01:00
Sönke Hahn
f5a0819990 server: add test cases for config using combinators 2016-01-10 15:59:33 +01:00
Sönke Hahn
1e4bd5feaa servant-server tests: tiny refactoring 2016-01-10 15:39:55 +01:00
Sönke Hahn
dcd2c8078c add test for using the Config machinery 2016-01-10 13:00:12 +01:00
aaron levin
eafc5d33bb Rename HList append from .: to .:.
Avoids conflicting with Data.Aeson.((.:))
2016-01-10 11:43:07 +01:00
Sönke Hahn
33cc9958ed Merge remote-tracking branch 'origin/master' into shahn/config
Conflicts:
	servant-server/test/Servant/ServerSpec.hs
2016-01-09 13:00:42 +01:00
Sönke Hahn
4384c1df07 remove debugging print 2016-01-09 12:34:52 +01:00
Sönke Hahn
66628ca043 config: added Show instance 2016-01-08 18:15:01 +01:00
Julian K. Arni
f1b6603c52 Review fixes 2016-01-08 18:03:28 +01:00
Sönke Hahn
5c863b2043 remove unneeded instances 2016-01-08 17:25:40 +01:00
Sönke Hahn
d99bde5fcd config: remove overlapping noise 2016-01-08 17:25:15 +01:00
Julian K. Arni
3cc3c5c986 Add HasCfg typeclass.
This is largely Aaron Levin's work. But it was done in a merge commit,
        so couldn't be cherry-picked in a sensible way. Thanks Aaron!
2016-01-08 17:12:07 +01:00
Julian K. Arni
da171780b8 Tests for Config. 2016-01-08 17:12:07 +01:00
Julian K. Arni
207a807428 Add Config parameter.
This allows combinator instances to receive dynamic data that isn't
        constrained by the interface of Delayed etc.
2016-01-08 17:12:07 +01:00
Julian K. Arni
783a849c67 Make NoContent still take an arg.
For consistency with other combinators, and to make using headers
        easier.
2016-01-07 14:30:08 +01:00
Julian K. Arni
5909a6df7a Fix rebase issues. 2016-01-07 13:47:08 +01:00
Julian K. Arni
c6071bfb02 Don't override status code on empty body. 2016-01-07 13:47:08 +01:00
Julian K. Arni
cda8bcf17c Simplify verb combinators.
Create a single 'Verb' combinator with parameters for status code and
        method. Make existing combinators type synonyms of 'Verb'.
2016-01-07 13:47:07 +01:00
Luigy Leon
17fcc25d87 add include header files to extra-source-files 2016-01-04 23:05:05 -05:00
Julian K. Arni
79d4f944a4 less OverlappingInstances noise 2016-01-04 13:09:11 -05:00
Julian K. Arni
a4a0f1988b Bump wai and warp upper bound to < 3.3. 2016-01-04 17:21:14 +01:00
Philipp Kant
da5c273640 Relaxed upper version bound for http-api-data ...
... in order to include http-api-data-0.2.1, which is currently in LTS
Haskell (lts-3.16).
2015-12-03 14:13:50 +01:00
Simon Hengel
4e53e2083b Use tinc on travis 2015-11-05 09:32:13 +08:00
Julian K. Arni
9c12b7839b 7.8 routing fixes, -Wall, cleanup, changelog. 2015-10-26 16:56:46 +01:00
Andres Loeh
1398d1f5e1 More systematic approach to delayed checks.
This introduces a `Delayed` type in `RoutingApplication.hs` that
contains a handler together with delayed checks. There are several
blocks of delayed checks, so that we can ultimately execute them in the
order we desire.

The process is documented in more detail in `RoutingApplication.hs`.
2015-10-26 16:56:25 +01:00
Julian K. Arni
ccadba81ec Cleanup errorspec description of routing, changelog.
Review fixes
2015-10-26 16:55:13 +01:00
Julian K. Arni
a3b5652ab9 Refactor RouteResult.
Fix rerouting tests
        Fix 405 > 404 issue with Capture.
        Remove ServantErrWithPriority and Monoid instance
        More tests
        Update auth-combinator for routing changes
2015-10-26 16:54:49 +01:00