e34d302 · typeable/bloodhound

.travis.yml+2−2

@@ -15,8 +15,8 @@ env:

15 - GHCVER=7.8 ESVER=1.4.1 STACK_YAML=stack-7.8.yaml ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch

16 - GHCVER=7.10 ESVER=1.5.2 STACK_YAML=stack-7.10.yaml ESFLAG=ES1 DLINK=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch

17 - 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

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.2 STACK_YAML=stack.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

20 - 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"

21

22install:

Makefile+8−2

@@ -23,10 +23,16 @@ test: echo-warn

23 STACK_YAML="stack-7.10.yaml" stack test

24

257.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

27

287.10-test-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:

29− STACK_YAML="stack-7.10.yaml" stack test bloodhound:tests --test-arguments="--qc-max-success 500" --flag bloodhound:ES5

35+ STACK_YAML="stack-8.0.yaml" stack test --fast bloodhound:tests --test-arguments="--qc-max-success 500" --flag bloodhound:ES5

30

36

318.0-build:

378.0-build:

32 STACK_YAML="stack-8.0.yaml" stack build

38 STACK_YAML="stack-8.0.yaml" stack build

bloodhound.cabal+1−1

@@ -1,5 +1,5 @@

1name: bloodhound

2−version: 0.14.0.0

2+version: 0.14.0.1

3synopsis: ElasticSearch client library for Haskell

4description: ElasticSearch made awesome for Haskell hackers

5homepage: 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)

15import Data.Time.Calendar (Day (..))

16import Data.Time.Clock (UTCTime (..), secondsToDiffTime)

17import qualified Data.Vector as V

18−import Database.V1.Bloodhound

18+import Database.V5.Bloodhound

19import GHC.Generics (Generic)

20import Network.HTTP.Client (defaultManagerSettings)

21-------------------------------------------------------------------------------

@@ -71,7 +71,6 @@ instance FromJSON Location where

71 parseJSON = genericParseJSON defaultOptions

72

73

74−-------------------------------------------------------------------------------

75main :: IO ()

74main :: IO ()

76main = runBH' $ do

75main = runBH' $ do

77 -- set up index

76 -- 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

151 initReq <- liftIO $ parseUrl' url

152 reqHook <- bhRequestHook A.<$> getBHEnv

153 let reqBody = RequestBodyLBS $ fromMaybe emptyBody body

154+ req <- liftIO

155+ $ reqHook

154− req <- liftIO $ reqHook $ setRequestIgnoreStatus $ initReq { method = dMethod

156+ $ setRequestIgnoreStatus

157+ $ initReq { method = dMethod

155− , requestBody = reqBody }

158+ , requestBody = reqBody }

156 mgr <- bhManager <$> getBHEnv

159 mgr <- bhManager <$> getBHEnv

157 liftIO $ httpLbs req mgr

160 liftIO $ httpLbs req mgr

158

161

src/Database/V5/Bloodhound/Client.hs+9−2

@@ -207,8 +207,15 @@ dispatch dMethod url body = do

207 initReq <- liftIO $ parseUrl' url

208 reqHook <- bhRequestHook A.<$> getBHEnv

209 let reqBody = RequestBodyLBS $ fromMaybe emptyBody body

210+ req <- liftIO

211+ $ reqHook

212+ $ setRequestIgnoreStatus

213+ $ initReq { method = dMethod

214+ , requestHeaders =

215+ ("Content-Type", "application/json") : requestHeaders initReq

216+ , requestBody = reqBody }

210− req <- liftIO $ reqHook $ setRequestIgnoreStatus $ initReq { method = dMethod

217+ -- req <- liftIO $ reqHook $ setRequestIgnoreStatus $ initReq { method = dMethod

211− , requestBody = reqBody }

218+ -- , requestBody = reqBody }

212 mgr <- bhManager <$> getBHEnv

219 mgr <- bhManager <$> getBHEnv

213 liftIO $ httpLbs req mgr

220 liftIO $ httpLbs req mgr

214

221