git.iko.soy/typeable/servant
on master help sign in
Merge pull request #132 from haskell-servant/fix-129-queryparam-link

Tweak the HasLink instance for QueryParam, fixes #129

commit7399f30cc40d9e6dad99fb764e9bbd50b75fc7a2 authorAlp Mestanogullari <alpmestan@gmail.com> dateFri 19 Jun 2015, 22:16 (11 years ago) parent9b9ea100e22d19
2 files changed+10−10
compare with master
unifiedsplit
servant/src/Servant/Utils/Links.hs+8−8 servant/test/Servant/Utils/LinksSpec.hs+2−2
servant/src/Servant/Utils/Links.hs+8−8
@@ -49,7 +49,7 @@
4949-- or without those:
5050--
5151-- >>> let with = Proxy :: Proxy ("bye" :> QueryParam "name" String :> Delete '[JSON] ())
52−-- >>> print $ safeLink api with "Hubert"
52+-- >>> print $ safeLink api with (Just "Hubert")
5353-- bye?name=Hubert
5454--
5555-- >>> let without = Proxy :: Proxy ("bye" :> Delete '[JSON] ())
@@ -273,10 +273,10 @@ instance (KnownSymbol sym, HasLink sub) => HasLink (sym :> sub) where
273273-- QueryParam instances
274274instance (KnownSymbol sym, ToText v, HasLink sub)
275275 => HasLink (QueryParam sym v :> sub) where
276− type MkLink (QueryParam sym v :> sub) = v -> MkLink sub
277− toLink _ l v =
278− toLink (Proxy :: Proxy sub)
279− (addQueryParam (SingleParam k (toText v)) l)
276+ type MkLink (QueryParam sym v :> sub) = Maybe v -> MkLink sub
277+ toLink _ l mv =
278+ toLink (Proxy :: Proxy sub) $
279+ maybe id (addQueryParam . SingleParam k . toText) mv l
280280 where
281281 k :: String
282282 k = symbolVal (Proxy :: Proxy sym)
@@ -303,10 +303,10 @@ instance (KnownSymbol sym, HasLink sub)
303303-- MatrixParam instances
304304instance (KnownSymbol sym, ToText v, HasLink sub)
305305 => HasLink (MatrixParam sym v :> sub) where
306− type MkLink (MatrixParam sym v :> sub) = v -> MkLink sub
307− toLink _ l v =
306+ type MkLink (MatrixParam sym v :> sub) = Maybe v -> MkLink sub
307+ toLink _ l mv =
308308 toLink (Proxy :: Proxy sub) $
309− addMatrixParam (SingleParam k (toText v)) l
309+ maybe id (addMatrixParam . SingleParam k . toText) mv l
310310 where
311311 k = symbolVal (Proxy :: Proxy sym)
312312
servant/test/Servant/Utils/LinksSpec.hs+2−2
@@ -61,13 +61,13 @@ spec = describe "Servant.Utils.Links" $ do
6161 let l2 = Proxy :: Proxy ("hello" :> Capture "name" String
6262 :> QueryParam "capital" Bool
6363 :> Delete '[JSON] ())
64− apiLink l2 "bye" True `shouldBeURI` "hello/bye?capital=true"
64+ apiLink l2 "bye" (Just True) `shouldBeURI` "hello/bye?capital=true"
6565
6666 let l3 = Proxy :: Proxy ("parent" :> MatrixParams "name" String
6767 :> "child"
6868 :> MatrixParam "gender" String
6969 :> Get '[JSON] String)
70− apiLink l3 ["Hubert?x=;&", "Cumberdale"] "Edward?"
70+ apiLink l3 ["Hubert?x=;&", "Cumberdale"] (Just "Edward?")
7171 `shouldBeURI` "parent;name[]=Hubert%3Fx%3D%3B%26;\
7272 \name[]=Cumberdale/child;gender=Edward%3F"
7373