Commit graph

1141 commits

Author SHA1 Message Date
Matt Bray
f2a91cfb1f servant-js: export CommonGeneratorOptions constructors
Allow defCommonGeneratorOptions to be customized using record update
syntax.

Without the re-export, we can't do:

```
import qualified Servant.JS as SJS

myOptions =
  SJS.defCommonGeneratorOptions
    { SJS.moduleName = "myModule"
    , SJS.urlPrefix = "http://localhost"
    }
```
2015-11-04 10:11:36 +00:00
Julian Arni
6c50beb0f8 Merge pull request #260 from freezeboy/clean-js
Replace servant-jquery with servant-js in remaining files
2015-11-03 19:39:54 +01:00
Freezeboy
b88981cf14 Replace servant-jquery with servant-js in remaining files 2015-11-02 19:59:46 +01:00
Julian Arni
6a4c967590 Merge pull request #218 from haskell-servant/jkarni/http-errors
Fix error priority and retries
2015-10-26 17:17:38 +01: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
Julian K. Arni
153de01a62 Error retry tests
Mime[Un]Render instances for PlainText String
        pragmas and formatting
2015-10-26 16:54:28 +01:00
Julian K. Arni
9c62a3b150 Error order tests 2015-10-20 12:41:32 +02:00
Julian Arni
c970b2bffe Merge pull request #252 from haskell-servant/jkarni/removeMatrix
Remove matrix
2015-10-14 08:52:08 +02: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
ec55f4b981 Remove Matrix params.
For servant-docs, -foreign, -js, and -mock.
2015-10-13 21:37:07 +02:00
Julian K. Arni
afc76b8f6c Remove MatrixParam.
In servant, servant-server, and servant-client.
2015-10-13 21:37:07 +02:00
Alp Mestanogullari
6ef59de6b4 Merge pull request #255 from haskell-servant/jkarni/bump-http-types
Bump upper bound for http-types.
2015-10-13 21:15:45 +02:00
Julian K. Arni
72acd1a19d Bump upper bound for http-types. 2015-10-13 20:53:56 +02:00
Julian Arni
0cf4a5407e Merge pull request #254 from zerobuzz/fmap-router
fmapRouter.
2015-10-13 09:37:28 +02:00
Matthias Fischmann
8f01efd599 Export tweakResponse from non-internal module; better haddock comment. 2015-10-12 21:58:06 +02:00
Matthias Fischmann
dd1d30843b Test case for tweakResponse. 2015-10-12 21:58:04 +02:00
Matthias Fischmann
f953d05212 Whitespace. 2015-10-12 21:47:50 +02:00
Matthias Fischmann
d106ed9c9f Use Functor class for functor business. 2015-10-12 21:47:47 +02:00
Matthias Fischmann
96f10add65 fmapRouter. 2015-10-12 17:06:43 +02:00
Julian Arni
80396c8e47 Merge pull request #249 from haskell-servant/jkarni/clientCodes
More generous acceptable status codes for servant-client
2015-10-11 22:02:54 +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
Julian K. Arni
ad39feb01e Fix 'Delete' documentation. 2015-10-11 21:08:45 +02:00
Alp Mestanogullari
5a032383bc update servant-server README 2015-10-10 19:31:03 +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
707e46a8aa Update resolver to the latest nightly 2015-10-08 16:21:22 +03:00
Nickolay Kudasov
2a7d110c17 Add version bounds for http-api-data 2015-10-08 16:21:02 +03:00
Julian Arni
05623f54d4 Merge pull request #243 from arianvp/foreign-text
Change servant-js and servant-foreign to use text
2015-10-08 13:59:14 +01: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
1e26ba25d1 Update http-api-data dependency 2015-10-08 00:57:39 +03:00
Nickolay Kudasov
63a36e3b4e Fix warning 2015-10-08 00:57:18 +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
Nickolay Kudasov
7b60fb68d5 Remove Servant.Common.Text 2015-10-07 18:42:56 +03:00
Julian Arni
9245c9f15c Merge pull request #244 from arianvp/travis-test-fix
Remove redundant build from .travis.yml file.
2015-10-07 13:51:09 +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