swagger_model 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f7c65359fa58890e69ebd599e538474dfaae1ac
-  data.tar.gz: 0635b5d20453ea7cb40225142af9a7bd6e611f5d
+  metadata.gz: 39600c03ec1cbf1c82ed82ef2056ce4c21a1d09f
+  data.tar.gz: eb62ca3794c6b02ed163ad3d5a186360516c6127
 SHA512:
-  metadata.gz: 0ee8642f285940a7503b119817dee9bd41f167129f9606228a17467830ab4adcd76f33995b4ea4a241abc93dc79b3a403a32c07390f98a0f4aff0f367eab824b
-  data.tar.gz: a94348c709d7195b3f1a253fc4135fb829faa11dec6674bc9c9a40ee178804f31ad73aede8e20d5ab3fd170b958452a7a757d6d05b11b44617a34e53dc044c76
+  metadata.gz: b440fadc6081cfaa922896accdb1486acbee06d00014bbda75f539b590c3ce1a43acb2a8293284e836d7eaa2f3d3cc394fb3bcf42eab9079cead9425c0591cdd
+  data.tar.gz: 6c10cfbc2436ebf3ac80d32cc7436ee27376f8f38a57a4731f0eaf07b5aef0f710a270622d55c184a6b38d6b7fa8f1579a655f9b1474aaf80dc2392f89d89efd

data/Gemfile.lock

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

data/lib/swagger_model/attributes.rb

@@ -10,7 +10,6 @@ module SwaggerModel
         hash.keys.each do |key|
           value = hash[key]
           attribute = get_attribute(value, key)
-          attribute['key'] = key
           @attributes.push(attribute)
         end
       end
@@ -90,13 +89,14 @@ module SwaggerModel
           item = value.first
           attribute = {
             'type' => 'array',
-            'item' => get_attribute(item)
+            'item' => get_attribute(item, key)
           }
         else
           attribute = {
             'type' => type
           }
         end
+        attribute['key'] = key
         attribute
       end
       def get_type(value)

data/lib/swagger_model/relation_data_array.rb

@@ -4,10 +4,16 @@ module SwaggerModel
   module SwaggerV2
     class RelationDataArray
       def initialize(array)
-        @relation = Relation.new(array.first)
+        if array.size > 0
+          @relation = Relation.new(array.first)
+        end
+
       end
 
       def to_swagger_hash(key, parent_name)
+        if @relation.nil?
+          return nil
+        end
         name = parent_name + ActiveSupport::Inflector.classify(key.gsub('-', '_')) + 'Data'
         {
           name => {

data/lib/swagger_model/relationships.rb

@@ -30,11 +30,13 @@ module SwaggerModel
         @relationships.each do |r|
           parent_name = model_name + 'Relationships'
           swagger_hash = r['data'].to_swagger_hash(r['key'], parent_name)
-          name = swagger_hash.keys.first
-          properties[r['key']] = {
-            '$ref' => "#/definitions/#{name}"
-          }
-          model[name] = swagger_hash[name]
+          unless swagger_hash.nil?
+            name = swagger_hash.keys.first
+            properties[r['key']] = {
+              '$ref' => "#/definitions/#{name}"
+            }
+            model[name] = swagger_hash[name]
+          end
         end
         hash['properties'] = properties
         hash['required'] = properties.keys

data/lib/swagger_model/version.rb

@@ -1,3 +1,3 @@
 module SwaggerModel
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swagger_model
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - marumemomo