open_api_import 0.10.7 → 0.10.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7648a1c4167d4316385baaddeb6ab83f683b148c264c8cee30f706567e2d0d68
-  data.tar.gz: fa8f058d9d01a39201f9d4aea2422a82289ef6a755a6a9a16679bec0e4935fa0
+  metadata.gz: 7ff3ff403e355b1f422b8d005c1302c2c22f77507d2c1785fe5446050e044096
+  data.tar.gz: 5f2c733cac57f1db5e88504e3aba1db7b61241378ecdb89d7ed68e1012e95012
 SHA512:
-  metadata.gz: 96bc61aa9048d2d94a099a18d95f388d6fad31276e193b76d001040dd22c0d66b12511c5d41a337e676dd423517aeea30fb8686cf7f8b7d57535ea3aebb4255a
-  data.tar.gz: aa57d0978a400e5e31fb8dcdc994f414d5a994b1d521f89163b44d0d980de0ed5b29671d15464c51c2b0d42281afd47f3179314a48a81946c8627e308e030f5d
+  metadata.gz: 583ae4003d2bb422e87cd0502b4f0cd317ffbb0919c1113d44d8173546dee5afdb32a0e8b62b1bea89aa18a713c4b8fb2a6299a90ed2de233c9d1890aeffcdd5
+  data.tar.gz: f392b2a77e39447efec45dca83a13deb22d2561e96432487a7bf25861b95d9e059006311fd316fa6e989de22b66c6d3c981e6d0c80b60cca9618b75364ded7f0

data/lib/open_api_import.rb

@@ -218,7 +218,7 @@ class OpenApiImport
 
             output << ""
             output << "# operationId: #{cont[:operationId]}, method: #{met}"
-            output << "# summary: #{cont[:summary]}"
+            output << "# summary: #{cont[:summary]}"      
             if !cont[:description].to_s.split("\n").empty?
               output << "# description: "
               cont[:description].to_s.split("\n").each do |d|
@@ -238,14 +238,12 @@ class OpenApiImport
                 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?
                   responses << "'#{k}': { "
                   responses << "message: '#{v[:description]}', "
                   responses << "data: "
                   responses << response_example
-                  responses << "},"
-                  
+                  responses << "},"                      
                   if mock_response and mock_example.size==0
                     mock_example << "code: '#{k}',"
                     mock_example << "message: '#{v[:description]}',"
@@ -254,9 +252,8 @@ class OpenApiImport
                   end
                   
                 else
-                  responses << "'#{k}': { message: '#{v[:description]}'}, "
+                  responses << "'#{k}': { message: '#{v[:description]}'}, "          
                 end
-
               end
             end
             # todo: for open api 3.0 add the new Link feature: https://swagger.io/docs/specification/links/
@@ -295,18 +292,19 @@ class OpenApiImport
                       params_path << param_name
                     end
                     #params_required << param_name if p[:required].to_s=="true"
-                    description_parameters << "#    #{p[:name]}: (#{type}) #{"(required)" if p[:required].to_s=="true"} #{p[:description]}"
+                    description_parameters << "#    #{p[:name]}: (#{type}) #{"(required)" if p[:required].to_s=="true"} #{p[:description].split("\n").join("\n#\t\t\t")}"
                   end
                 elsif p[:in] == "query"
                   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]}"
+                  description_parameters << "#    #{p[:name]}: (#{type}) #{"(required)" if p[:required].to_s=="true"} #{p[:description].split("\n").join("\n#\t\t\t")}"
                 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]}"
+                  description_parameters << "#    #{p[:name]}: (#{p[:type]}) #{p[:description].split("\n").join("\n#\t\t\t")}"
+      
                   case p[:type]
                   when /^string$/i
                     data_form << "#{p[:name]}: ''"
@@ -368,15 +366,16 @@ class OpenApiImport
                               valv = ""
                             end
                           end
+
                           if dpv.keys.include?(:description)
                             description_parameters << "#    #{dpk}: (#{dpv[:type]}) #{dpv[:description].split("\n").join("\n#\t\t\t")}"
-                          end
+                          end              
 
                           data_pattern += get_patterns(dpk,dpv)
                           data_pattern.uniq!
                           dpkeys = []
                           data_pattern.reject! do |dp| 
-                            dpkey = dp.scan(/^'\w+'/)
+                            dpkey = dp.scan(/^'[\w\.]+'/)
 
                             if dpkeys.include?(dpkey)
                               true
@@ -407,9 +406,11 @@ class OpenApiImport
                             params_data.pop if params_data[-1].match?(/^\s*$/im)
                           else
                             if valv.to_s == ""
-                              valv = '"' + valv + '"'
+                              valv = '""'
+                            elsif valv.include?('"')
+                              valv.gsub!('"',"'")
                             end
-                            params_data << "#{dpk}: #{valv}"
+                            params_data << "#{dpk}: #{valv}"                                                        
                           end
                         }
                         if params_data.size > 0
@@ -705,10 +706,13 @@ class OpenApiImport
             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
-              example << if val[:example].is_a?(String) or val[:example].is_a?(Time)
-                " #{prop.to_sym}: \"#{val[:example]}\", "
+              if val[:example].is_a?(String)
+                val[:example].gsub!('"', "'")
+                example << " #{prop.to_sym}: \"#{val[:example]}\", "
+              elsif val[:example].is_a?(Time)
+                example << " #{prop.to_sym}: \"#{val[:example]}\", "
               else
-                " #{prop.to_sym}: #{val[:example]}, "
+                example << " #{prop.to_sym}: #{val[:example]}, "
               end
             end
           elsif val.key?(:type)
@@ -716,7 +720,7 @@ class OpenApiImport
             format = val[:type] if format.to_s == ""
             case val[:type].downcase
             when "string"
-              example << " #{prop.to_sym}: \"#{format}\", "
+              example << " #{prop.to_sym}: \"#{format}\", "              
             when "integer", "number"
               example << " #{prop.to_sym}: 0, "
             when "boolean"
@@ -748,7 +752,7 @@ class OpenApiImport
                   example << get_response_examples({schema: val}, remove_readonly).join("\n")
                 else
                   example << " #{prop.to_sym}: " + get_response_examples({schema: val}, remove_readonly).join("\n") + ", "
-                end
+                end  
               end
             when "object"
               #todo: differ between response examples and data examples
@@ -809,7 +813,6 @@ class OpenApiImport
           else
             tresp = ""
           end
-
           if tresp.is_a?(String)
             response_example << tresp
           elsif tresp.is_a?(Hash)
@@ -925,6 +928,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.7
+  version: 0.10.11
 platform: ruby
 authors:
 - Mario Ruiz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-15 00:00:00.000000000 Z
+date: 2022-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oas_parser
@@ -53,25 +53,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.17'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.8.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
-  type: :development
+        version: '6.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+- !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
+  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::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -128,8 +142,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: OpenApiImport -- Import a Swagger or Open API file and create a Ruby Request
   Hash file including all requests and responses with all the examples. The file can