swagalicious 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc2174d33212b6196c1cfa15e022cd1e3c9d6f2633b6f6ad6c56cc4506895b82
-  data.tar.gz: 3a67216c81d671a023969138a24fdf5f0a3dfc20ec468a07abf1ce4b4dbb3892
+  metadata.gz: 07172e8767c218c6fa083315bd673c0a44e2b58e1a6895498494dc94c254dbd6
+  data.tar.gz: 89f1919937bcbd9bf1d19c8908d3627740436628ff12445bc9749ec547a44c3c
 SHA512:
-  metadata.gz: 51bc671599f979b41ef407a3b4d2936a3ec133efe6df7c2b6a51b1ad92a5c98850d5226908ed66cbac0ef183bbddbc542e1505f1777ed02c9153b4d7a90324fe
-  data.tar.gz: d3db035d1bc8e6d37fd934be9ed7cbd93809c469a761fa1133080b2ad4faf7be3016655f8f88453c5bbd7e34989bd29003901e5ee8aa5b09f8928e24ac194d5a
+  metadata.gz: fc08b4023572d0da49587efdcadd66ca490df1474adfb6e522f07f326c9214f2d26d3ae751774a1335c7a21349efe178c8fe5ba989b8ae440a3b8c012179c7d4
+  data.tar.gz: 6399f42ccf024d8add0ef4b181eba92f4bd520b634c194a22cc5337216989e35cb1dca1cafa166e3c192a15a0059de86f015045d6537d40219b5f284f27c0690

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    swagalicious (0.4.2)
+    swagalicious (0.4.3)
       faraday (~> 1.3.0)
       json-schema (~> 2.8.1)
       oj (~> 3.11.0)
@@ -36,7 +36,7 @@ GEM
     method_source (1.0.0)
     minitest (5.14.3)
     multipart-post (2.1.1)
-    oj (3.11.0)
+    oj (3.11.3)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -78,4 +78,4 @@ DEPENDENCIES
   swagalicious!
 
 BUNDLED WITH
-   2.2.6
+   2.2.16

data/lib/swagalicious/example_helpers.rb

@@ -52,16 +52,22 @@ class Swagalicious
       metadata[:paths] ||= []
       metadata[:paths] << request[:path]
 
-      if request[:payload]
-        metadata[:response][:request] = Oj.load(request[:payload])
-      end
-
-      metadata[:response][:examples] ||= {}
+      metadata[:response][:requestBody] ||= {}
+      metadata[:response][:examples]    ||= {}
 
       mime_types = metadata[:response][:produces]  || ["application/json"]
       full_title = metadata[:swagger_example_name] || "#{metadata[:operation][:summary]}: #{metadata[:description]}"
 
       mime_types.each do |mime_type|
+        if request[:payload]
+          metadata[:response][:requestBody][:content]                                   ||= {}
+          metadata[:response][:requestBody][:content][mime_type]                        ||= {}
+          metadata[:response][:requestBody][:content][mime_type][:examples]             ||= {}
+          metadata[:response][:requestBody][:content][mime_type][:examples][full_title] ||= {}
+
+          metadata[:response][:requestBody][:content][mime_type][:examples][full_title][:value] = Oj.load(request[:payload]).dup
+        end
+
         metadata[:response][:examples][mime_type] ||= {}
         metadata[:response][:examples][mime_type][full_title] = @body
       end

data/lib/swagalicious/swagger_formatter.rb

@@ -31,27 +31,6 @@ class Swagalicious
        upgrade_response_produces!(doc, metadata)
        upgrade_request_type!(metadata)
 
-       unless doc_version(doc).start_with?("2")
-         doc[:paths]&.each_pair do |_k, v|
-           v.each_pair do |_verb, value|
-             is_hash = value.is_a?(Hash)
-             if is_hash && value.dig(:parameters)
-               schema_param = value.dig(:parameters)&.find { |p| (p[:in] == :body || p[:in] == :formData) && p[:schema] }
-               mime_list    = value.dig(:consumes)
-               if value && schema_param && mime_list
-                 value[:requestBody] = { content: {} } unless value.dig(:requestBody, :content)
-                 mime_list.each do |mime|
-                   value[:requestBody][:content][mime] = { schema: schema_param[:schema] }
-                 end
-               end
-
-               value[:parameters].reject! { |p| p[:in] == :body || p[:in] == :formData }
-             end
-             remove_invalid_operation_keys!(value)
-           end
-         end
-       end
-
        doc.deep_merge!(metadata_to_swagger(metadata))
     end
 
@@ -93,6 +72,7 @@ class Swagalicious
       response_code = metadata[:response][:code]
       response      = metadata[:response].reject { |k, _v| k == :code }
       examples      = response.delete(:examples) || []
+      body          = response.delete(:requestBody) || {}
 
       examples.each do |mime_type, titles|
         titles.each do |title, example|
@@ -111,6 +91,20 @@ class Swagalicious
         .reject { |k, _v| k == :verb }
         .merge(responses: { response_code => response })
 
+      is_hash = operation.is_a?(Hash)
+      if is_hash && operation.dig(:parameters)
+        schema_param = operation.dig(:parameters)&.find { |p| (p[:in] == :body || p[:in] == :formData) && p[:schema] }
+        mime_list    = operation.dig(:consumes)
+        if operation && schema_param && mime_list
+          operation[:requestBody] = { content: {} }
+          mime_list.each do |mime|
+            operation[:requestBody][:content][mime] = { schema: schema_param[:schema] }.merge((body.dig(:content, mime) || {}))
+          end
+        end
+
+        operation[:parameters].reject! { |p| p[:in] == :body || p[:in] == :formData }
+      end
+
       path_template = metadata[:path_item][:template]
       path_item     = metadata[:path_item]
         .reject { |k, _v| k == :template }

data/lib/swagalicious/version.rb

@@ -1,3 +1,3 @@
 class Swagalicious
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swagalicious
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Eugene Howe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday