open_api_import 0.10.4 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49208568b77f0a0a4a4577918618d82ed6d685617d69cb5e2ea548c1abce0d36
-  data.tar.gz: 10d64714deb8b8229102ba47116f69abd36b0732a534caf0aefd5e8c01a2c272
+  metadata.gz: bf4a735fd2ca50a6f7d5070a96fef58896e1783834f586548deb943cee3aac49
+  data.tar.gz: 148fca2cc536cd64fbe1b70d21f902810659d67579922ae04cfaeda621400f17
 SHA512:
-  metadata.gz: a6d6a075fb6c4156b8983b41f2904c95aadb7d364745a97085d9caf1552ecb8e84a059f6a39c8517cc6695ec53401b0ebdd67bda9e65675e88071bb3e871c194
-  data.tar.gz: ae9083df4898a3d262e7ba32d789dba2c7a818bab646a47237455327b8362876cb27b5ec700f1a0d78c85fd3bf10d008a734a71f84387b50a1b8e620d4009374
+  metadata.gz: d31884dda9909b9e6bba2eec6fbfb83967a8d3d4b35e5e0826027e066a2f42c7a496d021257ec905f1b54a47da3e05177dab7bd3d7a8d0ba9ea3547edbd52166
+  data.tar.gz: 0c35baa4265c34312f2c2b6866a7197ecb3403a230dccdba20b03f04282674e3e97b6c1f80fd4142862788a351b759802a172a880b967de1e95a357a17cc9471

data/lib/open_api_import.rb

@@ -388,15 +388,17 @@ class OpenApiImport
                             end
                           end
 
-                          if dpv.key?(:type) and dpv[:type].downcase == "string"
-                            valv = '"' + valv + '"'
+                          #todo: consider check default and insert it
+                          if dpv.key?(:type)
+                            params_data << get_examples({dpk => dpv}, :only_value, true).join
+                            params_data[-1].chop!.chop! if params_data[-1].to_s[-2..-1]==', '
+                            params_data.pop if params_data[-1].match?(/^\s*$/im)
                           else
-                            #todo: consider check default and insert it
                             if valv.to_s == ""
                               valv = '"' + valv + '"'
                             end
+                            params_data << "#{dpk}: #{valv}"
                           end
-                          params_data << "#{dpk}: #{valv}"
                         }
 
                         if params_data.size > 0
@@ -730,14 +732,14 @@ class OpenApiImport
               else
                 #todo: differ between response examples and data examples
                 if type == :only_value
-                  example << get_response_examples({schema: val}).join("\n")
+                  example << get_response_examples({schema: val}, remove_readonly).join("\n")
                 else
-                  example << " #{prop.to_sym}: " + get_response_examples({schema: val}).join("\n") + ", "
+                  example << " #{prop.to_sym}: " + get_response_examples({schema: val}, remove_readonly).join("\n") + ", "
                 end
               end
             when "object"
               #todo: differ between response examples and data examples
-              res_ex = get_response_examples({schema: val})
+              res_ex = get_response_examples({schema: val}, remove_readonly)
               if res_ex.size == 0
                 res_ex = "{ }"
               else
@@ -755,7 +757,7 @@ class OpenApiImport
     end
 
     # Retrieve the response examples from the hash
-    private def get_response_examples(v)
+    private def get_response_examples(v, remove_readonly = false)
       # TODO: take in consideration the case allOf, oneOf... schema.items.allOf[0].properties schema.items.allOf[1].properties
       # example on https://github.com/OAI/OpenAPI-Specification/blob/master/examples/v2.0/yaml/petstore-expanded.yaml
       v=v.dup
@@ -765,7 +767,6 @@ class OpenApiImport
         v[:content][:'application/json'].key?(:schema)
         v=v[:content][:'application/json'].dup
       end
-
       if v.key?(:examples) && v[:examples].is_a?(Hash) && v[:examples].key?(:'application/json')
         if v[:examples][:'application/json'].is_a?(String)
           response_example << v[:examples][:'application/json']
@@ -817,9 +818,9 @@ class OpenApiImport
         end
       elsif v.key?(:schema) && v[:schema].is_a?(Hash) &&
             (v[:schema].key?(:properties) ||
-             (v[:schema].key?(:items) && v[:schema][:items].key?(:properties)) ||
-             (v[:schema].key?(:items) && v[:schema][:items].key?(:allOf)) ||
-             v[:schema].key?(:allOf))
+            (v[:schema].key?(:items) && v[:schema][:items].key?(:properties)) ||
+            (v[:schema].key?(:items) && v[:schema][:items].key?(:allOf)) ||
+            v[:schema].key?(:allOf))
         properties = {}
         if v[:schema].key?(:properties)
           properties = v[:schema][:properties]
@@ -837,7 +838,7 @@ class OpenApiImport
           response_example << "["
         end
 
-        response_example += get_examples(properties) unless properties.empty?
+        response_example += get_examples(properties, :key_value, remove_readonly) unless properties.empty?
 
         unless response_example.empty?
           if v[:schema].key?(:properties) || v[:schema].key?(:allOf)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_api_import
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-08 00:00:00.000000000 Z
+date: 2020-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oas_parser