501212e · servant · git.iko.soy

servant-client/servant-client.cabal+1−1

compare with master

unifiedsplit

@@ -41,7 +41,7 @@ library

41 , base64-bytestring >= 1.0.0.1 && < 1.1

42 , bytestring >= 0.10 && < 0.11

43 , exceptions >= 0.8 && < 0.9

44− , http-api-data >= 0.1 && < 0.4

44+ , http-api-data >= 0.3 && < 0.4

45 , http-client >= 0.4.18.1 && < 0.6

46 , http-client-tls >= 0.2.2 && < 0.4

47 , http-media >= 0.6.2 && < 0.7

servant-client/test/Servant/ClientSpec.hs+4−5

@@ -30,7 +30,7 @@ module Servant.ClientSpec where

30import Control.Applicative ((<$>))

31#endif

32import Control.Arrow (left)

33−import Control.Concurrent (ThreadId, forkIO, killThread)

33+import Control.Concurrent (forkIO, killThread, ThreadId)

34import Control.Exception (bracket)

35import Control.Monad.Trans.Except (throwE )

36import Data.Aeson

@@ -44,8 +44,7 @@ import qualified Network.HTTP.Client as C

44import Network.HTTP.Media

45import qualified Network.HTTP.Types as HTTP

46import Network.Socket

47−import Network.Wai (Request, requestHeaders,

47+import Network.Wai (Request, requestHeaders, responseLBS)

48− responseLBS)

49import Network.Wai.Handler.Warp

48import Network.Wai.Handler.Warp

50import System.IO.Unsafe (unsafePerformIO)

49import System.IO.Unsafe (unsafePerformIO)

51import Test.Hspec

50import Test.Hspec

@@ -121,9 +120,9 @@ getBody :: Person -> SCR.ClientM Person

121getQueryParam :: Maybe String -> SCR.ClientM Person

120getQueryParam :: Maybe String -> SCR.ClientM Person

122getQueryParams :: [String] -> SCR.ClientM [Person]

121getQueryParams :: [String] -> SCR.ClientM [Person]

123getQueryFlag :: Bool -> SCR.ClientM Bool

122getQueryFlag :: Bool -> SCR.ClientM Bool

124−getRawSuccess :: HTTP.Method

123+getRawSuccess :: HTTP.Method

125 -> SCR.ClientM (Int, BS.ByteString, MediaType, [HTTP.Header], C.Response BS.ByteString)

124 -> SCR.ClientM (Int, BS.ByteString, MediaType, [HTTP.Header], C.Response BS.ByteString)

126−getRawFailure :: HTTP.Method

125+getRawFailure :: HTTP.Method

127 -> SCR.ClientM (Int, BS.ByteString, MediaType, [HTTP.Header], C.Response BS.ByteString)

126 -> SCR.ClientM (Int, BS.ByteString, MediaType, [HTTP.Header], C.Response BS.ByteString)

128getMultiple :: String -> Maybe Int -> Bool -> [(String, [Rational])]

127getMultiple :: String -> Maybe Int -> Bool -> [(String, [Rational])]

129 -> SCR.ClientM (String, Maybe Int, Bool, [(String, [Rational])])

128 -> SCR.ClientM (String, Maybe Int, Bool, [(String, [Rational])])

servant-server/servant-server.cabal+1−1

@@ -52,7 +52,7 @@ library

52 , base64-bytestring >= 1.0 && < 1.1

53 , bytestring >= 0.10 && < 0.11

54 , containers >= 0.5 && < 0.6

55− , http-api-data >= 0.1 && < 0.4

55+ , http-api-data >= 0.3 && < 0.4

56 , http-types >= 0.8 && < 0.10

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

58 , mtl >= 2 && < 2.3

servant-server/src/Servant/Server/Internal.hs+1−10

@@ -42,19 +42,10 @@ import Network.Wai (Application, Request, Response,

42 responseLBS, vault)

43import Prelude ()

44import Prelude.Compat

45−import Web.HttpApiData (FromHttpApiData)

45+import Web.HttpApiData (FromHttpApiData, parseHeaderMaybe,

46−#if MIN_VERSION_http_api_data(0,3,0)

47−import Web.Internal.HttpApiData (parseHeaderMaybe,

48 parseQueryParamMaybe,

46 parseQueryParamMaybe,

49 parseUrlPieceMaybe,

47 parseUrlPieceMaybe,

50 parseUrlPieces)

48 parseUrlPieces)

51−#else

52−import Web.HttpApiData.Internal (parseHeaderMaybe,

53− parseQueryParamMaybe,

54− parseUrlPieceMaybe,

55− parseUrlPieces)

56−#endif

57−

58import Servant.API ((:<|>) (..), (:>), BasicAuth, Capture,

49import Servant.API ((:<|>) (..), (:>), BasicAuth, Capture,

59 CaptureAll, Verb,

50 CaptureAll, Verb,

60 ReflectMethod(reflectMethod),

51 ReflectMethod(reflectMethod),

servant/src/Servant/API/ContentTypes.hs+2−3

@@ -72,8 +72,7 @@ module Servant.API.ContentTypes

72

73import Control.Arrow (left)

74import Control.Monad.Compat

75−import Data.Aeson (FromJSON (..), ToJSON (..),

75+import Data.Aeson (FromJSON(..), ToJSON(..), encode)

76− encode)

77import Data.Aeson.Parser (value)

76import Data.Aeson.Parser (value)

78import Data.Aeson.Types (parseEither)

77import Data.Aeson.Types (parseEither)

79import Data.Attoparsec.ByteString.Char8 (endOfInput, parseOnly,

78import Data.Attoparsec.ByteString.Char8 (endOfInput, parseOnly,

@@ -288,7 +287,7 @@ instance OVERLAPPABLE_

288 ToJSON a => MimeRender JSON a where

287 ToJSON a => MimeRender JSON a where

289 mimeRender _ = encode

288 mimeRender _ = encode

290

289

291−-- | @urlEncodeAsForm"

290+-- | @urlEncodeAsForm@

292-- Note that the @mimeUnrender p (mimeRender p x) == Right x@ law only

291-- Note that the @mimeUnrender p (mimeRender p x) == Right x@ law only

293-- holds if every element of x is non-null (i.e., not @("", "")@)

292-- holds if every element of x is non-null (i.e., not @("", "")@)

294instance OVERLAPPABLE_

293instance OVERLAPPABLE_