open_api_import 0.10.3 → 0.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60c026a4a743315cf8aa85315ed67be3794ae9936ceded3f58d9c7d8bc12b864
-  data.tar.gz: 950855170227923b1b1c09f1c990b64c58b85f6303e42ce2e01c3ab1d835062a
+  metadata.gz: 8cfae7bbbbe63a987babdbbc219b357dd9352cb8a24944045512f45cc43be396
+  data.tar.gz: 9fd701d2e6031121bf36bb16870a1ce27b912b08392a535b64df1758e9b71c70
 SHA512:
-  metadata.gz: 04db0678a2d513d4c0940d39bb13eb853ec176533a367b776e40b06f59ee556b1ee90b8d34c4a1403c44eb3bcb77565353adb5a8e8dd85d2fbfa1abc4f840ead
-  data.tar.gz: def0f2c659834acceb3502502ef8134b7cc74d807c6e713c3d0408666a8489ff5ba1032595c25199f9317104334415c874252aba2e12bd2f0dac92052c0f0990
+  metadata.gz: f851adec79aa6e12aeb3c7cb51736735249b80299142b0f32f4e790ae18be3452e3e55a248c5e8c5a81544df34a99c7cf4fb486a1df03c119f035fca8aefbc83
+  data.tar.gz: 7b8006104b05632049383690c0114fd5594cdbe89ef8172e2bbe4063dc2ebd47f77a81d2d36bdace45af58f0cd82afe5aba909883725b6a041ca2dc504c5fbe2

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
@@ -361,11 +369,22 @@ 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
@@ -380,17 +399,19 @@ class OpenApiImport
                             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
                             data_examples[0]+=params_data
@@ -706,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
@@ -747,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
@@ -757,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']
@@ -809,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]
@@ -829,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)
@@ -898,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?('\\\\/')
@@ -943,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.3
+  version: 0.10.8
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oas_parser
@@ -16,14 +16,14 @@ 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
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement