8272db6 · typeable/bloodhound

git.iko.soy/typeable/bloodhound

on master help sign in

Actually include some modified files in the commit

8272db6Josh Berman9 years ago

bloodhound.cabal+1−1

compare with master

unifiedsplit

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

1name: bloodhound

2−version: 0.15.0.0

2+version: 0.15.1.0

3synopsis: ElasticSearch client library for Haskell

4description: ElasticSearch made awesome for Haskell hackers

5homepage: https://github.com/bitemyapp/bloodhound

src/Database/V5/Bloodhound/Types.hs+68−1

@@ -336,6 +336,8 @@ module Database.V5.Bloodhound.Types

336 , SuggestOptions(..)

337 , SuggestResponse(..)

338 , NamedSuggestionResponse(..)

339+ , DirectGenerators(..)

340+ , DirectGeneratorSuggestModeTypes (..)

339

341

340 , Aggregation(..)

342 , Aggregation(..)

341 , Aggregations

343 , Aggregations

@@ -5293,6 +5295,7 @@ data PhraseSuggester =

5293 , phraseSuggesterShardSize :: Maybe Int

5295 , phraseSuggesterShardSize :: Maybe Int

5294 , phraseSuggesterHighlight :: Maybe PhraseSuggesterHighlighter

5296 , phraseSuggesterHighlight :: Maybe PhraseSuggesterHighlighter

5295 , phraseSuggesterCollate :: Maybe PhraseSuggesterCollate

5297 , phraseSuggesterCollate :: Maybe PhraseSuggesterCollate

5298+ , phraseSuggesterCandidateGenerators :: Maybe [DirectGenerators]

5296 }

5299 }

5297 deriving (Show, Generic, Eq, Read)

5300 deriving (Show, Generic, Eq, Read)

5298

5301

@@ -5308,6 +5311,7 @@ instance ToJSON PhraseSuggester where

5308 , "shard_size" .= phraseSuggesterShardSize

5311 , "shard_size" .= phraseSuggesterShardSize

5309 , "highlight" .= phraseSuggesterHighlight

5312 , "highlight" .= phraseSuggesterHighlight

5310 , "collate" .= phraseSuggesterCollate

5313 , "collate" .= phraseSuggesterCollate

5314+ , "direct_generator" .= phraseSuggesterCandidateGenerators

5311 ]

5315 ]

5312

5316

5313instance FromJSON PhraseSuggester where

5317instance FromJSON PhraseSuggester where

@@ -5324,11 +5328,12 @@ instance FromJSON PhraseSuggester where

5324 <*> o .:? "shard_size"

5328 <*> o .:? "shard_size"

5325 <*> o .:? "highlight"

5329 <*> o .:? "highlight"

5326 <*> o .:? "collate"

5330 <*> o .:? "collate"

5331+ <*> o .:? "direct_generator"

5327

5332

5328mkPhraseSuggester :: FieldName -> PhraseSuggester

5333mkPhraseSuggester :: FieldName -> PhraseSuggester

5329mkPhraseSuggester fName =

5334mkPhraseSuggester fName =

5330 PhraseSuggester fName Nothing Nothing Nothing Nothing Nothing Nothing

5335 PhraseSuggester fName Nothing Nothing Nothing Nothing Nothing Nothing

5331− Nothing Nothing Nothing Nothing

5336+ Nothing Nothing Nothing Nothing Nothing

5332

5337

5333data PhraseSuggesterHighlighter =

5338data PhraseSuggesterHighlighter =

5334 PhraseSuggesterHighlighter { phraseSuggesterHighlighterPreTag :: Text

5339 PhraseSuggesterHighlighter { phraseSuggesterHighlighterPreTag :: Text

@@ -5418,3 +5423,65 @@ instance FromJSON NamedSuggestionResponse where

5418 return $ NamedSuggestionResponse suggestionName' suggestionResponses'

5423 return $ NamedSuggestionResponse suggestionName' suggestionResponses'

5419

5424

5420 parseJSON x = typeMismatch "NamedSuggestionResponse" x

5425 parseJSON x = typeMismatch "NamedSuggestionResponse" x

5426+

5427+data DirectGeneratorSuggestModeTypes = DirectGeneratorSuggestModeMissing

5428+ | DirectGeneratorSuggestModePopular

5429+ | DirectGeneratorSuggestModeAlways

5430+ deriving (Show, Eq, Read, Generic)

5431+

5432+instance ToJSON DirectGeneratorSuggestModeTypes where

5433+ toJSON DirectGeneratorSuggestModeMissing = "missing"

5434+ toJSON DirectGeneratorSuggestModePopular = "popular"

5435+ toJSON DirectGeneratorSuggestModeAlways = "always"

5436+

5437+instance FromJSON DirectGeneratorSuggestModeTypes where

5438+ parseJSON = withText "DirectGeneratorSuggestModeTypes" parse

5439+ where parse "missing" = pure DirectGeneratorSuggestModeMissing

5440+ parse "popular" = pure DirectGeneratorSuggestModePopular

5441+ parse "always" = pure DirectGeneratorSuggestModeAlways

5442+ parse f = fail ("Unexpected DirectGeneratorSuggestModeTypes: " <> show f)

5443+

5444+data DirectGenerators = DirectGenerators

5445+ { directGeneratorsField :: Text

5446+ , directGeneratorsSize :: Maybe Int

5447+ , directGeneratorSuggestMode :: DirectGeneratorSuggestModeTypes

5448+ , directGeneratorMaxEdits :: Maybe Double

5449+ , directGeneratorPrefixLength :: Maybe Int

5450+ , directGeneratorMinWordLength :: Maybe Int

5451+ , directGeneratorMaxInspections :: Maybe Int

5452+ , directGeneratorMinDocFreq :: Maybe Double

5453+ , directGeneratorMaxTermFreq :: Maybe Double

5454+ , directGeneratorPreFilter :: Maybe Text

5455+ , directGeneratorPostFilter :: Maybe Text

5456+ }

5457+ deriving (Show, Eq, Read, Generic)

5458+

5459+

5460+instance ToJSON DirectGenerators where

5461+ toJSON DirectGenerators{..} = omitNulls [ "field" .= directGeneratorsField

5462+ , "size" .= directGeneratorsSize

5463+ , "suggest_mode" .= directGeneratorSuggestMode

5464+ , "max_edits" .= directGeneratorMaxEdits

5465+ , "prefix_length" .= directGeneratorPrefixLength

5466+ , "min_word_length" .= directGeneratorMinWordLength

5467+ , "max_inspections" .= directGeneratorMaxInspections

5468+ , "min_doc_freq" .= directGeneratorMinDocFreq

5469+ , "max_term_freq" .= directGeneratorMaxTermFreq

5470+ , "pre_filter" .= directGeneratorPreFilter

5471+ , "post_filter" .= directGeneratorPostFilter

5472+ ]

5473+

5474+instance FromJSON DirectGenerators where

5475+ parseJSON = withObject "DirectGenerators" parse

5476+ where parse o = DirectGenerators

5477+ <$> o .: "field"

5478+ <*> o .:? "size"

5479+ <*> o .: "suggest_mode"

5480+ <*> o .:? "max_edits"

5481+ <*> o .:? "prefix_length"

5482+ <*> o .:? "min_word_length"

5483+ <*> o .:? "max_inspections"

5484+ <*> o .:? "min_doc_freq"

5485+ <*> o .:? "max_term_freq"

5486+ <*> o .:? "pre_filter"

5487+ <*> o .:? "post_filter"

tests/V5/tests.hs+6

@@ -619,6 +619,8 @@ instance ApproxEq PhraseSuggesterCollate

619instance ApproxEq PhraseSuggester

620instance ApproxEq SuggestType

621instance ApproxEq Suggest

622+instance ApproxEq DirectGenerators

623+instance ApproxEq DirectGeneratorSuggestModeTypes

622

624

623-- | Due to the way nodeattrfilters get serialized here, they may come

625-- | Due to the way nodeattrfilters get serialized here, they may come

624-- out in a different order, but they are morally equivalent

626-- out in a different order, but they are morally equivalent

@@ -929,6 +931,8 @@ instance Arbitrary Size where arbitrary = sopArbitrary; shrink = genericShrink

929instance Arbitrary PhraseSuggester where arbitrary = sopArbitrary; shrink = genericShrink

931instance Arbitrary PhraseSuggester where arbitrary = sopArbitrary; shrink = genericShrink

930instance Arbitrary SuggestType where arbitrary = sopArbitrary; shrink = genericShrink

932instance Arbitrary SuggestType where arbitrary = sopArbitrary; shrink = genericShrink

931instance Arbitrary Suggest where arbitrary = sopArbitrary; shrink = genericShrink

933instance Arbitrary Suggest where arbitrary = sopArbitrary; shrink = genericShrink

934+instance Arbitrary DirectGenerators where arbitrary = sopArbitrary; shrink = genericShrink

935+instance Arbitrary DirectGeneratorSuggestModeTypes where arbitrary = sopArbitrary; shrink = genericShrink

932

936

933newtype UpdatableIndexSetting' = UpdatableIndexSetting' UpdatableIndexSetting

937newtype UpdatableIndexSetting' = UpdatableIndexSetting' UpdatableIndexSetting

934 deriving (Show, Eq, ToJSON, FromJSON, ApproxEq, Typeable)

938 deriving (Show, Eq, ToJSON, FromJSON, ApproxEq, Typeable)

@@ -1793,6 +1797,8 @@ main = hspec $ do

1793 propJSON (Proxy :: Proxy CompoundFormat)

1797 propJSON (Proxy :: Proxy CompoundFormat)

1794 propJSON (Proxy :: Proxy TemplateQueryInline)

1798 propJSON (Proxy :: Proxy TemplateQueryInline)

1795 propJSON (Proxy :: Proxy Suggest)

1799 propJSON (Proxy :: Proxy Suggest)

1800+ propJSON (Proxy :: Proxy DirectGenerators)

1801+ propJSON (Proxy :: Proxy DirectGeneratorSuggestModeTypes)

1796

1802

1797-- Temporary solution for lacking of generic derivation of Arbitrary

1803-- Temporary solution for lacking of generic derivation of Arbitrary

1798-- We use generics-sop, as it's much more concise than directly using GHC.Generics

1804-- We use generics-sop, as it's much more concise than directly using GHC.Generics