open_api_import 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0d8fda18486db9232fa9bc04e944b73da1e6aacdce15c0c7f3da3a7dd49b874
-  data.tar.gz: 532c30e33b6f9d32e3e432366bf870f7e15df6c455bff3112a59bdbbbef50efa
+  metadata.gz: 671766612734c0e73f75720d08549843c3ebe59545bea07c8c011bcb8301e114
+  data.tar.gz: 1d33903fce9f4a859c69eb1f11f77372943d7367762b1d59480af434f14ed2aa
 SHA512:
-  metadata.gz: 6108beecdf144608c0714e84a0fcd58d849b734c694d8047d9886332b4499888719abd17fe3d72db9a6428f4542b33a8c56db82ab66a3f09291fd0eb50659a66
-  data.tar.gz: aa9593f00472d40f9e2faa88004289173258a61cca8d197ea99afb1d21d38440ab7ff7015ace1028a8c56d8ee1a9cad0c4a225052c0b23bd3de7571d84f1c2e6
+  metadata.gz: cbc17d0852b4fa8140bc642f02ef6636aaa3910349783b8ad08235f6f56ab47bb2b40bd4c87d66e9004917b7d8963d44a03e8c966bc6a53ea61db0ea5ea3c752
+  data.tar.gz: 162ffc86f272c1d94a7e14e68ca61cf18cb93c0a3e71e621bdd0dfb3463c144ec11d757c5fe6613a184247cd066b49ad848e7714b89ae5bccf917559add77197

data/lib/open_api_import.rb

@@ -294,8 +294,8 @@ class OpenApiImport
 
                     bodies.each do |body|
                       if body.keys.include?(:required) and body[:required].size > 0
-                        output << "# required data: #{body[:required].join(", ")}"
-                        data_required += body[:required]
+                        data_required += get_required_data(body)
+                        output << "# required data: #{data_required.inspect}"
                       end
 
                       if body.keys.include?(:properties) and body[:properties].size > 0
@@ -420,7 +420,7 @@ class OpenApiImport
 
             unless data_required.empty?
               output << "data_required: ["
-              output << ":#{data_required.uniq.join(", :")}"
+              output << ":#{data_required.uniq.join(", :")}".gsub(':{','{')
               output << "],"
             end
             unless data_read_only.empty?
@@ -443,17 +443,16 @@ class OpenApiImport
             unless data_examples.empty?
               unless data_required.empty?
                 reqdata = []
-                data_examples[0].each do |edata|
-                  data_required.each do |rdata|
-                    if edata.scan(/^#{rdata}:/).size>0 or edata.scan(/:/).size==0
-                      reqdata << edata
-                    end
+                  begin
+                    data_ex = eval("{#{data_examples[0].join(", ")}}") 
+                  rescue 
+                    data_ex = {}
                   end
-                end
+                  reqdata = filter(data_ex, data_required)
                 unless reqdata.empty?
-                  output << "data: {"
-                  output << reqdata.join(", \n")
-                  output << "},"
+                  phsd = pretty_hash_symbolized(reqdata)
+                  phsd[0]="data: {"
+                  output += phsd
                 end
               end
               unless data_read_only.empty? or !data_required.empty?
@@ -769,5 +768,60 @@ class OpenApiImport
       end
       return data_examples_all_of, bodies
     end
+    
+    # Get required data
+    private def get_required_data(body)
+      data_required = []
+      if body.keys.include?(:required) and body[:required].size > 0
+        body[:required].each do |r|
+          data_required << r.to_sym
+        end
+      end
+      data_required.each do |key|
+        if body.key?(:properties) and body[:properties][key].is_a?(Hash) and 
+          body[:properties][key].key?(:required) and body[:properties][key][:required].size>0
+            dr = get_required_data(body[:properties][key])
+            dr.each do |k|
+              data_required.push({key => k})
+            end
+        end
+      end
+      return data_required
+    end
+
+    #filter hash
+    private def filter(hash, keys)
+      result = {}
+      keys = [keys] unless keys.is_a?(Array)
+      keys.each do |k|
+        if k.is_a?(Symbol) and hash.key?(k)
+          if hash[k].is_a?(Hash)
+            result[k] = {}
+          else
+            result[k] = hash[k] 
+          end
+        elsif k.is_a?(Hash) and hash.key?(k.keys[0])
+          result[k.keys[0]][k.values[0]] = filter(hash[k.keys[0]], k.values[0]).values[0]
+        end
+      end
+      return result
+    end
+
+    #gen pretty hash symbolized
+    private def pretty_hash_symbolized(hash)
+      output = []
+      output << "{"
+      hash.each do |kr,kv|
+        if kv.kind_of?(Hash)
+          restv = pretty_hash_symbolized(kv)
+          restv[0] = "#{kr}: {"
+          output += restv
+        else
+          output << "#{kr}: #{kv.inspect}, "
+        end
+      end
+      output << "},"
+      return output
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_api_import
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-21 00:00:00.000000000 Z
+date: 2019-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oas_parser
@@ -56,20 +56,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement