open_api_import 0.7.5 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54be1f4446f39e542561f15f1e0f650c65f6a1a91a6cad9392e09fa6703b40c9
-  data.tar.gz: 10f01866d9c18b487fb900b32790f8f0876540ca8959f2a634a7dafec6a2de09
+  metadata.gz: 349414f04ac95d62ddc790ed6eb8c78adad89c2eaa3b4f4d406c34c678143680
+  data.tar.gz: 5f443ca0d9f463455937d4a3f3fcb2a230a344d740be6ebeb4031bb09774c0a2
 SHA512:
-  metadata.gz: fba22a339648c4bf383d459149f7554bb52309811232be5887a2e634a6666794163f73fccb76ca62d820aabd0a754b90523e9671bc3ce20e2a295acb88cca386
-  data.tar.gz: 3c370e6567c8eb3efa75c6e45509bd273dd5399ceec382c1cd26337e8115346ff4076aa703aeb4e24622e5d5aaf758a0278b4da26a2fecf97598ce60fed10328
+  metadata.gz: a75dc6469b177d39a3e7682ccd7b51ebe61d95ae038f3f0e61e0e99bc7c2444a3002636794f9888d3ef8714b354cc3b7f4360bc8a9bca0d2c66c3a155a1dbb4d
+  data.tar.gz: 944f57ff3070edc0c17c49af937288861f695ff632dfb9e3b08a85edee5e0e1987c6365bbb7c6b3e430935f5212f156f9af5d7a77584c8295d33de7371e2f208

data/lib/open_api_import.rb

@@ -217,11 +217,10 @@ class OpenApiImport
             if include_responses && cont.key?(:responses) && cont[:responses].is_a?(Hash)
               cont[:responses].each do |k, v|
                 response_example = []
-
                 response_example = get_response_examples(v)
+                data_pattern += get_patterns(k, v[:schema]) if v.key?(:schema)
                 v[:description] = v[:description].to_s.gsub("'", %q(\\\'))
                 
-                
                 if !response_example.empty?
                   responses << "'#{k}': { "
                   responses << "message: '#{v[:description]}', "
@@ -325,14 +324,9 @@ class OpenApiImport
                           if dpv.keys.include?(:description)
                             description_parameters << "#    #{dpk}: (#{dpv[:type]}) #{dpv[:description]}"
                           end
-                          if dpv.keys.include?(:pattern)
-                            #todo: control better the cases with back slashes
-                            if dpv[:pattern].include?('\\/')
-                              data_pattern << "#{dpk}: //"
-                            else
-                              data_pattern << "#{dpk}: /#{dpv[:pattern].to_s.gsub("\\/", "\/")}/"
-                            end
-                          end
+
+                          data_pattern += get_patterns(dpk,dpv)
+
                           if dpv.keys.include?(:readOnly) and dpv[:readOnly] == true
                             data_read_only << dpk
                           end
@@ -795,6 +789,58 @@ class OpenApiImport
       return data_required
     end
 
+    # Get patterns
+    private def get_patterns(dpk, dpv)
+      data_pattern = []
+
+      if dpv.keys.include?(:pattern)
+        #todo: control better the cases with back slashes
+        if dpv[:pattern].include?('\\/')
+          data_pattern << "#{dpk}: //"
+        else
+          data_pattern << "#{dpk}: /#{dpv[:pattern].to_s.gsub("\\/", "\/")}/"
+        end
+      elsif dpv.key?(:minLength) and dpv.key?(:maxLength)
+        data_pattern << "#{dpk}: :'#{dpv[:minLength]}-#{dpv[:maxLength]}:TN'"
+      elsif dpv.key?(:minLength) and !dpv.key?(:maxLength)
+        data_pattern << "#{dpk}: :'#{dpv[:minLength]}:TN'"
+      elsif !dpv.key?(:minLength) and dpv.key?(:maxLength)
+        data_pattern << "#{dpk}: :'0-#{dpv[:maxLength]}:TN'"
+      elsif dpv.key?(:minimum) and dpv.key?(:maximum) and dpv[:type]=='string'
+        data_pattern << "#{dpk}: :'#{dpv[:minimum]}-#{dpv[:maximum]}:TN'"
+      elsif dpv.key?(:minimum) and dpv.key?(:maximum)
+        data_pattern << "#{dpk}: #{dpv[:minimum]}..#{dpv[:maximum]}"
+      elsif dpv.key?(:minimum) and !dpv.key?(:maximum)
+        if RUBY_VERSION >= '2.6.0'
+          data_pattern << "#{dpk}: #{dpv[:minimum]}.."
+        else
+          data_pattern << "##{dpk}: #{dpv[:minimum]}.. # INFINITE only working on ruby>=2.6.0"
+        end
+      elsif !dpv.key?(:minimum) and dpv.key?(:maximum)
+        data_pattern << "#{dpk}: 0..#{dpv[:maximum]}"
+      elsif dpv.key?(:enum)
+        data_pattern << "#{dpk}: :'#{dpv[:enum].join('|')}'"
+      elsif dpv[:format] == 'date-time'
+        data_pattern << "#{dpk}: DateTime"
+      elsif dpv[:type] == 'boolean'
+        data_pattern << "#{dpk}: Boolean"
+      elsif dpv[:type] == 'array' and dpv.key?(:items) and dpv[:items].is_a?(Hash) and dpv[:items].key?(:enum) and dpv[:items][:enum].is_a?(Array)
+        #{:title=>"Balala", :type=>"array", :items=>{:type=>"string", :enum=>["uno","dos"], :example=>"uno"}}
+        data_pattern << "#{dpk}: [:'#{dpv[:items][:enum].join('|')}']"
+      elsif dpv[:type] == 'array' and dpv.key?(:items) and dpv[:items].is_a?(Hash) and !dpv[:items].key?(:enum) and dpv[:items].key?(:properties)
+        #{:title=>"Balala", :type=>"array", :items=>{title: 'xxxx, properties: {server: {enum:['ibm','msa','pytan']}}}
+        dpv[:items][:properties].each do |dpkk,dpvv|
+          data_pattern += get_patterns(dpkk,dpvv)
+        end
+      elsif dpv[:type] == 'object' and dpv.key?(:properties)
+        dpv[:properties].each do |dpkk,dpvv|
+          data_pattern += get_patterns(dpkk,dpvv)
+        end
+      end
+      return data_pattern
+
+    end
+
     #filter hash
     private def filter(hash, keys)
       result = {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_api_import
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.0
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-18 00:00:00.000000000 Z
+date: 2019-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oas_parser
@@ -59,7 +59,7 @@ dependencies:
         version: '1.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.8
+        version: 1.12.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '1.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.8
+        version: 1.12.12
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement