open_api_import 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d123eef0845352c28e10274ebff8fc627462d591013e44099107d8523876cc0
-  data.tar.gz: c62cd35822be64e9f8e388a202300c49423998baec1b9278c44d2836ff076579
+  metadata.gz: 5fa1a76a617230a0abfacaa9dac96af4eb552527b48101359073c94634a6ca83
+  data.tar.gz: f8c3f3bf50d9aeb17cd5910f6ab26fa52692420ae20af9f67a58536295787beb
 SHA512:
-  metadata.gz: 3edbd39324abf7210720f119feeaff317c1f06561d501cb5e984abcce229f725529f1bca917028763e85b84f95bef45aae7945adecdd8af9e2c23e3e5f45523e
-  data.tar.gz: 15aadb2413aa6fcadf746b8c302db2adf6332c5cda8dc1af413afcfb4f8ed09adb99f6fb134c1e71619663de1f734b8ba60850d3dc4b2981cebe98bbb37ed20e
+  metadata.gz: 1ca17b645ee10cecec6cbbba624a50128b6b1efaa8afc07fb553a5db55f01097ac78826d89369b27b3a0a0ecd51486c7562d04ecfefaa47abf46efc50506db8b
+  data.tar.gz: 91ad90bf66880330429278a558c9a9a72caf33de24533e475b36a1aa4b78b50024282f71edbdf0f3c538a6096dbaaf282567f8a65b7f4541a9eb43c8d6890b15

data/lib/open_api_import.rb

@@ -127,6 +127,7 @@ class OpenApiImport
             params_query = []
             params_required = []
             description_parameters = []
+            data_form = []
             data_required = []
             data_read_only = []
             data_default = []
@@ -135,7 +136,7 @@ class OpenApiImport
             responses = []
 
             # for the case operationId is missing
-            cont[:operationId] = "unknown" unless cont.key?(:operationId)
+            cont[:operationId] = "undefined" unless cont.key?(:operationId)
             if create_method_name == :path
               method_name = (met.to_s + "_" + path.path.to_s).snake_case
               method_name.chop! if method_name[-1] == "_"
@@ -219,7 +220,8 @@ class OpenApiImport
                 response_example = []
                 response_example = get_response_examples(v)
     
-                data_pattern += get_patterns(k, v[:schema]) if v.key?(:schema)
+                data_pattern += get_patterns('', v[:schema]) if v.key?(:schema)
+                data_pattern.uniq!
                 v[:description] = v[:description].to_s.gsub("'", %q(\\\'))
                 
                 if !response_example.empty?
@@ -277,8 +279,26 @@ class OpenApiImport
                   params_query << p[:name]
                   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] == "formData" or p[:in] == "formdata"
+                  #todo: take in consideration: default, required
+                  #todo: see if we should add the required as params to the method and not required as options
+                  #todo: set on data the required fields with the values from args
+
+                  description_parameters << "#    #{p[:name]}: (#{p[:type]}) #{p[:description]}"
+                  case p[:type]
+                  when /^string$/i
+                    data_form << "#{p[:name]}: ''"
+                  when /^boolean$/i
+                    data_form << "#{p[:name]}: true"
+                  when /^number$/i
+                    data_form << "#{p[:name]}: 0"
+                  when /^integer$/i
+                    data_form << "#{p[:name]}: 0"
+                  else
+                    puts "! on formData not supported type #{p[:type]}"
+                  end
+        
                 elsif p[:in] == "body"
-
                   if p.keys.include?(:schema)
                     if p[:schema].key?(:oneOf)
                       bodies = p[:schema][:oneOf]
@@ -327,6 +347,7 @@ class OpenApiImport
                           end
 
                           data_pattern += get_patterns(dpk,dpv)
+                          data_pattern.uniq!
 
                           if dpv.keys.include?(:readOnly) and dpv[:readOnly] == true
                             data_read_only << dpk
@@ -360,6 +381,10 @@ class OpenApiImport
                       end
                     end
                   end
+                elsif p[:in]=="header"
+                  #todo: see how we can treat those cases
+                else
+                  puts "! not imported data with :in:#{p[:in]} => #{p.inspect}"
                 end
               end
 
@@ -441,6 +466,10 @@ class OpenApiImport
               output << "},"
             end
 
+            unless data_form.empty?
+              data_examples << data_form
+            end
+
             unless data_examples.empty?
               unless data_required.empty?
                 reqdata = []
@@ -808,47 +837,56 @@ class OpenApiImport
         #todo: control better the cases with back slashes
         if dpv[:pattern].include?('\\\\/')
           #for cases like this: ^[^\.\\/:*?"<>|][^\\/:*?"<>|]{0,13}[^\.\\/:*?"<>|]?$
-          data_pattern << "#{dpk}: /#{dpv[:pattern].to_s.gsub('\/','/')}/"
+          data_pattern << "'#{dpk}': /#{dpv[:pattern].to_s.gsub('\/','/')}/"
         else
-          data_pattern << "#{dpk}: /#{dpv[:pattern].to_s}/"
+          data_pattern << "'#{dpk}': /#{dpv[:pattern].to_s}/"
         end
       elsif dpv.key?(:minLength) and dpv.key?(:maxLength)
-        data_pattern << "#{dpk}: :'#{dpv[:minLength]}-#{dpv[:maxLength]}:LN$'"
+        data_pattern << "'#{dpk}': :'#{dpv[:minLength]}-#{dpv[:maxLength]}:LN$'"
       elsif dpv.key?(:minLength) and !dpv.key?(:maxLength)
-        data_pattern << "#{dpk}: :'#{dpv[:minLength]}:LN$'"
+        data_pattern << "'#{dpk}': :'#{dpv[:minLength]}:LN$'"
       elsif !dpv.key?(:minLength) and dpv.key?(:maxLength)
-        data_pattern << "#{dpk}: :'0-#{dpv[:maxLength]}:LN$'"
+        data_pattern << "'#{dpk}': :'0-#{dpv[:maxLength]}:LN$'"
       elsif dpv.key?(:minimum) and dpv.key?(:maximum) and dpv[:type]=='string'
-        data_pattern << "#{dpk}: :'#{dpv[:minimum]}-#{dpv[:maximum]}:LN$'"
+        data_pattern << "'#{dpk}': :'#{dpv[:minimum]}-#{dpv[:maximum]}:LN$'"
       elsif dpv.key?(:minimum) and dpv.key?(:maximum)
-        data_pattern << "#{dpk}: #{dpv[:minimum]}..#{dpv[: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]}.."
+          data_pattern << "'#{dpk}': #{dpv[:minimum]}.."
         else
-          data_pattern << "##{dpk}: #{dpv[:minimum]}.. # INFINITE only working on ruby>=2.6.0"
+          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('|')}'"
+        data_pattern << "'#{dpk}': 0..#{dpv[:maximum]}"
       elsif dpv[:format] == 'date-time'
-        data_pattern << "#{dpk}: DateTime"
+        data_pattern << "'#{dpk}': DateTime"
       elsif dpv[:type] == 'boolean'
-        data_pattern << "#{dpk}: Boolean"
+        data_pattern << "'#{dpk}': Boolean"
+      elsif dpv.key?(:enum)
+        data_pattern << "'#{dpk}': :'#{dpv[:enum].join('|')}'"
       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('|')}']"
+        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)
+          if dpk == ''
+            data_pattern += get_patterns("#{dpkk}",dpvv)
+          else
+            data_pattern += get_patterns("#{dpk}.#{dpkk}",dpvv)
+          end
         end
       elsif dpv[:type] == 'object' and dpv.key?(:properties)
         dpv[:properties].each do |dpkk,dpvv|
-          data_pattern += get_patterns(dpkk,dpvv)
+          if dpk == ''
+            data_pattern += get_patterns("#{dpkk}",dpvv)
+          else
+            data_pattern += get_patterns("#{dpk}.#{dpkk}",dpvv)
+          end
         end
       end
+      data_pattern.uniq!
       return data_pattern
 
     end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: open_api_import
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-20 00:00:00.000000000 Z
+date: 2019-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oas_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: rufo
   requirement: !ruby/object:Gem::Requirement
@@ -54,42 +54,42 @@ dependencies:
   name: nice_hash
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.14.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.14.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.8.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.8.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -146,8 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: OpenApiImport -- Import a Swagger or Open API file and create a Ruby Request