Commit graph

88 commits

Author SHA1 Message Date
aaron levin
8e1bed96c6 Update auth combinators across projects, fix build 2016-01-16 18:32:00 +01:00
aaron levin
2e7778d1d6 Merge commit '8ecc3f07064a3a627b8e49fb182789c82cd9c5d7' into jkarni/config 2016-01-16 17:46:23 +01:00
Sönke Hahn
8ecc3f0706 server: added Config machinery 2016-01-16 17:05:25 +01:00
aaron levin
9e71d083e5 Fix post-merge build 2016-01-10 12:42:06 +01:00
aaron levin
1146d15f52 Merge branch 'shahn/config' into jkarni/config 2016-01-10 12:28:48 +01:00
aaron levin
9ffd709391 Add auth tests to servant-client 2016-01-09 19:15:35 +01:00
aaron levin
f9dcbdd7d4 obviate need for data families 2016-01-09 17:54:09 +01:00
aaron levin
ffeeffe745 Add auth support for servant-client 2016-01-09 17:34:27 +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
Julian K. Arni
f1b6603c52 Review fixes 2016-01-08 18:03:28 +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
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
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
Julian K. Arni
f8ea9ba8fe 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-07 12:51:30 +01:00
Julian K. Arni
c27efeca7e Simplify verb combinators.
Create a single 'Verb' combinator with parameters for status code and
        method. Make existing combinators type synonyms of 'Verb'.
2016-01-06 17:13:21 +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
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
c22b5d1938 Changelogs for matrix params 2015-10-13 21:46:52 +02:00
Julian K. Arni
40686be83a Rebase fixes 2015-10-13 21:45:22 +02:00
Julian K. Arni
2a894d861c -Wall fixes 2015-10-13 21:38:13 +02:00
Julian K. Arni
afc76b8f6c Remove MatrixParam.
In servant, servant-server, and servant-client.
2015-10-13 21:37:07 +02:00
Julian K. Arni
d9594e24b4 Rebase fix. 2015-10-11 21:47:31 +02:00
Julian K. Arni
ed3f2f1811 Update changelog 2015-10-11 21:12:05 +02:00
Julian K. Arni
c2a06bc090 More generous acceptable status codes for servant-client 2015-10-11 21:12:05 +02:00
Alp Mestanogullari
444a72eac6 Merge pull request #245 from arianvp/servant-client-hspec-discover-fix
Fix servant-client tests to properly use hspec-discover.
2015-10-10 02:40:24 +02:00
Arian van Putten
a08e644333 Add OVERLAPPING pragma to instances in ClientSpec 2015-10-09 00:48:03 +02:00
Julian Arni
3ce7c9758a Merge pull request #250 from fizruk/http-api-data
Use http-api-data
2015-10-08 23:16:09 +01:00
Nickolay Kudasov
2a7d110c17 Add version bounds for http-api-data 2015-10-08 16:21:02 +03:00
Julian K. Arni
7529d7f776 getLast (and last missing servant-client test) 2015-10-08 12:09:23 +02:00
Nickolay Kudasov
dfb5cc7713 Update changelogs 2015-10-08 01:15:30 +03:00
Nickolay Kudasov
40d2c68897 Use http-api-data package instead of ToText/FromText 2015-10-08 00:38:47 +03:00
Julian K. Arni
110196e23f Fix path concatenation, Eq instance, for BaseUrl 2015-10-07 21:07:07 +02:00
Arian van Putten
568254d5c7 Add entry to changelog 2015-10-07 20:02:46 +02:00
Julian K. Arni
47f4cec53b Cleanup BaseUrl tests 2015-10-07 18:01:47 +02:00
Julian K. Arni
59d8824888 remove 'hspec' call in servant-client tests 2015-10-07 17:52:23 +02:00
Arian van Putten
fce1c8d2a4 WIP: Work on fixing servant-client tests 2015-10-06 14:32:25 +02:00
Arian van Putten
b389179590 Modify BaseUrl tests and add some new BaseUrl tests to check if paths are correctly used 2015-10-05 09:44:37 +02:00
Arian van Putten
8cf4acf2fc Fix servant-client tests to properly use hspec-discover.
For some reason hspec-discover wasn't enabled for servant-client,
causing test cases to be skipped and fasely reporting servant-client as
test-passing whilst it was actually supposed to fail the tests.

For example, we redefined BaseUrl recently to have a path field, but the
tests don't reflect that yet but passed anyway. Because the test case
wasn't even discovered and run.
2015-10-05 00:51:32 +02:00
Julian K. Arni
cd7906d72e Changelog updates and 7.8 fixes. 2015-09-28 18:24:27 +02:00
Julian K. Arni
de447dfe22 Pass in Manager as argument to 'client' 2015-09-28 16:34:53 +02:00
Index Int
c5257f42ab Depend on transformers-compat 2015-09-12 16:28:20 +03:00
Index Int
f2f7b061d2 Drop EitherT in favor of ExceptT 2015-09-12 15:11:24 +03:00
Jonathan Lange
6a35a0ae7a Remove auto-generated nix files 2015-09-08 20:36:54 +01:00
Jonathan Lange
a265fd31a0 Run of update-nix-files.sh 2015-09-08 20:28:47 +01:00
Taylor Fausak
4238a58f92 Fix #203; add path to BaseUrl 2015-08-25 08:42:13 -05:00
Julian K. Arni
6eb7add53a stylish haskell changes
And import fix.
2015-08-18 00:07:12 +02:00
Julian K. Arni
98b6e85128 Contributing 2015-08-17 23:50:42 +02:00
Brandon Martin
b40094d01c convenience scripts and nix updates 2015-07-30 08:09:29 -06:00