git.iko.soy/typeable/bloodhound
on master help sign in
Update for newest uri-bytestring
a59f9a9Michael Xavier
bloodhound.cabal+23−23
compare with master
unifiedsplit
@@ -39,7 +39,7 @@ library
39 transformers >= 0.2 && <0.5,
39 transformers >= 0.2 && <0.5,
40 http-types >= 0.8 && <0.9,
40 http-types >= 0.8 && <0.9,
41 vector >= 0.10.9 && <0.11,
41 vector >= 0.10.9 && <0.11,
42− uri-bytestring >= 0.0.1 && <0.1,
42+ uri-bytestring >= 0.1 && <0.2,
43 exceptions,
43 exceptions,
44 data-default-class
44 data-default-class
45 default-language: Haskell2010
45 default-language: Haskell2010
@@ -49,23 +49,20 @@ test-suite tests
49 type: exitcode-stdio-1.0
49 type: exitcode-stdio-1.0
50 main-is: tests.hs
50 main-is: tests.hs
51 hs-source-dirs: tests
51 hs-source-dirs: tests
52− if impl(ghc >= 7.8)
53− build-depends: base,
52+ build-depends: base,
54− bloodhound,
53+ bloodhound,
55− http-client,
54+ http-client,
56− http-types,
55+ http-types,
57− containers,
56+ containers,
58− hspec >= 1.8 && <2.1,
57+ hspec >= 1.8 && <2.1,
59− text,
58+ text,
60− time,
59+ time,
61− aeson,
60+ aeson,
62− semigroups,
61+ semigroups,
63− QuickCheck,
62+ QuickCheck,
64− vector,
63+ vector,
65− unordered-containers >= 0.2.5.0 && <0.3,
64+ unordered-containers >= 0.2.5.0 && <0.3,
66− mtl
65+ mtl
67− else
68− buildable: False
69 default-language: Haskell2010
66 default-language: Haskell2010
70
67
71test-suite doctests
68test-suite doctests
@@ -73,8 +70,11 @@ test-suite doctests
73 type: exitcode-stdio-1.0
70 type: exitcode-stdio-1.0
74 main-is: doctests.hs
71 main-is: doctests.hs
75 hs-source-dirs: tests
72 hs-source-dirs: tests
73+ if impl(ghc >= 7.8)
76− build-depends: base,
74+ build-depends: base,
77− directory,
75+ directory,
78− doctest,
76+ doctest,
79− doctest-prop,
77+ doctest-prop,
80− filepath
78+ filepath
79+ else
80+ buildable: False
src/Database/Bloodhound/Client.hs+3−3
@@ -519,11 +519,11 @@ setURI :: MonadThrow m => Request -> URI -> m Request
519setURI req URI{..} = do
519setURI req URI{..} = do
520 Authority {..} <- maybe missingUA return uriAuthority
520 Authority {..} <- maybe missingUA return uriAuthority
521 let req' = req { secure = isSecure
521 let req' = req { secure = isSecure
522− , host = getHost authorityHost
522+ , host = hostBS authorityHost
523 , port = thePort
523 , port = thePort
524 , path = uriPath
524 , path = uriPath
525 }
525 }
526− thePort = maybe defPort getPort authorityPort
526+ thePort = maybe defPort portNumber authorityPort
527 addAuth = maybe id addAuth' authorityUserInfo
527 addAuth = maybe id addAuth' authorityUserInfo
528 return $ setQueryString theQueryString $ addAuth req'
528 return $ setQueryString theQueryString $ addAuth req'
529 where
529 where
@@ -535,4 +535,4 @@ setURI req URI{..} = do
535 isSecure = case uriScheme of
535 isSecure = case uriScheme of
536 Scheme "https" -> True
536 Scheme "https" -> True
537 _ -> False
537 _ -> False
538− theQueryString = [(k , Just v) | (k, v) <- getQuery uriQuery]
538+ theQueryString = [(k , Just v) | (k, v) <- queryPairs uriQuery]