swagger_model 0.3.5 → 0.3.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1cdaccce3accd9d09bc7849613c232b54dc5c926
4
- data.tar.gz: a5764c98d3f26831b5feff4483f840bf17fa81c3
3
+ metadata.gz: 4703ab809c83f9384d2d89a6cdc8b3aa3fc8d688
4
+ data.tar.gz: 8a560e09d06920fbba375d0ad6218f7390ba8db4
5
5
  SHA512:
6
- metadata.gz: eaf602935a795a30fd0341fb891953b8beecc776c4763c37067741433a9cb36466b06d01bb658a77f70a9abdd8ad586c29dc53eb807e015e79543cf36435bc39
7
- data.tar.gz: 8fd0498c010b26895edcbc789e377cd33ef75ff12bcd2e191f47eb600a520d61b23d81aa23093e7f7f14c99fd3ef7a0e86029b4b09c74e0fc5f3d8ec270c2d5b
6
+ metadata.gz: 3d8ed511dcf4fc9a79216204a1b2e9241bf22ca61bd9bf90ac5d5a8de42ce10abac408b9029ea839ce93f3f43cb50f5640beef12712c1e950b0918c7e19b72c6
7
+ data.tar.gz: afda4beac21ccc536a3f9d56a022b8d5b348d517e3123351643f3a05effab56fb7779111492f680d6eb3bceeef7c0250ee3ab7f172f09e5a7d11d4802664c888
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- swagger_model (0.3.5)
4
+ swagger_model (0.3.6)
5
5
 
6
6
  GEM
7
7
  remote: https://rubygems.org/
data/lib/swagger_model.rb CHANGED
@@ -249,22 +249,8 @@ module SwaggerModel
249
249
  end
250
250
  end
251
251
  when 'Array'
252
- if key == 'included'
253
- obj['type'] = 'array'
254
- obj['items'] = {}
255
- array = parse_array_with_multi_model(value, model, root_key)
256
- p array
257
- if array.size < 2
258
- obj['type'] = 'array'
259
- obj['items'] = array[0]
260
- else
261
- @logger.error("Cannot create model because of 2 or more models included in Array")
262
- exit
263
- end
264
- else
265
- obj['type'] = 'array'
266
- obj['items'] = parse_array(value, model, root_key)
267
- end
252
+ obj['type'] = 'array'
253
+ obj['items'] = parse_array(value, model, root_key)
268
254
  when 'String'
269
255
  obj['type'] = 'string'
270
256
  obj['example'] = value
@@ -343,6 +329,9 @@ module SwaggerModel
343
329
  model = {}
344
330
  object = parse_object(response, model, response_name)
345
331
  properties = object['properties']
332
+ if properties.has_key?('included')
333
+ properties.delete('included')
334
+ end
346
335
  if properties.has_key?('links')
347
336
  links = {}
348
337
  links['$ref'] = '#/definitions/Links'
@@ -381,6 +370,7 @@ module SwaggerModel
381
370
  end
382
371
  response_model[response_name]['properties'] = properties
383
372
  if object['required'].size > 0
373
+ object['required'].delete('included')
384
374
  response_model[response_name]['required'] = object['required']
385
375
  end
386
376
 
@@ -1,3 +1,3 @@
1
1
  module SwaggerModel
2
- VERSION = "0.3.5"
2
+ VERSION = "0.3.6"
3
3
  end
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.5
4
+ version: 0.3.6
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-19 00:00:00.000000000 Z
11
+ date: 2018-06-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler