b371e25 · typeable/bloodhound

git.iko.soy/typeable/bloodhound

fixed doctests

commitb371e25158d3fd5ba717eecb6c9456a5cf52822a authorChris Allen <cma@bitemyapp.com> dateSun 18 Oct 2015, 13:00 (11 years ago) parent5b66b7c

4 files changed+104−51

compare with master

unifiedsplit

src/Database/Bloodhound/Client.hs+15−9 src/Database/Bloodhound/Types.hs+85−42 stack-7.10.yaml+1 stack-7.8.yaml+3

src/Database/Bloodhound/Client.hs+15−9

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

1−{-# LANGUAGE OverloadedStrings #-}

2−{-# LANGUAGE RecordWildCards #-}

1+{-# LANGUAGE OverloadedStrings #-}

2+{-# LANGUAGE RecordWildCards #-}

44-------------------------------------------------------------------------------

55-- |

@@ -58,7 +58,7 @@ module Database.Bloodhound.Client

5858 )

5959 where

6060

61−import qualified Blaze.ByteString.Builder as BB

61+import qualified Blaze.ByteString.Builder as BB

6262import Control.Applicative

6363import Control.Monad

6464import Control.Monad.Catch

@@ -119,13 +119,19 @@ import Database.Bloodhound.Types

119119-- , message = "Use haskell!"

120120-- , age = 10000

121121-- , location = Location 40.12 (-71.34) }

122−--instance ToJSON Tweet

123−--instance FromJSON Tweet

124−--instance ToJSON Location

125−--instance FromJSON Location

122+--instance ToJSON Tweet where

123+-- toJSON = genericToJSON defaultOptions

124+--instance FromJSON Tweet where

125+-- parseJSON = genericParseJSON defaultOptions

126+--instance ToJSON Location where

127+-- toJSON = genericToJSON defaultOptions

128+--instance FromJSON Location where

129+-- parseJSON = genericParseJSON defaultOptions

126130--data BulkTest = BulkTest { name :: Text } deriving (Eq, Generic, Show)

127−--instance FromJSON BulkTest

128−--instance ToJSON BulkTest

131+--instance FromJSON BulkTest where

132+-- parseJSON = genericParseJSON defaultOptions

133+--instance ToJSON BulkTest where

134+-- toJSON = genericToJSON defaultOptions

129135-- :}

130136

131137-- | 'mkShardCount' is a straight-forward smart constructor for 'ShardCount'

src/Database/Bloodhound/Types.hs+85−42

@@ -2049,48 +2049,91 @@ instance ToJSON MatchQueryType where

20492049instance ToJSON FieldName where

20502050 toJSON (FieldName fieldName) = String fieldName

20512051

2052−instance ToJSON ReplicaCount

2053−instance ToJSON ShardCount

2054−instance ToJSON CutoffFrequency

2055−instance ToJSON Analyzer

2056−instance ToJSON MaxExpansions

2057−instance ToJSON Lenient

2058−instance ToJSON Boost

2059−instance ToJSON Version

2060−instance ToJSON Tiebreaker

2061−instance ToJSON MinimumMatch

2062−instance ToJSON DisableCoord

2063−instance ToJSON PrefixLength

2064−instance ToJSON Fuzziness

2065−instance ToJSON IgnoreTermFrequency

2066−instance ToJSON MaxQueryTerms

2067−instance ToJSON TypeName

2068−instance ToJSON IndexName

2069−instance ToJSON TemplateName

2070−instance ToJSON TemplatePattern

2071−instance ToJSON BoostTerms

2072−instance ToJSON MaxWordLength

2073−instance ToJSON MinWordLength

2074−instance ToJSON MaxDocFrequency

2075−instance ToJSON MinDocFrequency

2076−instance ToJSON PhraseSlop

2077−instance ToJSON StopWord

2078−instance ToJSON QueryPath

2079−instance ToJSON MinimumTermFrequency

2080−instance ToJSON PercentMatch

2081−instance ToJSON MappingName

2082−instance ToJSON DocId

2083−instance ToJSON QueryString

2084−instance ToJSON AllowLeadingWildcard

2085−instance ToJSON LowercaseExpanded

2086−instance ToJSON AnalyzeWildcard

2087−instance ToJSON GeneratePhraseQueries

2088−instance ToJSON Locale

2089−instance ToJSON EnablePositionIncrements

2090−instance FromJSON Version

2091−instance FromJSON IndexName

2092−instance FromJSON MappingName

2093−instance FromJSON DocId

2052+instance ToJSON ReplicaCount where

2053+ toJSON = genericToJSON defaultOptions

2054+instance ToJSON ShardCount where

2055+ toJSON = genericToJSON defaultOptions

2056+instance ToJSON CutoffFrequency where

2057+ toJSON = genericToJSON defaultOptions

2058+instance ToJSON Analyzer where

2059+ toJSON = genericToJSON defaultOptions

2060+instance ToJSON MaxExpansions where

2061+ toJSON = genericToJSON defaultOptions

2062+instance ToJSON Lenient where

2063+ toJSON = genericToJSON defaultOptions

2064+instance ToJSON Boost where

2065+ toJSON = genericToJSON defaultOptions

2066+instance ToJSON Version where

2067+ toJSON = genericToJSON defaultOptions

2068+instance ToJSON Tiebreaker where

2069+ toJSON = genericToJSON defaultOptions

2070+instance ToJSON MinimumMatch where

2071+ toJSON = genericToJSON defaultOptions

2072+instance ToJSON DisableCoord where

2073+ toJSON = genericToJSON defaultOptions

2074+instance ToJSON PrefixLength where

2075+ toJSON = genericToJSON defaultOptions

2076+instance ToJSON Fuzziness where

2077+ toJSON = genericToJSON defaultOptions

2078+instance ToJSON IgnoreTermFrequency where

2079+ toJSON = genericToJSON defaultOptions

2080+instance ToJSON MaxQueryTerms where

2081+ toJSON = genericToJSON defaultOptions

2082+instance ToJSON TypeName where

2083+ toJSON = genericToJSON defaultOptions

2084+instance ToJSON IndexName where

2085+ toJSON = genericToJSON defaultOptions

2086+instance ToJSON TemplateName where

2087+ toJSON = genericToJSON defaultOptions

2088+instance ToJSON TemplatePattern where

2089+ toJSON = genericToJSON defaultOptions

2090+instance ToJSON BoostTerms where

2091+ toJSON = genericToJSON defaultOptions

2092+instance ToJSON MaxWordLength where

2093+ toJSON = genericToJSON defaultOptions

2094+instance ToJSON MinWordLength where

2095+ toJSON = genericToJSON defaultOptions

2096+instance ToJSON MaxDocFrequency where

2097+ toJSON = genericToJSON defaultOptions

2098+instance ToJSON MinDocFrequency where

2099+ toJSON = genericToJSON defaultOptions

2100+instance ToJSON PhraseSlop where

2101+ toJSON = genericToJSON defaultOptions

2102+instance ToJSON StopWord where

2103+ toJSON = genericToJSON defaultOptions

2104+instance ToJSON QueryPath where

2105+ toJSON = genericToJSON defaultOptions

2106+instance ToJSON MinimumTermFrequency where

2107+ toJSON = genericToJSON defaultOptions

2108+instance ToJSON PercentMatch where

2109+ toJSON = genericToJSON defaultOptions

2110+instance ToJSON MappingName where

2111+ toJSON = genericToJSON defaultOptions

2112+instance ToJSON DocId where

2113+ toJSON = genericToJSON defaultOptions

2114+instance ToJSON QueryString where

2115+ toJSON = genericToJSON defaultOptions

2116+instance ToJSON AllowLeadingWildcard where

2117+ toJSON = genericToJSON defaultOptions

2118+instance ToJSON LowercaseExpanded where

2119+ toJSON = genericToJSON defaultOptions

2120+instance ToJSON AnalyzeWildcard where

2121+ toJSON = genericToJSON defaultOptions

2122+instance ToJSON GeneratePhraseQueries where

2123+ toJSON = genericToJSON defaultOptions

2124+instance ToJSON Locale where

2125+ toJSON = genericToJSON defaultOptions

2126+instance ToJSON EnablePositionIncrements where

2127+ toJSON = genericToJSON defaultOptions

2128+

2129+instance FromJSON Version where

2130+ parseJSON = genericParseJSON defaultOptions

2131+instance FromJSON IndexName where

2132+ parseJSON = genericParseJSON defaultOptions

2133+instance FromJSON MappingName where

2134+ parseJSON = genericParseJSON defaultOptions

2135+instance FromJSON DocId where

2136+ parseJSON = genericParseJSON defaultOptions

20942137

20952138

20962139instance FromJSON Status where

stack-7.10.yaml+1

@@ -4,6 +4,7 @@ packages:

44extra-deps:

55- aeson-0.10.0.0

66- http-types-0.9

7+- http-client-0.4.24

78- attoparsec-0.13.0.1

89- doctest-0.10.1

910- doctest-prop-0.2.0.1

stack-7.8.yaml+3

@@ -2,6 +2,9 @@ flags: {}

22packages:

33- '.'

44extra-deps:

5+- aeson-0.10.0.0

6+- http-types-0.9

7+- http-client-0.4.24

58- doctest-0.10.1

69- doctest-prop-0.2.0.1

710- quickcheck-properties-0.1