git.iko.soy/typeable/servant
on master help sign in
servant-foreign support for CaptureAll
cda3161Jonathan Lange
servant-foreign/src/Servant/Foreign/Internal.hs+15
compare with master
unifiedsplit
@@ -211,6 +211,21 @@ instance (KnownSymbol sym, HasForeignType lang ftype t, HasForeign lang ftype ap
211 { _argName = PathSegment str
211 { _argName = PathSegment str
212 , _argType = ftype }
212 , _argType = ftype }
213
213
214+instance (KnownSymbol sym, HasForeignType lang ftype [t], HasForeign lang ftype sublayout)
215+ => HasForeign lang ftype (CaptureAll sym t :> sublayout) where
216+ type Foreign ftype (CaptureAll sym t :> sublayout) = Foreign ftype sublayout
217+
218+ foreignFor lang Proxy Proxy req =
219+ foreignFor lang Proxy (Proxy :: Proxy sublayout) $
220+ req & reqUrl . path <>~ [Segment (Cap arg)]
221+ & reqFuncName . _FunctionName %~ (++ ["by", str])
222+ where
223+ str = pack . symbolVal $ (Proxy :: Proxy sym)
224+ ftype = typeFor lang (Proxy :: Proxy ftype) (Proxy :: Proxy [t])
225+ arg = Arg
226+ { _argName = PathSegment str
227+ , _argType = ftype }
228+
214instance (Elem JSON list, HasForeignType lang ftype a, ReflectMethod method)
229instance (Elem JSON list, HasForeignType lang ftype a, ReflectMethod method)
215 => HasForeign lang ftype (Verb method status list a) where
230 => HasForeign lang ftype (Verb method status list a) where
216 type Foreign ftype (Verb method status list a) = Req ftype
231 type Foreign ftype (Verb method status list a) = Req ftype
servant-foreign/test/Servant/ForeignSpec.hs+16−2
@@ -46,6 +46,7 @@ type TestApi
46 :<|> "test" :> QueryParam "param" Int :> ReqBody '[JSON] [String] :> Post '[JSON] NoContent
46 :<|> "test" :> QueryParam "param" Int :> ReqBody '[JSON] [String] :> Post '[JSON] NoContent
47 :<|> "test" :> QueryParams "params" Int :> ReqBody '[JSON] String :> Put '[JSON] NoContent
47 :<|> "test" :> QueryParams "params" Int :> ReqBody '[JSON] String :> Put '[JSON] NoContent
48 :<|> "test" :> Capture "id" Int :> Delete '[JSON] NoContent
48 :<|> "test" :> Capture "id" Int :> Delete '[JSON] NoContent
49+ :<|> "test" :> CaptureAll "ids" Int :> Get '[JSON] [Int]
49
50
50testApi :: [Req String]
51testApi :: [Req String]
51testApi = listFromAPI (Proxy :: Proxy LangX) (Proxy :: Proxy String) (Proxy :: Proxy TestApi)
52testApi = listFromAPI (Proxy :: Proxy LangX) (Proxy :: Proxy String) (Proxy :: Proxy TestApi)
@@ -53,9 +54,9 @@ testApi = listFromAPI (Proxy :: Proxy LangX) (Proxy :: Proxy String) (Proxy :: P
53listFromAPISpec :: Spec
54listFromAPISpec :: Spec
54listFromAPISpec = describe "listFromAPI" $ do
55listFromAPISpec = describe "listFromAPI" $ do
55 it "generates 4 endpoints for TestApi" $ do
56 it "generates 4 endpoints for TestApi" $ do
56− length testApi `shouldBe` 4
57+ length testApi `shouldBe` 5
57
58
58− let [getReq, postReq, putReq, deleteReq] = testApi
59+ let [getReq, postReq, putReq, deleteReq, captureAllReq] = testApi
59
60
60 it "collects all info for get request" $ do
61 it "collects all info for get request" $ do
61 shouldBe getReq $ defReq
62 shouldBe getReq $ defReq
@@ -106,3 +107,16 @@ listFromAPISpec = describe "listFromAPI" $ do
106 , _reqReturnType = Just "voidX"
107 , _reqReturnType = Just "voidX"
107 , _reqFuncName = FunctionName ["delete", "test", "by", "id"]
108 , _reqFuncName = FunctionName ["delete", "test", "by", "id"]
108 }
109 }
110+
111+ it "collects all info for capture all request" $ do
112+ shouldBe captureAllReq $ defReq
113+ { _reqUrl = Url
114+ [ Segment $ Static "test"
115+ , Segment $ Cap (Arg "ids" "listX of intX") ]
116+ []
117+ , _reqMethod = "GET"
118+ , _reqHeaders = []
119+ , _reqBody = Nothing
120+ , _reqReturnType = Just "listX of intX"
121+ , _reqFuncName = FunctionName ["get", "test", "by", "ids"]
122+ }