git.iko.soy/typeable/bloodhound
on master help sign in
Fix V5 content-type header warning
commite34d30285bf9999eb1976f5fe7af80a9d152f9f1 authorChris Allen <cma@bitemyapp.com> dateThu 3 Aug 2017, 22:35 (9 years ago) parent1ef8115
8 files changed+51−11
compare with master
unifiedsplit
.travis.yml+2−2 Makefile+8−2 bloodhound.cabal+1−1 examples/Makefile+5 examples/Tweet.hs+1−2 examples/stack.yaml+20 src/Database/V1/Bloodhound/Client.hs+5−2 src/Database/V5/Bloodhound/Client.hs+9−2
.travis.yml+2−2
@@ -15,8 +15,8 @@ env:
1515 - GHCVER=7.8 ESVER=1.4.1 STACK_YAML=stack-7.8.yaml ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch
1616 - GHCVER=7.10 ESVER=1.5.2 STACK_YAML=stack-7.10.yaml ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch
1717 - GHCVER=7.10 ESVER=1.6.0 STACK_YAML=stack-7.10.yaml ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch
18− - GHCVER=7.10 ESVER=1.7.2 STACK_YAML=stack-7.10.yaml ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch
19− - GHCVER=8.0 ESVER=1.7.2 STACK_YAML=stack.yaml ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch
18+ - GHCVER=7.10 ESVER=1.7.6 STACK_YAML=stack-7.10.yaml ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch
19+ - GHCVER=8.0 ESVER=1.7.6 STACK_YAML=stack.yaml ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch
2020 - GHCVER=8.0 ESVER=5.0.2 STACK_YAML=stack.yaml ESFLAG=ES5 DLINK=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch ES_JAVA_OPTS="-Xms500m -Xmx750m"
2121
2222install:
Makefile+8−2
@@ -23,10 +23,16 @@ test: echo-warn
2323 STACK_YAML="stack-7.10.yaml" stack test
2424
25257.10-test-ES1:
26− STACK_YAML="stack-7.10.yaml" stack test bloodhound:tests --test-arguments="--qc-max-success 500" --flag bloodhound:ES1
26+ STACK_YAML="stack-7.10.yaml" stack test --fast bloodhound:tests --test-arguments="--qc-max-success 500" --flag bloodhound:ES1
2727
28287.10-test-ES5:
29− STACK_YAML="stack-7.10.yaml" stack test bloodhound:tests --test-arguments="--qc-max-success 500" --flag bloodhound:ES5
29+ STACK_YAML="stack-7.10.yaml" stack test --fast bloodhound:tests --test-arguments="--qc-max-success 500" --flag bloodhound:ES5
30+
31+8.0-test-ES1:
32+ STACK_YAML="stack.yaml" stack test --fast bloodhound:tests --test-arguments="--qc-max-success 500" --flag bloodhound:ES1
33+
34+8.0-test-ES5:
35+ STACK_YAML="stack-8.0.yaml" stack test --fast bloodhound:tests --test-arguments="--qc-max-success 500" --flag bloodhound:ES5
3036
31378.0-build:
3238 STACK_YAML="stack-8.0.yaml" stack build
bloodhound.cabal+1−1
@@ -1,5 +1,5 @@
11name: bloodhound
2−version: 0.14.0.0
2+version: 0.14.0.1
33synopsis: ElasticSearch client library for Haskell
44description: ElasticSearch made awesome for Haskell hackers
55homepage: https://github.com/bitemyapp/bloodhound
examples/Makefilenew file+5
@@ -0,0 +1,5 @@
1+build:
2+ stack build
3+
4+ghci:
5+ stack ghci
examples/Tweet.hs+1−2
@@ -15,7 +15,7 @@ import Data.Text (Text)
1515import Data.Time.Calendar (Day (..))
1616import Data.Time.Clock (UTCTime (..), secondsToDiffTime)
1717import qualified Data.Vector as V
18−import Database.V1.Bloodhound
18+import Database.V5.Bloodhound
1919import GHC.Generics (Generic)
2020import Network.HTTP.Client (defaultManagerSettings)
2121-------------------------------------------------------------------------------
@@ -71,7 +71,6 @@ instance FromJSON Location where
7171 parseJSON = genericParseJSON defaultOptions
7272
7373
74−-------------------------------------------------------------------------------
7574main :: IO ()
7675main = runBH' $ do
7776 -- set up index
examples/stack.yamlnew file+20
@@ -0,0 +1,20 @@
1+flags:
2+ bloodhound-examples:
3+ werror: false
4+
5+packages:
6+- '.'
7+- '..'
8+# extra-deps:
9+# - http-client-0.5.0
10+# - aeson-1.2.0.0
11+# - fail-4.9.0.0
12+# - http-types-0.9
13+# - attoparsec-0.13.0.1
14+# - quickcheck-properties-0.1
15+# - semigroups-0.18.3
16+# - uri-bytestring-0.1.9
17+# - temporary-resourcet-0.1.0.0
18+# - transformers-compat-0.5.1.4
19+
20+resolver: lts-8.14
src/Database/V1/Bloodhound/Client.hs+5−2
@@ -151,8 +151,11 @@ dispatch dMethod url body = do
151151 initReq <- liftIO $ parseUrl' url
152152 reqHook <- bhRequestHook A.<$> getBHEnv
153153 let reqBody = RequestBodyLBS $ fromMaybe emptyBody body
154− req <- liftIO $ reqHook $ setRequestIgnoreStatus $ initReq { method = dMethod
155− , requestBody = reqBody }
154+ req <- liftIO
155+ $ reqHook
156+ $ setRequestIgnoreStatus
157+ $ initReq { method = dMethod
158+ , requestBody = reqBody }
156159 mgr <- bhManager <$> getBHEnv
157160 liftIO $ httpLbs req mgr
158161
src/Database/V5/Bloodhound/Client.hs+9−2
@@ -207,8 +207,15 @@ dispatch dMethod url body = do
207207 initReq <- liftIO $ parseUrl' url
208208 reqHook <- bhRequestHook A.<$> getBHEnv
209209 let reqBody = RequestBodyLBS $ fromMaybe emptyBody body
210− req <- liftIO $ reqHook $ setRequestIgnoreStatus $ initReq { method = dMethod
211− , requestBody = reqBody }
210+ req <- liftIO
211+ $ reqHook
212+ $ setRequestIgnoreStatus
213+ $ initReq { method = dMethod
214+ , requestHeaders =
215+ ("Content-Type", "application/json") : requestHeaders initReq
216+ , requestBody = reqBody }
217+ -- req <- liftIO $ reqHook $ setRequestIgnoreStatus $ initReq { method = dMethod
218+ -- , requestBody = reqBody }
212219 mgr <- bhManager <$> getBHEnv
213220 liftIO $ httpLbs req mgr
214221