swagger_model 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cb3ff5a74100d4be68752e3362d7d87555279c2
-  data.tar.gz: ea1d7ff34e9e3d1bc6235e82191ed4124b05a1ab
+  metadata.gz: a5ec4250155f5596fbfdb895c1fc77431e25f5f4
+  data.tar.gz: dcf3da9f4d97070fe08cce538785e8dac2317388
 SHA512:
-  metadata.gz: c9990cff7967bfa7ce66928b4e56e8bd763c76475650c6e659b6d45d8a9e3fa56e8a4e69e6491d175aa89a34a495e28a8309536b7a77351ea63162036e3b9dbf
-  data.tar.gz: f3754297208ebf2396b0b0ec23e7bb4590111ed2f6a0a06c1f2fd668a037ecf077d4f6b7e89bd3efd7af13701a34ccf379e9cb500a25811c8b66f63ae6940934
+  metadata.gz: 09134da0a1689dae2551e7afeec93553e8ce9f61124c17839092c198ee0fd828d9602d193026b4932c399d967f01a2f5ed557b07b3e542d6c00f1a27d213bab0
+  data.tar.gz: d46e008d49dfc2be4def4223fb2e20e7de85426704346a4812cd9fe917b5196bc139a7dcd6ce9493d730558a5650dcd17ee17f08dfcb011388903cdf56f18144

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    swagger_model (0.4.5)
+    swagger_model (0.4.6)
 
 GEM
   remote: https://rubygems.org/
@@ -45,4 +45,4 @@ DEPENDENCIES
   swagger_model!
 
 BUNDLED WITH
-   1.16.1
+   1.16.4

data/lib/swagger_model.rb

@@ -310,6 +310,12 @@ module SwaggerModel
       obj['required'] = required
       obj
     end
+    def self.result_to_yaml(result)
+      models = {}
+      result['models'].each { |key, value| models.merge!(value) }
+      data = result['responses'].merge(models)
+      data.to_yaml
+    end
     def self.create_from_json(params)
       response = {}.to_json
       json_string = params[:json_string]
@@ -329,15 +335,20 @@ module SwaggerModel
       response_model[response_name]['properties'] = {}
       model = {}
 
+      # For validate
+      modelData = []
+
       # Create response data
       if response.has_key?('data')
         data = response['data']
         case data.class.to_s
         when 'Hash'
           m = Model.new(data)
+          modelData.push(m)
           response_model[response_name]['properties']['data'] = m.to_swagger_hash(model)
         when 'Array'
           m = Model.new(data.first)
+          modelData.push(m)
           response_model[response_name]['properties']['data'] = {
             'type' => 'array',
             'items' => m.to_swagger_hash(model)
@@ -348,6 +359,7 @@ module SwaggerModel
       # Create included key models but not add included key to response
       if response.has_key?('included')
         included = Included.new(response['included'])
+        modelData.concat(included.models)
         included.models_to_swagger_hash(model)
       end
 
@@ -388,6 +400,24 @@ module SwaggerModel
         response_model['ErrorModelMeta'] = ErrorModelMeta.new().to_swagger_hash
       end
 
+      # validate models
+      modelTypes = modelData.map { |e| e.type  }
+      modelData.each do |m|
+        next if m.relationships.nil?
+        next if m.relationships.relationships.empty?
+        m.relationships.relationships.each do |e|
+          next if e['data'].relation.nil?
+          type = e['data'].relation.type
+          if !modelTypes.include?(type)
+            newModel = Model.new({
+              'id' => '',
+              'type' => type
+              })
+            newModel.to_swagger_hash(model)
+          end
+        end
+      end
+
       # Set required
       response_model[response_name]['required'] = response_model[response_name]['properties'].keys
 

data/lib/swagger_model/included.rb

@@ -1,6 +1,8 @@
 module SwaggerModel
   module SwaggerV2
     class Included
+      attr_accessor :models
+
       def initialize(array)
         @models = array.map { |e| Model.new(e) }
       end

data/lib/swagger_model/model.rb

@@ -4,11 +4,15 @@ require_relative 'attributes'
 module SwaggerModel
   module SwaggerV2
     class Model
+      attr_accessor :relationships, :type
+
       def initialize(hash)
         @id = hash['id']
         @type = hash['type']
         @model_name = ActiveSupport::Inflector.classify(@type.gsub('-', '_'))
-        @attributes = Attributes.new(hash['attributes'], @model_name)
+        if !hash['attributes'].nil?
+          @attributes = Attributes.new(hash['attributes'], @model_name)
+        end
         if !hash['relationships'].nil?
           @relationships = Relationships.new(hash['relationships'])
         end
@@ -27,11 +31,21 @@ module SwaggerModel
             'type' => {
               'type' => 'string',
               'example' => @type
-            },
-            'attributes' => @attributes.to_swagger_hash(aModel)
-          }
+            }
+          },
+          'required' => [
+            'id',
+            'type'
+          ]
         }
-        hash['properties']['relationships'] = @relationships.to_swagger_hash(aModel, @model_name) unless @relationships.nil?
+        unless @attributes.nil?
+          hash['properties']['attributes'] = @attributes.to_swagger_hash(aModel)
+          hash['required'].push('attributes')
+        end
+        unless @relationships.nil?
+          hash['properties']['relationships'] = @relationships.to_swagger_hash(aModel, @model_name)
+          hash['required'].push('relationships')
+        end
         aModel[@model_name] = hash
 
         {

data/lib/swagger_model/relation.rb

@@ -4,6 +4,7 @@ require 'active_support/core_ext'
 module SwaggerModel
   module SwaggerV2
     class Relation
+      attr_accessor :type
       def initialize(hash)
         @type = hash['type']
       end

data/lib/swagger_model/relation_data.rb

@@ -1,6 +1,7 @@
 module SwaggerModel
   module SwaggerV2
     class RelationData
+      attr_accessor :relation
       def initialize(hash)
         @relation = Relation.new(hash)
       end

data/lib/swagger_model/relation_data_array.rb

@@ -3,6 +3,7 @@ require_relative 'relation'
 module SwaggerModel
   module SwaggerV2
     class RelationDataArray
+      attr_accessor :relation
       def initialize(array)
         if array.size > 0
           @relation = Relation.new(array.first)

data/lib/swagger_model/relationships.rb

@@ -4,6 +4,8 @@ require_relative 'relation_data_array'
 module SwaggerModel
   module SwaggerV2
     class Relationships
+      attr_accessor :relationships
+
       def initialize(hash)
         @relationships = []
         hash.keys.each do |key|

data/lib/swagger_model/version.rb

@@ -1,3 +1,3 @@
 module SwaggerModel
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swagger_model
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - marumemomo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: swagger_model