swagger_yard 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e69ba8fc51e7c39ca9291c1e2917f28b5ed794fe
-  data.tar.gz: f00801cc7268c6faf6d1fdc22c8d9b14ccf55756
+SHA256:
+  metadata.gz: 83e1c4a1e03bfda00de8186e1c4ff6295cd80cc48d1053cd50f7f334ffe328fb
+  data.tar.gz: f0c8fd6215987665d201f921ccc4421a4f623c4c527867b01328f3279147b123
 SHA512:
-  metadata.gz: baa76a8eccd08176c057fb6d6969001899350d7f0ce8b5cf25ab00cd29d42bf81e554440e5517a1dd517c1bb4952f8deb6143127442e208f91c181825fec6faa
-  data.tar.gz: 7ddf6347f3a340ab921f0f576146fcd3709f8adbcbe049319ab63137fc156779998369f68b1612b97138434fccf9ae8198dde34b19e6463bc713df9d6038d375
+  metadata.gz: 8589dd0a10c513d877c27efcae067cebc61fcc7855c2a12c0a85c84db42007e63860f284afce8b63e7afb3f3372a1c035c806eb98d004a3ac9284c32b07324ff
+  data.tar.gz: 3d9d1203cea5812416f6838207e3f114f009653d8e1f787baea890260180652d5f337ce2cf6dcadb213a58e0503a674098fad98c841b41ecf366db08b5bfb8eb

data/lib/swagger_yard/model.rb

@@ -41,8 +41,12 @@ module SwaggerYard
       properties.detect {|prop| prop.name == key }
     end
 
+    TAG_ORDER = %w(model inherits discriminator property example)
+
     def parse_tags(tags)
-      tags.each do |tag|
+      sorted_tags = tags.each_with_index.sort_by { |t,i|
+        [TAG_ORDER.index(t.tag_name), i] }.map(&:first)
+      sorted_tags.each do |tag|
         case tag.tag_name
         when "model"
           @has_model_tag = true
@@ -63,7 +67,7 @@ module SwaggerYard
             if (prop = property(tag.name))
               prop.example = tag.text
             else
-              SwaggerYard.log.warn("no property '#{tag.name}' defined yet to which to attach example: #{value.inspect}")
+              SwaggerYard.log.warn("no property '#{tag.name}' defined yet to which to attach example: #{tag.text.inspect}")
             end
           else
             self.example = tag.text

data/lib/swagger_yard/type_parser.rb

@@ -58,9 +58,9 @@ module SwaggerYard
       rule(identifier: simple(:id)) do
         v = id.to_s
         case v
-        when /array/i
+        when /^array$/i
           { 'type' => 'array', 'items' => { 'type' => 'string' } }
-        when /object/i
+        when /^object$/i
           { 'type' => 'object' }
         when "float", "double"
           { 'type' => 'number', 'format' => v }

data/lib/swagger_yard/version.rb

@@ -1,3 +1,3 @@
 module SwaggerYard
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swagger_yard
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - chtrinh (Chris Trinh)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-24 00:00:00.000000000 Z
+date: 2019-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: SwaggerYard API doc through YARD