open_api_import 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6aa027f9f436fa544d6abb6a501ef9fd6b45fd9955e4fc1a8167be0f86d99f2
-  data.tar.gz: 3a8ebb0c1582303b5c3e4d501628f23bb74a6c586108dafbe7ef14b8b05242cd
+  metadata.gz: dd409540237e0b7a67a323e92d46254cf63aefe515773cbee86a4a758eee1b47
+  data.tar.gz: 458b9577143635e64f136d31aafff98c62a9b2f77c057f7d6cf19c340a5c85fe
 SHA512:
-  metadata.gz: 1453d6c95a5c3d5155293e7f30621895b6e32b37361d1cbfa21ccae76a3e1a0001eaff30cfd8903da917dd45a43f9cc689563d6813ded330079012521cd986d4
-  data.tar.gz: fc8fc5a426f4d922eaff47c5c56d05108336248542babac5da2447f65811cc0290ae19ebec3a862f04255a28209f1a1144cd426a57fcf419342300573e61c955
+  metadata.gz: 4c07b1576d2bae97f39a0ba5ee9e1b6742180cefb6629d7b54462af1c2ee3b67e8e2e2a648164b79de562b6b757967aadef4564b2d0deeaae48e7627de47a4c9
+  data.tar.gz: 2380b32911e136fd69f7d7d90cdc6f1123ce76e3bf3f135b8d66e061eb0fde86b830583fbf8795414eb52eb608f96721e9dd80074bd741ccefb854506b54fc03

data/lib/open_api_import.rb

@@ -254,7 +254,7 @@ class OpenApiImport
               cont[:parameters] = [] unless cont.key?(:parameters)
               cont[:parameters] << {in: 'body', schema: cont[:requestBody][:content][:'application/json'][:schema] }
             end
-
+            data_examples_all_of = false
             if cont.key?(:parameters) && cont[:parameters].is_a?(Array)
               cont[:parameters].each do |p|
                 if p.keys.include?(:schema) and p[:schema].include?(:type)
@@ -280,13 +280,14 @@ class OpenApiImport
                   params_required << p[:name] if p[:required].to_s=="true"
                   description_parameters << "#    #{p[:name]}: (#{type}) #{"(required)" if p[:required].to_s=="true"} #{p[:description]}"
                 elsif p[:in] == "body"
+
                   if p.keys.include?(:schema)
                     if p[:schema].key?(:oneOf)
                       bodies = p[:schema][:oneOf]
                     elsif p[:schema].key?(:anyOf)
                       bodies = p[:schema][:anyOf]
                     elsif p[:schema].key?(:allOf)
-                      bodies = p[:schema][:allOf]
+                      data_examples_all_of, bodies = get_data_all_of_bodies(p)
                     else
                       bodies = [p[:schema]]
                     end
@@ -300,13 +301,25 @@ class OpenApiImport
                       end
 
                       if body.keys.include?(:properties) and body[:properties].size > 0
+                        
                         body[:properties].each { |dpk, dpv|
                           if dpv.keys.include?(:example)
                             valv = dpv[:example].to_s
                           else
                             if dpv.type == "object"
-                              valv = "{}"
-                            else  
+                              if dpv.key?(:properties)
+                                valv = get_examples(dpv[:properties]).join("\n")
+                              else
+                                valv = "{}"
+                              end
+                            elsif dpv.type == 'array'
+                              if dpv.key?(:items)
+                                valv = get_examples({dpk => dpv}, :only_value)
+                                valv = valv.join("\n")
+                              else
+                                valv = "[]"
+                              end
+                            else
                               valv = ""
                             end
                           end
@@ -338,7 +351,11 @@ class OpenApiImport
                           params_data << "#{dpk}: #{valv}"
                         }
                         if params_data.size > 0
-                          data_examples << params_data
+                          if data_examples_all_of == true and data_examples.size > 0
+                            data_examples[0]+=params_data
+                          else
+                            data_examples << params_data
+                          end
                           params_data = []
                         end
                       end
@@ -541,10 +558,10 @@ class OpenApiImport
 
   class << self
     # Retrieve the examples from the properties hash
-    private def get_examples(properties)
+    private def get_examples(properties, type=:key_value)
       #todo: consider using this method also to get data examples
       example = []
-      example << "{" unless properties.empty?
+      example << "{" unless properties.empty? or type==:only_value
       properties.each do |prop, val|
         if val.key?(:properties) and !val.key?(:example) and !val.key?(:type)
           val[:type]='object'
@@ -566,15 +583,31 @@ class OpenApiImport
           when "boolean"
             example << " #{prop.to_sym}: true, "
           when "array"
+            if val.key?(:items) and val[:items].size==1 and val[:items].is_a?(Hash) and val[:items].key?(:type)
+              val[:items][:enum]=[val[:items][:type]]
+            end
+
             if val.key?(:items) and val[:items].key?(:enum)
-              if val[:items][:enum][0].is_a?(String)
-                example << " #{prop.to_sym}: \"" + val[:items][:enum].sample + "\", "
+              if type==:only_value
+                if val[:items][:enum][0].is_a?(String)
+                  example << " [\"" + val[:items][:enum].sample + "\"] "
+                else
+                  example << " [" + val[:items][:enum].sample + "] "
+                end
               else
-                example << " #{prop.to_sym}: " + val[:items][:enum].sample + ", "
+                if val[:items][:enum][0].is_a?(String)
+                  example << " #{prop.to_sym}: [\"" + val[:items][:enum].sample + "\"], "
+                else
+                  example << " #{prop.to_sym}: [" + val[:items][:enum].sample + "], "
+                end
               end
             else
               #todo: differ between response examples and data examples
-              example << " #{prop.to_sym}: " + get_response_examples({schema: val}).join("\n") + ", "
+              if type == :only_value
+                example << get_response_examples({schema: val}).join("\n")
+              else
+                example << " #{prop.to_sym}: " + get_response_examples({schema: val}).join("\n") + ", "
+              end
             end
           when "object"
             #todo: differ between response examples and data examples
@@ -590,7 +623,7 @@ class OpenApiImport
           end
         end
       end
-      example << "}" unless properties.empty?
+      example << "}" unless properties.empty? or type==:only_value
       example
     end
 
@@ -691,5 +724,28 @@ class OpenApiImport
       end
       return response_example
     end
+
+
+    private def get_data_all_of_bodies(p)
+      bodies = []
+      data_examples_all_of = false
+      if p.is_a?(Array)
+        q = p
+      elsif p.key?(:schema) and p[:schema].key?(:allOf)
+        q = p[:schema][:allOf]
+      else
+        q =[p]
+      end
+      q.each do |pt|
+        if pt.is_a?(Hash) and pt.key?(:allOf)
+          #bodies += pt[:allOf]
+          bodies += get_data_all_of_bodies(pt[:allOf])[1]
+          data_examples_all_of = true
+        else
+          bodies << pt
+        end
+      end
+      return data_examples_all_of, bodies
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_api_import
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2019-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oas_parser
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.16'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.16'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: rufo
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
         version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement