git.iko.soy/gogol
on develop help sign in
Rendering service level methods and resources in the TOC
0343069Brendan Hay
gen/Setup.hs+1−1
compare with develop
unifiedsplit
@@ -1,2 +1,2 @@
1−import Distribution.Simple
1+import Distribution.Simple
2main = defaultMain
2main = defaultMain
gen/annex/replicapool.json+1−1
@@ -1,4 +1,4 @@
1{
1{
2− "library": "instancegroups-manager",
2+ "library": "replicapool",
3 "canonicalName": "InstanceGroups.Manager"
3 "canonicalName": "InstanceGroups.Manager"
4}
4}
gen/annex/replicapoolupdater.json+1−1
@@ -1,5 +1,5 @@
1{
1{
2− "library": "instancegroups-updater",
2+ "library": "replicapool-updater",
3 "canonicalName": "InstanceGroups.Updater"
3 "canonicalName": "InstanceGroups.Updater"
4}
4}
5
5
gen/annex/resourceviews.json+1−1
@@ -1,5 +1,5 @@
1{
1{
2− "library": "instancegroups",
2+ "library": "resourceviews",
3 "canonicalName": "InstanceGroups"
3 "canonicalName": "InstanceGroups"
4}
4}
5
5
gen/src/Gen/Syntax.hs+1−1
@@ -80,9 +80,9 @@ verbAlias n m = TypeDecl noLoc n [] alias
80 let t = terminalType (_type (_pParam x))
80 let t = terminalType (_type (_pParam x))
81 n = sing (local k)
81 n = sing (local k)
82 in case _pLocation x of
82 in case _pLocation x of
83− Query -> Just $ TyApp (TyApp (tycon "QueryParam") n) t
84 Query | x ^. iRepeated
83 Query | x ^. iRepeated
85 -> Just $ TyApp (TyApp (tycon "QueryParams") n) t
84 -> Just $ TyApp (TyApp (tycon "QueryParams") n) t
85+ Query -> Just $ TyApp (TyApp (tycon "QueryParam") n) t
86 Path -> Nothing
86 Path -> Nothing
87
87
88 params = _mParameters m
88 params = _mParameters m
gen/src/Gen/Types/Schema.hs+7−7
@@ -254,17 +254,17 @@ instance HasInfo a => HasInfo (Param a) where
254
254
255data MediaUpload = MediaUpload
255data MediaUpload = MediaUpload
256 { _muAccept :: [Text]
256 { _muAccept :: [Text]
257− , _muMaxSize :: Text
257+ , _muMaxSize :: Maybe Text
258 , _muResumablePath :: Text
258 , _muResumablePath :: Text
259 , _muSimplePath :: Text
259 , _muSimplePath :: Text
260 } deriving (Eq, Show)
260 } deriving (Eq, Show)
261
261
262instance FromJSON MediaUpload where
262instance FromJSON MediaUpload where
263 parseJSON = withObject "mediaUpload" $ \o -> MediaUpload
263 parseJSON = withObject "mediaUpload" $ \o -> MediaUpload
264− <$> o .: "accept"
264+ <$> o .: "accept"
265− <*> o .: "maxSize"
265+ <*> o .:? "maxSize"
266− <*> (o .: "protocols" >>= (.: "resumable") >>= (.: "path"))
266+ <*> (o .: "protocols" >>= (.: "resumable") >>= (.: "path"))
267− <*> (o .: "protocols" >>= (.: "simple") >>= (.: "path"))
267+ <*> (o .: "protocols" >>= (.: "simple") >>= (.: "path"))
268
268
269data Method a = Method
269data Method a = Method
270 { _mId :: Global
270 { _mId :: Global
@@ -344,7 +344,7 @@ data Description a = Description
344 , _dId :: Text
344 , _dId :: Text
345 , _dName :: Text
345 , _dName :: Text
346 , _dVersion :: Text
346 , _dVersion :: Text
347− , _dRevision :: Text
347+ , _dRevision :: Maybe Text
348 , _dTitle :: Text
348 , _dTitle :: Text
349 , _dDescription :: Help
349 , _dDescription :: Help
350 , _dIcons :: Map Text Text
350 , _dIcons :: Map Text Text
@@ -372,7 +372,7 @@ instance FromJSON a => FromJSON (Description a) where
372 <*> o .: "id"
372 <*> o .: "id"
373 <*> o .: "name"
373 <*> o .: "name"
374 <*> o .: "version"
374 <*> o .: "version"
375− <*> o .: "revision"
375+ <*> o .:? "revision"
376 <*> o .: "title"
376 <*> o .: "title"
377 <*> o .: "description"
377 <*> o .: "description"
378 <*> o .: "icons"
378 <*> o .: "icons"
gen/template/toc.ede+11−4
@@ -11,15 +11,22 @@
11-- /See:/ <{{ documentationLink }} {{ title }} Reference>
11-- /See:/ <{{ documentationLink }} {{ title }} Reference>
12module {{ moduleName }}
12module {{ moduleName }}
13 (
13 (
14− -- * REST Resources
14+ -- * API
15−
16− -- ** {{ title }}
17 {{ api.aliasName }}
15 {{ api.aliasName }}
18 , {{ api.aliasProxy }}
16 , {{ api.aliasProxy }}
19 , {{ api.url.name }}
17 , {{ api.url.name }}
18+
19+ -- * Service Methods
20 {% for action in api.methods %}
20 {% for action in api.methods %}
21
21
22− -- ** {{ action.value.prettyName }}
22+ -- ** {{ action.value.id }}
23+ , module {{ action.value.ns }}
24+ {% endfor %}
25+
26+ -- * REST Resources
27+ {% for action in api.resources %}
28+
29+ -- ** {{ action.value.id }}
23 , module {{ action.value.ns }}
30 , module {{ action.value.ns }}
24 {% endfor %}
31 {% endfor %}
25
32