open_api_import 0.11.1 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1a667b9e2ed3c9f4edc515345bdc6d85929fa6274138b6201ed8c72de085174
-  data.tar.gz: 4824ac5351b6e45e9ac82ef3979e39c706a28134469de1dde945f88278728337
+  metadata.gz: 2898c6734c8b0816229742064e145a6c3c48d8a4b4969c4cc4a032a7efaec90a
+  data.tar.gz: 2966b9d5e861f8857c964645d9b7089b43c08ae7cb564aff99ddae3a94025ec0
 SHA512:
-  metadata.gz: 5795d34e5541ba890be3804f6d14fe13eec276f66e5dc5ab14430bd4eecda2ae633e2ae1fc50a1a7c60ba5d52d1627072770cce8c996f4e4a11503f8981ee79b
-  data.tar.gz: be67993cee72e6df7d7d81a4e572c0db3ed814c6c637fb5c57ac6a3e59dcfc98b7f3a1e5eeca856b8a9578c766c8396540fb2fe26b3340a931e8d7681fc72bdd
+  metadata.gz: f606dfb92494c7ceed2298c55f56b3666edeb2605af2e8b9f5876d450fbce214152a7efc3efe03423613533a15c4899406e2121f31992bd3689d90c85cdf5bdc
+  data.tar.gz: 16ae0345a060a5feabef4eaaae4d1eb7f11fb3a01decd58c59aaa020564812f8509999d56220bcc30f06168ae6556d7b4c9274a972719fe4b9491af0a67266fa

data/lib/open_api_import/get_examples.rb

@@ -17,7 +17,7 @@ module LibOpenApiImport
             example << " #{prop.to_sym}: \"#{val[:example][0]}\", " # only the first example
           else
             if val[:example].is_a?(String)
-              val[:example].gsub!('"', "'")
+              val[:example].gsub!('"', "'") unless val.include?("'")
               example << " #{prop.to_sym}: \"#{val[:example]}\", "
             elsif val[:example].is_a?(Time)
               example << " #{prop.to_sym}: \"#{val[:example]}\", "
@@ -36,11 +36,11 @@ module LibOpenApiImport
           when "boolean"
             example << " #{prop.to_sym}: true, "
           when "array"
-            if val.key?(:items) and val[:items].size == 1 and val[:items].is_a?(Hash) and val[:items].key?(:type)
+            if val.key?(:items) and val[:items].is_a?(Hash) and val[:items].size == 1 and val[:items].key?(:type)
               val[:items][:enum] = [val[:items][:type]]
             end
 
-            if val.key?(:items) and val[:items].key?(:enum)
+            if val.key?(:items) and !val[:items].nil? 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

data/lib/open_api_import/get_response_examples.rb

@@ -60,8 +60,8 @@ module LibOpenApiImport
       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?(:items) && v[:schema][:items].is_a?(Hash) && v[:schema][:items].key?(:properties)) ||
+           (v[:schema].key?(:items) && v[:schema][:items].is_a?(Hash) && v[:schema][:items].key?(:allOf)) ||
            v[:schema].key?(:allOf))
       properties = {}
       if v[:schema].key?(:properties)
@@ -89,7 +89,7 @@ module LibOpenApiImport
           response_example << "]"
         end
       end
-    elsif v.key?(:schema) and v[:schema].key?(:items) and v[:schema][:items].key?(:type)
+    elsif v.key?(:schema) and v[:schema].key?(:items) and v[:schema][:items].is_a?(Hash) and v[:schema][:items].key?(:type)
       # for the case only type supplied but nothing else for the array
       response_example << "[\"#{v[:schema][:items][:type]}\"]"
     end

data/lib/open_api_import/open_api_import.rb

@@ -52,12 +52,12 @@ class OpenApiImport
         begin
           definition = OasParser::Definition.resolve(swagger_file)
         rescue Exception => stack
-          message = "There was a problem parsing the Open Api document using the oas_parser gem. The execution was aborted.\n"
-          message += "Visit the github for oas_parser gem for bugs and more info: https://github.com/Nexmo/oas_parser\n"
+          message = "There was a problem parsing the Open Api document using the oas_parser_reborn gem. The execution was aborted.\n"
+          message += "Visit the github for oas_parser_reborn gem for bugs and more info: https://github.com/MarioRuiz/oas_parser_reborn\n"
           message += "Error: #{stack.message}"
           puts message
           @logger.fatal message
-          @logger.fatal stack.backtrace
+          @logger.fatal stack.backtrace.join("\n")
           exit!
         end
   
@@ -209,7 +209,7 @@ class OpenApiImport
   
               output << ""
               output << "# operationId: #{cont[:operationId]}, method: #{met}"
-              output << "# summary: #{cont[:summary]}"
+              output << "# summary: #{cont[:summary].split("\n").join("\n#          ")}" if cont.key?(:summary)
               if !cont[:description].to_s.split("\n").empty?
                 output << "# description: "
                 cont[:description].to_s.split("\n").each do |d|
@@ -284,12 +284,14 @@ 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].split("\n").join("\n#\t\t\t")}"
+                      @logger.warn "Description key is missing for #{met} #{path.path} #{p[:name]}" if p[:description].nil?
+                      description_parameters << "#    #{p[:name]}: (#{type}) #{"(required)" if p[:required].to_s == "true"} #{p[:description].to_s.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].split("\n").join("\n#\t\t\t")}"
+                    @logger.warn "Description key is missing for #{met} #{path.path} #{p[:name]}" if p[:description].nil?
+                    description_parameters << "#    #{p[:name]}: (#{type}) #{"(required)" if p[:required].to_s == "true"} #{p[:description].to_s.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
@@ -403,7 +405,7 @@ class OpenApiImport
                               if valv.to_s == ""
                                 valv = '""'
                               elsif valv.include?('"')
-                                valv.gsub!('"', "'")
+                                valv.gsub!('"', "'") unless valv.include?("'")
                               end
                               params_data << "#{dpk}: #{valv}"
                             end
@@ -539,8 +541,12 @@ class OpenApiImport
                   begin
                     data_examples[0].uniq!
                     data_ex = eval("{#{data_examples[0].join(", ")}}")
+                  rescue SyntaxError  
+                    data_ex = {}
+                    @logger.warn "Syntax error: #{met} for path: #{path.path} evaluating data_examples[0] => #{data_examples[0].inspect}"
                   rescue
                     data_ex = {}
+                    @logger.warn "Syntax error: #{met} for path: #{path.path} evaluating data_examples[0] => #{data_examples[0].inspect}"
                   end
                   if (data_required.grep(/\./)).empty?
                     reqdata = filter(data_ex, data_required) #not nested
@@ -548,6 +554,7 @@ class OpenApiImport
                     reqdata = filter(data_ex, data_required, true) #nested
                   end
                   unless reqdata.empty?
+                    reqdata.uniq!
                     phsd = pretty_hash_symbolized(reqdata)
                     phsd[0] = "data: {"
                     output += phsd
@@ -569,6 +576,7 @@ class OpenApiImport
                     reqdata << edata unless read_only
                   end
                   unless reqdata.empty?
+                    reqdata.uniq!
                     output << "data: {"
                     output << reqdata.join(", \n")
                     output << "},"

data/lib/open_api_import.rb

@@ -10,7 +10,7 @@ require_relative "open_api_import/open_api_import"
 
 include LibOpenApiImport
 
-require "oas_parser"
+require "oas_parser_reborn"
 require "rufo"
 require "nice_hash"
 require "logger"

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: open_api_import
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.3
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-17 00:00:00.000000000 Z
+date: 2023-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: oas_parser
+  name: oas_parser_reborn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: 0.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: nice_hash
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '1.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -86,26 +86,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.8.0
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.22
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.22
 description: 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 be in JSON or YAML
@@ -143,14 +123,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.4.3
 signing_key:
 specification_version: 4
 summary: OpenApiImport -- Import a Swagger or Open API file and create a Ruby Request