swagger_model 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bd477b4e6bf093b8f9817a428e645cddd5da250
-  data.tar.gz: d8b667c97f31ce09d02e6c83a79983dea2ed6748
+  metadata.gz: 104d2f1c547b2d462520f6ae4c924b377d0af5ac
+  data.tar.gz: b261e9b21c71f59ec329ec1617fb804bae5f5456
 SHA512:
-  metadata.gz: 0e1c974e579c0d24341af65ab05bc41e47008b48e38bfcacaef33918d2ab2eec54d4be32ef668de599357cf9591c9c51c4c68eced63b5db5996252597f9bc447
-  data.tar.gz: abf46c37dea75d4b5a3c900339c333e6979ede886db8b7f86dd94b66c5d31c880d0cddd1208845d4797a97425b8ff33e8422826c2d092792e495e1dc66aa478a
+  metadata.gz: df914daafc78edd57240f3d46076a501b7a4527299fd892824c0e5e79c8a8091eb6f309a4cdcb2dc4082977e60e8c77210bbfe71ea776bbc6ffc728a6ffb52f3
+  data.tar.gz: d7275e879cc7e39dafb3e27c210e6870e0d032153a1d64122496ad23eb402ef7b9ac49404978c3971d551b61a6ce73c7ebccb0c25dcae5bc468b6b7a5415580d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    swagger_model (0.3.2)
+    swagger_model (0.3.3)
 
 GEM
   remote: https://rubygems.org/

data/lib/swagger_model.rb

@@ -210,17 +210,11 @@ module SwaggerModel
           object = parse_object(value, model, model_name)
           properties = object['properties']
           newProperties = {}
-          newProperties['allOf'] = []
-          newProperties['allOf'][0] = {}
-          newProperties['allOf'][0]['$ref'] = '#/definitions/ModelBase'
-          newProperties['allOf'][1] = {}
-          newProperties['allOf'][1]['type'] = 'object'
+          newProperties['type'] = 'object'
           if object['required'].size > 0
-              newProperties['allOf'][1]['required'] = object['required']
+              newProperties['required'] = object['required']
           end
-          properties.delete('id')
-          properties.delete('type')
-          newProperties['allOf'][1]['properties'] = properties
+          newProperties['properties'] = properties
           model[model_name][model_name] = newProperties
           obj['$ref'] = '#/definitions/' + model_name
         elsif key == 'attributes'
@@ -288,6 +282,7 @@ module SwaggerModel
         obj['format'] = 'float'
         obj['example'] = value
       else
+        @logger.warn("Unrecognized Type of `#{key}`. [key: #{key}, root_key: #{root_key}]")
         obj['type'] = ''
         obj['example'] = ''
       end
@@ -321,9 +316,7 @@ module SwaggerModel
         value = res[key]
         m[key] = get_property(key, value, model, root_key)
         if m[key]['type'] != ''
-          unless (keys.include?('id') && keys.include?('type')) && (key == 'id' || key == 'type')
-            required.push(key)
-          end
+          required.push(key)
         end
       end
       obj = {}
@@ -354,6 +347,30 @@ module SwaggerModel
         links = {}
         links['$ref'] = '#/definitions/Links'
         properties['links'] = links
+        if response_model['Links'].nil?
+          response_model['Links'] = {
+            'self' => {
+              'type' => "string",
+              'example' => "https://contents.kurashiru.com/api/v1/videos?page%5Bnumber%5D=2&page%5Bsize%5D=20"
+            },
+            'first' => {
+              'type' => "string",
+              'example' => "https://contents.kurashiru.com/api/v1/videos?page%5Bnumber%5D=1&page%5Bsize%5D=20"
+            },
+            'prev' => {
+              'type' => "string",
+              'example' => "https://contents.kurashiru.com/api/v1/videos?page%5Bnumber%5D=1&page%5Bsize%5D=20"
+            },
+            'next' => {
+              'type' => "string",
+              'example' => "https://contents.kurashiru.com/api/v1/videos?page%5Bnumber%5D=3&page%5Bsize%5D=20"
+            },
+            'last' => {
+              'type' => "string",
+              'example' => "https://contents.kurashiru.com/api/v1/videos?page%5Bnumber%5D=100&page%5Bsize%5D=20"
+            }
+          }
+        end
       end
       if properties.has_key?('meta')
         meta_name = response_name + 'Meta'

data/lib/swagger_model/version.rb

@@ -1,3 +1,3 @@
 module SwaggerModel
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swagger_model
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - marumemomo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2018-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler