swagger_model 0.3.2 → 0.3.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/swagger_model.rb +29 -12
- data/lib/swagger_model/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 104d2f1c547b2d462520f6ae4c924b377d0af5ac
|
4
|
+
data.tar.gz: b261e9b21c71f59ec329ec1617fb804bae5f5456
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: df914daafc78edd57240f3d46076a501b7a4527299fd892824c0e5e79c8a8091eb6f309a4cdcb2dc4082977e60e8c77210bbfe71ea776bbc6ffc728a6ffb52f3
|
7
|
+
data.tar.gz: d7275e879cc7e39dafb3e27c210e6870e0d032153a1d64122496ad23eb402ef7b9ac49404978c3971d551b61a6ce73c7ebccb0c25dcae5bc468b6b7a5415580d
|
data/Gemfile.lock
CHANGED
data/lib/swagger_model.rb
CHANGED
@@ -210,17 +210,11 @@ module SwaggerModel
|
|
210
210
|
object = parse_object(value, model, model_name)
|
211
211
|
properties = object['properties']
|
212
212
|
newProperties = {}
|
213
|
-
newProperties['
|
214
|
-
newProperties['allOf'][0] = {}
|
215
|
-
newProperties['allOf'][0]['$ref'] = '#/definitions/ModelBase'
|
216
|
-
newProperties['allOf'][1] = {}
|
217
|
-
newProperties['allOf'][1]['type'] = 'object'
|
213
|
+
newProperties['type'] = 'object'
|
218
214
|
if object['required'].size > 0
|
219
|
-
newProperties['
|
215
|
+
newProperties['required'] = object['required']
|
220
216
|
end
|
221
|
-
properties
|
222
|
-
properties.delete('type')
|
223
|
-
newProperties['allOf'][1]['properties'] = properties
|
217
|
+
newProperties['properties'] = properties
|
224
218
|
model[model_name][model_name] = newProperties
|
225
219
|
obj['$ref'] = '#/definitions/' + model_name
|
226
220
|
elsif key == 'attributes'
|
@@ -288,6 +282,7 @@ module SwaggerModel
|
|
288
282
|
obj['format'] = 'float'
|
289
283
|
obj['example'] = value
|
290
284
|
else
|
285
|
+
@logger.warn("Unrecognized Type of `#{key}`. [key: #{key}, root_key: #{root_key}]")
|
291
286
|
obj['type'] = ''
|
292
287
|
obj['example'] = ''
|
293
288
|
end
|
@@ -321,9 +316,7 @@ module SwaggerModel
|
|
321
316
|
value = res[key]
|
322
317
|
m[key] = get_property(key, value, model, root_key)
|
323
318
|
if m[key]['type'] != ''
|
324
|
-
|
325
|
-
required.push(key)
|
326
|
-
end
|
319
|
+
required.push(key)
|
327
320
|
end
|
328
321
|
end
|
329
322
|
obj = {}
|
@@ -354,6 +347,30 @@ module SwaggerModel
|
|
354
347
|
links = {}
|
355
348
|
links['$ref'] = '#/definitions/Links'
|
356
349
|
properties['links'] = links
|
350
|
+
if response_model['Links'].nil?
|
351
|
+
response_model['Links'] = {
|
352
|
+
'self' => {
|
353
|
+
'type' => "string",
|
354
|
+
'example' => "https://contents.kurashiru.com/api/v1/videos?page%5Bnumber%5D=2&page%5Bsize%5D=20"
|
355
|
+
},
|
356
|
+
'first' => {
|
357
|
+
'type' => "string",
|
358
|
+
'example' => "https://contents.kurashiru.com/api/v1/videos?page%5Bnumber%5D=1&page%5Bsize%5D=20"
|
359
|
+
},
|
360
|
+
'prev' => {
|
361
|
+
'type' => "string",
|
362
|
+
'example' => "https://contents.kurashiru.com/api/v1/videos?page%5Bnumber%5D=1&page%5Bsize%5D=20"
|
363
|
+
},
|
364
|
+
'next' => {
|
365
|
+
'type' => "string",
|
366
|
+
'example' => "https://contents.kurashiru.com/api/v1/videos?page%5Bnumber%5D=3&page%5Bsize%5D=20"
|
367
|
+
},
|
368
|
+
'last' => {
|
369
|
+
'type' => "string",
|
370
|
+
'example' => "https://contents.kurashiru.com/api/v1/videos?page%5Bnumber%5D=100&page%5Bsize%5D=20"
|
371
|
+
}
|
372
|
+
}
|
373
|
+
end
|
357
374
|
end
|
358
375
|
if properties.has_key?('meta')
|
359
376
|
meta_name = response_name + 'Meta'
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: swagger_model
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.3.
|
4
|
+
version: 0.3.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- marumemomo
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-06-
|
11
|
+
date: 2018-06-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|