open_api_import 0.10.2 → 0.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 003ae82f9aeea04faa6bcc01766bd607695d3eed5dd09fb3059851a7156e0e76
-  data.tar.gz: 005db7c9d7a54fd1264c9cd58ea69b68dd085bf44798da3abf4b88cbe6a1ba04
+  metadata.gz: 7648a1c4167d4316385baaddeb6ab83f683b148c264c8cee30f706567e2d0d68
+  data.tar.gz: fa8f058d9d01a39201f9d4aea2422a82289ef6a755a6a9a16679bec0e4935fa0
 SHA512:
-  metadata.gz: b11737afc2530b6ab2a4db94c63138a8791edcd95b2c8b335791162d1ccddd8d9986a40751b6810c7a843aa7df1ad2798fa031ad51f3fd9e69824106dfc64953
-  data.tar.gz: 61966f66d9d85cf15d01e292adf95723cbe415cbbea2f586feab6bb688204d03ffd30065c9feea631bb3c7e0a5946472400474bbe4cb550854eb93343cc8472d
+  metadata.gz: 96bc61aa9048d2d94a099a18d95f388d6fad31276e193b76d001040dd22c0d66b12511c5d41a337e676dd423517aeea30fb8686cf7f8b7d57535ea3aebb4255a
+  data.tar.gz: aa57d0978a400e5e31fb8dcdc994f414d5a994b1d521f89163b44d0d980de0ed5b29671d15464c51c2b0d42281afd47f3179314a48a81946c8627e308e030f5d

data/lib/open_api_import.rb

@@ -150,6 +150,10 @@ class OpenApiImport
             elsif create_method_name == :operation_id
               if (name_for_module == :tags or name_for_module == :tags_file) and cont.key?(:tags) and cont[:tags].is_a?(Array) and cont[:tags].size>0
                 metnametmp = cont[:operationId].gsub(/^#{cont[:tags].join}[\s_]*/, '')
+                cont[:tags].join.split(' ').each do |tag|
+                  metnametmp.gsub!(/^#{tag}[\s_]*/i, '')
+                end
+                metnametmp = met if metnametmp == ''
               else
                 metnametmp = cont[:operationId]
               end
@@ -157,6 +161,10 @@ class OpenApiImport
             else
               if (name_for_module == :tags or name_for_module == :tags_file) and cont.key?(:tags) and cont[:tags].is_a?(Array) and cont[:tags].size>0
                 method_name = cont[:operationId].gsub(/^#{cont[:tags].join}[\s_]*/, '')
+                cont[:tags].join.split(' ').each do |tag|
+                  method_name.gsub!(/^#{tag}[\s_]*/i, '')
+                end
+                method_name = met if method_name == ''
               else
                 method_name = cont[:operationId]
               end
@@ -337,7 +345,11 @@ class OpenApiImport
                         
                         body[:properties].each { |dpk, dpv|
                           if dpv.keys.include?(:example)
-                            valv = dpv[:example].to_s
+                            if dpv[:example].is_a?(Array) and dpv.type != 'array'
+                              valv = dpv[:example][0]
+                            else
+                              valv = dpv[:example].to_s
+                            end
                           else
                             if dpv.type == "object"
                               if dpv.key?(:properties)
@@ -357,32 +369,48 @@ class OpenApiImport
                             end
                           end
                           if dpv.keys.include?(:description)
-                            description_parameters << "#    #{dpk}: (#{dpv[:type]}) #{dpv[:description]}"
+                            description_parameters << "#    #{dpk}: (#{dpv[:type]}) #{dpv[:description].split("\n").join("\n#\t\t\t")}"
                           end
 
                           data_pattern += get_patterns(dpk,dpv)
                           data_pattern.uniq!
+                          dpkeys = []
+                          data_pattern.reject! do |dp| 
+                            dpkey = dp.scan(/^'\w+'/)
+
+                            if dpkeys.include?(dpkey)
+                              true
+                            else
+                              dpkeys << dpkey
+                              false
+                            end
+                          end
 
                           if dpv.keys.include?(:readOnly) and dpv[:readOnly] == true
                             data_read_only << dpk
                           end
                           if dpv.keys.include?(:default)
-                            if dpv.type != "string"
+                            if dpv[:default].nil?
+                              data_default << "#{dpk}: nil"
+                            elsif dpv.type != "string"
                               data_default << "#{dpk}: #{dpv[:default]}"
                             else
                               data_default << "#{dpk}: '#{dpv[:default]}'"
                             end
                           end
 
-                          if dpv.key?(:type) and dpv[:type].downcase == "string"
-                            valv = '"' + valv + '"'
+                          #todo: consider check default and insert it
+                          #todo: remove array from here and add the option to get_examples for the case thisisthekey: ['xxxx']
+                          if dpv.key?(:type) and dpv[:type]!='array'
+                            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
                           if data_examples_all_of == true and data_examples.size > 0
@@ -674,10 +702,14 @@ class OpenApiImport
             val[:type]='array'
           end
           if val.key?(:example)
-            example << if val[:example].is_a?(String) or val[:example].is_a?(Time)
-              " #{prop.to_sym}: \"#{val[:example]}\", "
+            if val[:example].is_a?(Array) and val.key?(:type) and val[:type]=='string'
+              example << " #{prop.to_sym}: \"#{val[:example][0]}\", " # only the first example
             else
-              " #{prop.to_sym}: #{val[:example]}, "
+              example << if val[:example].is_a?(String) or val[:example].is_a?(Time)
+                " #{prop.to_sym}: \"#{val[:example]}\", "
+              else
+                " #{prop.to_sym}: #{val[:example]}, "
+              end
             end
           elsif val.key?(:type)
             format = val[:format]
@@ -695,30 +727,32 @@ class OpenApiImport
               end
 
               if val.key?(:items) and val[:items].key?(:enum)
+                #before we were getting in all these cases a random value from the enum, now we are getting the first position by default
+                #the reason is to avoid confusion later in case we want to compare two swaggers and verify the changes
                 if type==:only_value
                   if val[:items][:enum][0].is_a?(String)
-                    example << " [\"" + val[:items][:enum].sample + "\"] "
+                    example << " [\"" + val[:items][:enum][0] + "\"] "
                   else
-                    example << " [" + val[:items][:enum].sample + "] "
+                    example << " [" + val[:items][:enum][0] + "] "
                   end
                 else
                   if val[:items][:enum][0].is_a?(String)
-                    example << " #{prop.to_sym}: [\"" + val[:items][:enum].sample + "\"], "
+                    example << " #{prop.to_sym}: [\"" + val[:items][:enum][0] + "\"], "
                   else
-                    example << " #{prop.to_sym}: [" + val[:items][:enum].sample + "], "
+                    example << " #{prop.to_sym}: [" + val[:items][:enum][0] + "], "
                   end
                 end
               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
@@ -736,7 +770,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
@@ -746,7 +780,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']
@@ -776,6 +809,7 @@ class OpenApiImport
           else
             tresp = ""
           end
+
           if tresp.is_a?(String)
             response_example << tresp
           elsif tresp.is_a?(Hash)
@@ -797,9 +831,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]
@@ -817,7 +851,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)
@@ -837,7 +871,6 @@ class OpenApiImport
           rs.gsub!(/@(\w+):/,'\'@\1\':')
         end
       end
-      
       return response_example
     end
 
@@ -887,7 +920,6 @@ class OpenApiImport
     # 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?('\\\\/')
@@ -932,6 +964,10 @@ class OpenApiImport
             data_pattern += get_patterns("#{dpk}.#{dpkk}",dpvv)
           end
         end
+      elsif dpv[:type] == 'array' and dpv.key?(:items) and dpv[:items].is_a?(Hash) and 
+        !dpv[:items].key?(:enum) and !dpv[:items].key?(:properties) and dpv[:items].key?(:type)
+        #{:title=>"labels", :description=>"Labels specified for the file system", :type=>"array", :items=>{:type=>"string", :enum=>["string"]}}
+        data_pattern << "'#{dpk}': [ #{get_patterns('', dpv[:items]).join[4..-1]} ]"
       elsif dpv[:type] == 'object' and dpv.key?(:properties)
         dpv[:properties].each do |dpkk,dpvv|
           if dpk == ''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_api_import
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.7
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oas_parser
@@ -16,48 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
 - !ruby/object:Gem::Dependency
   name: rufo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: nice_hash
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.15.4
+        version: '1.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.15.4
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement