open_api_import 0.10.5 → 0.10.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf4a735fd2ca50a6f7d5070a96fef58896e1783834f586548deb943cee3aac49
-  data.tar.gz: 148fca2cc536cd64fbe1b70d21f902810659d67579922ae04cfaeda621400f17
+  metadata.gz: 4e1707e266a2104ec005d5c7d5081ffd51c9a012bf1bc6320403377c934998d3
+  data.tar.gz: 1babbe0d881bd6f1823935cf6d66447cfa8f5a91df4106e9d87f1ac0fe792aac
 SHA512:
-  metadata.gz: d31884dda9909b9e6bba2eec6fbfb83967a8d3d4b35e5e0826027e066a2f42c7a496d021257ec905f1b54a47da3e05177dab7bd3d7a8d0ba9ea3547edbd52166
-  data.tar.gz: 0c35baa4265c34312f2c2b6866a7197ecb3403a230dccdba20b03f04282674e3e97b6c1f80fd4142862788a351b759802a172a880b967de1e95a357a17cc9471
+  metadata.gz: efb801027685d7156f499f110028ffae75fac89032598bc447d2b1c6e1f4acd7fe61905a509e3d6faa4d5d74348257faa98adc3c69d6c1e90f5719a55b1dfac7
+  data.tar.gz: 7bf47753113ba141a5e7798f40caa958f27534082484286d483d03fbcf8a1f6881c4ddb3cb1111154790a21bcee77eecfbc366e2af8b75ae261507985f3c3dd4

data/lib/open_api_import.rb

@@ -369,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
@@ -389,7 +400,8 @@ class OpenApiImport
                           end
 
                           #todo: consider check default and insert it
-                          if dpv.key?(:type)
+                          #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)
@@ -400,7 +412,6 @@ class OpenApiImport
                             params_data << "#{dpk}: #{valv}"
                           end
                         }
-
                         if params_data.size > 0
                           if data_examples_all_of == true and data_examples.size > 0
                             data_examples[0]+=params_data
@@ -716,17 +727,19 @@ 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
@@ -912,6 +925,8 @@ class OpenApiImport
         if dpv[:pattern].include?('\\\\/')
           #for cases like this: ^[^\.\\/:*?"<>|][^\\/:*?"<>|]{0,13}[^\.\\/:*?"<>|]?$
           data_pattern << "'#{dpk}': /#{dpv[:pattern].to_s.gsub('\/','/')}/"
+        elsif dpv[:pattern].include?('\\x')
+          data_pattern << "'#{dpk}': /#{dpv[:pattern].to_s.gsub('\\x','\\u')}/"
         else
           data_pattern << "'#{dpk}': /#{dpv[:pattern].to_s}/"
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_api_import
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.10.9
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2021-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oas_parser
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement