tomograph 3.2.4 → 3.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e175b3015ed8ed1ad88ac14886ed8f9e3eabf14ee78cfb5f730f853d04772f4d
-  data.tar.gz: 5447efa1957737f9cd8da1551b1e4d9379192ab2284fbdf36c35d2b8223cf14b
+  metadata.gz: 555390911c144982f0fd555e01ccf0b0a53452673e704085f3b29f63d23c74fb
+  data.tar.gz: 7b5d5e2e97f390c40f8dfc89a706aca36c124914e4bdf22a4f213f2c5ff6e093
 SHA512:
-  metadata.gz: 9e2789445f60212e93667d3f0ef821f73950137f3b882255183085d145e677c52bb2740d4ee58927553c5152393f3fc28ad03d310c5e794aacafed1f87db3ef7
-  data.tar.gz: 9f6acfa9631e14c38537ec92af554a65c7ad091bf33e71ef0cd10e258c1d9c63e6036537401866c3b9f33f2795b309bd265513288fb6fb30efe71de1e3364f1b
+  metadata.gz: c516ffc1f0d5114fbd6d0e176a021588604ac3bf91f57b7d49f63d99301ec30b6fb6cc5fa616992b2e696ac7b544193d7bfc62ff02934a12aaa8dcb037eac32b
+  data.tar.gz: 6d68990c8bfae2f9079ea022263a9ea05f57dc95bdac40a23940a5e5a1a0eb11be346ab4c93aff122193ab768e92b5b6a182aa6a708ef33efbf046b2809e542f

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change log
 
+### 3.2.6 - 2024-12-08
+
+* bug fixes
+  * fix null content-type for request OpenAPI 3
+
+### 3.2.5 - 2024-12-02
+
+* bug fixes
+  * fix request json schema definitions for OpenAPI 3
+
 ### 3.2.4 - 2024-08-08
 
 * bug fixes

data/lib/tomograph/openapi/openapi2.rb

@@ -12,6 +12,7 @@ module Tomograph
         @tomogram ||= @documentation['paths'].each_with_object([]) do |action, result|
           action[1].keys.each do |method|
             next result if method == 'parameters'
+
             result.push(Tomograph::Tomogram::Action.new(
                           path: "#{@prefix}#{action[0]}",
                           method: method.upcase,

data/lib/tomograph/openapi/openapi3.rb

@@ -11,11 +11,14 @@ module Tomograph
       def to_tomogram
         @tomogram ||= @documentation['paths'].each_with_object([]) do |(path, action_definition), result|
           action_definition.keys.each do |method|
+            ajj = valuekey(action_definition[method]['requestBody'], 'content')
+            aj = valuekey(ajj, 'application/json')
+
             result.push(Tomograph::Tomogram::Action.new(
                           path: "#{@prefix}#{path}",
                           method: method.upcase,
-                          content_type: action_definition[method]['requestBody'] && action_definition[method]['requestBody']['content'].keys[0] == 'application/json' ? action_definition[method]['requestBody']['content'].keys[0] : '',
-                          requests: [],
+                          content_type: action_definition[method]['requestBody'] && action_definition[method]['requestBody']['content'].keys[0] == 'application/json' ? action_definition[method]['requestBody']['content'].keys[0] : nil,
+                          requests: [schema_new(valuekey(aj, 'schema'), @documentation['definitions'])].compact,
                           responses: responses(action_definition[method]['responses']),
                           resource: ''
                         ))
@@ -23,6 +26,33 @@ module Tomograph
         end
       end
 
+      def valuekey(value, key)
+        value.nil? ? nil : value[key]
+      end
+
+      def schema_new(sche, defi)
+        return sche unless sche
+        if sche.keys.include?('$ref')
+          res = sche.merge('definitions' => { sche['$ref'][14..-1] => defi[sche['$ref'][14..-1]] })
+          if defi[sche['$ref'][14..-1]].to_s.include?('$ref')
+            keys = defi[sche['$ref'][14..-1]].to_s.split('"').find_all { |word| word.include?('definitions') }
+            keys.each do |key|
+              res['definitions'].merge!({ key[14..-1] => defi[key[14..-1]] })
+            end
+          end
+          res
+        elsif sche.to_s.include?('$ref')
+          res = sche.merge('definitions' => {})
+          keys = sche.to_s.split('"').find_all { |word| word.include?('definitions') }
+          keys.each do |key|
+            res['definitions'].merge!({ key[14..-1] => defi[key[14..-1]] })
+          end
+          res
+        else
+          sche
+        end
+      end
+
       def responses(responses_definitions)
         result = []
         responses_definitions.each do |(response_code, response)|
@@ -37,7 +67,7 @@ module Tomograph
             result.push(
               'status' => response_code,
               'body'=> {},
-              'content-type' => ''
+              'content-type' => nil
             )
           else
             result += responses_by_content_types(response['content'], response_code)

data/lib/tomograph/version.rb

@@ -1,3 +1,3 @@
 module Tomograph
-  VERSION = '3.2.4'.freeze
+  VERSION = '3.2.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomograph
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.2.6
 platform: ruby
 authors:
 - d.efimov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-07 00:00:00.000000000 Z
+date: 2024-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone