dc49132 · typeable/bloodhound

git.iko.soy/typeable/bloodhound

blah fuck wtf

commitdc49132054850906d7703a85b588e3d8555f64b1 authorChris Allen <cma@bitemyapp.com> dateTue 1 Mar 2016, 12:57 (11 years ago) parent81eef68

4 files changed+21−11

compare with master

unifiedsplit

bloodhound.cabal+4−2 src/Database/Bloodhound.hs+4−1 src/Database/Bloodhound/Types.hs+10−6 stack-7.10.yaml+3−2

bloodhound.cabal+4−2

@@ -32,7 +32,7 @@ library

3232 build-depends: base >= 4.3 && <5,

3333 bytestring >= 0.10.0 && <0.11,

3434 containers >= 0.5.0.0 && <0.6,

35− aeson >= 0.11 && <0.12,

35+ aeson >= 0.11.1 && <0.12,

3636 http-client >= 0.3 && <0.5,

3737 network-uri >= 2.6 && <2.7,

3838 semigroups >= 0.15 && <0.19,

@@ -62,7 +62,7 @@ test-suite tests

6262 http-client,

6363 http-types,

6464 containers,

65− hspec >= 1.8 && <2.2,

65+ hspec >= 1.8 && <2.3,

6666 text,

6767 time,

6868 aeson,

@@ -84,6 +84,8 @@ test-suite doctests

8484 hs-source-dirs: tests, src

8585 if impl(ghc >= 7.8)

8686 build-depends: base,

87+ aeson,

88+ bloodhound,

8789 directory,

8890 doctest >= 0.10.1,

8991 doctest-prop,

src/Database/Bloodhound.hs+4−1

@@ -1,7 +1,10 @@

11module Database.Bloodhound

2− ( module Database.Bloodhound.Client

2+ ( -- module Data.Aeson.Types

3+ -- ,

4+ module Database.Bloodhound.Client

35 , module Database.Bloodhound.Types

46 ) where

8+-- import Data.Aeson.Types

69import Database.Bloodhound.Client

710import Database.Bloodhound.Types

src/Database/Bloodhound/Types.hs+10−6

@@ -4,7 +4,7 @@

44{-# LANGUAGE FlexibleInstances #-}

55{-# LANGUAGE GeneralizedNewtypeDeriving #-}

66{-# LANGUAGE MultiParamTypeClasses #-}

7−{-# LANGUAGE NoMonomorphismRestriction #-}

7+-- {-# LANGUAGE NoMonomorphismRestriction #-}

88{-# LANGUAGE OverloadedStrings #-}

99{-# LANGUAGE RecordWildCards #-}

1010{-# LANGUAGE UndecidableInstances #-}

@@ -311,6 +311,7 @@ import Database.Bloodhound.Types.Internal

311311

312312-- $setup

313313-- >>> :set -XOverloadedStrings

314+-- >>> import Data.Aeson

314315-- >>> import Database.Bloodhound

315316-- >>> let testServer = (Server "http://localhost:9200")

316317-- >>> let testIndex = IndexName "twitter"

@@ -2484,7 +2485,8 @@ instance FromJSON MoreLikeThisFieldQuery where

24842485 <*> o .:? "percent_terms_to_match"

24852486 <*> o .:? "min_term_freq"

24862487 <*> o .:? "max_query_terms"

2487− <*> (optionalNE =<< o .:? "stop_words")

2488+ -- <*> (optionalNE =<< o .:? "stop_words")

2489+ <*> o .:? "stop_words"

24882490 <*> o .:? "min_doc_freq"

24892491 <*> o .:? "max_doc_freq"

24902492 <*> o .:? "min_word_length"

@@ -2492,7 +2494,7 @@ instance FromJSON MoreLikeThisFieldQuery where

24922494 <*> o .:? "boost_terms"

24932495 <*> o .:? "boost"

24942496 <*> o .:? "analyzer"

2495− optionalNE = maybe (pure Nothing) (fmap Just . parseNEJSON)

2497+ -- optionalNE = maybe (pure Nothing) (fmap Just . parseNEJSON)

24962498

24972499instance ToJSON MoreLikeThisQuery where

24982500 toJSON (MoreLikeThisQuery text fields percent

@@ -2517,11 +2519,13 @@ instance FromJSON MoreLikeThisQuery where

25172519 parseJSON = withObject "MoreLikeThisQuery" parse

25182520 where parse o = MoreLikeThisQuery

25192521 <$> o .: "like_text"

2520− <*> (optionalNE =<< o .:? "fields")

2522+ -- <*> (optionalNE =<< o .:? "fields")

2523+ <*> o .:? "fields"

25212524 <*> o .:? "percent_terms_to_match"

25222525 <*> o .:? "min_term_freq"

25232526 <*> o .:? "max_query_terms"

2524− <*> (optionalNE =<< o .:? "stop_words")

2527+ -- <*> (optionalNE =<< o .:? "stop_words")

2528+ <*> o .:? "stop_words"

25252529 <*> o .:? "min_doc_freq"

25262530 <*> o .:? "max_doc_freq"

25272531 <*> o .:? "min_word_length"

@@ -2529,7 +2533,7 @@ instance FromJSON MoreLikeThisQuery where

25292533 <*> o .:? "boost_terms"

25302534 <*> o .:? "boost"

25312535 <*> o .:? "analyzer"

2532− optionalNE = maybe (pure Nothing) (fmap Just . parseNEJSON)

2536+ -- optionalNE = maybe (pure Nothing) (fmap Just . parseNEJSON)

25332537

25342538instance ToJSON IndicesQuery where

25352539 toJSON (IndicesQuery indices query noMatch) =

stack-7.10.yaml+3−2

@@ -2,7 +2,8 @@ flags: {}

22packages:

33- '.'

44extra-deps:

5−- aeson-0.10.0.0

5+- aeson-0.11.1.0

6+- fail-4.9.0.0

67- http-types-0.9

78- http-client-0.4.24

89- attoparsec-0.13.0.1

@@ -11,4 +12,4 @@ extra-deps:

1112- quickcheck-properties-0.1

1213- semigroups-0.18.0.1

1314- uri-bytestring-0.1.9

14−resolver: lts-3.10

15+resolver: lts-5.1