From f7a6fdeb67ab82895eafdc8c054dc63c30589dae Mon Sep 17 00:00:00 2001
From: Ankit Mahato <ankmahato@gmail.com>
Date: Sat, 6 Apr 2024 18:30:08 +0530
Subject: [PATCH] Fixes

---
 lib/codegen/ruby/net_http.dart               | 27 ++-------
 test/codegen/ruby_net_http_codegen_test.dart | 60 ++++++++++++++++----
 2 files changed, 55 insertions(+), 32 deletions(-)

diff --git a/lib/codegen/ruby/net_http.dart b/lib/codegen/ruby/net_http.dart
index d17c0a41..769fa273 100644
--- a/lib/codegen/ruby/net_http.dart
+++ b/lib/codegen/ruby/net_http.dart
@@ -7,7 +7,7 @@ import 'package:apidash/consts.dart';
 class RubyNetHttpCodeGen {
   String kTemplateStart = """require "uri"
 require "net/http"
-{% if type == "application/json" %}require "json"{% endif %}
+
 url = URI("{{url}}")
 https = Net::HTTP.new(url.host, url.port)
 {% if check == "https" %}https.use_ssl = true{% endif %}
@@ -22,12 +22,10 @@ request = Net::HTTP::{{method}}.new(url)
 
   String kTemplateBody = """
 
-request.body = JSON.dump({{body}})
-""";
+request.body = <<HEREDOC
+{{body}}
+HEREDOC
 
-  String kTemplateTextBody = """
-
-request.body = {{body}};
 """;
   String kMultiPartBodyTemplate = r'''
 {% if type == "file" %}"{{name}}", File.open("{{value}}"){% else %}"{{name}}", "{{value}}"{% endif %}
@@ -53,7 +51,6 @@ puts "Response Code: #{response.code}"
         "url": harJson["url"],
         "method": harJson["method"].toString().substring(0, 1).toUpperCase() +
             harJson["method"].toString().substring(1).toLowerCase(),
-        "type": harJson["postData"]?["mimeType"],
         "check": harJson["url"].toString().substring(0, 5),
       });
 
@@ -63,24 +60,12 @@ puts "Response Code: #{response.code}"
         result += templateHeader.render({
           "headers": headers,
         });
-        // if (harJson["postData"]?["mimeType"].toString().substring(0, 9) !=
-        //     "multipart") {
-        //   var templateHeader = jj.Template(kTemplateHeader);
-        //   result += templateHeader.render({
-        //     "headers": headers,
-        //   });
-        // }
       }
 
-      if (harJson["postData"]?["mimeType"] == "application/json") {
+      if (requestModel.hasTextData || requestModel.hasJsonData) {
         var templateBody = jj.Template(kTemplateBody);
         result += templateBody.render({
-          "body": kEncoder.convert(harJson["postData"]["text"]),
-        });
-      } else if (harJson["postData"]?["mimeType"] == "text/plain") {
-        var templateBody = jj.Template(kTemplateTextBody);
-        result += templateBody.render({
-          "body": kEncoder.convert(harJson["postData"]["text"]),
+          "body": requestModel.requestBody,
         });
       }
 
diff --git a/test/codegen/ruby_net_http_codegen_test.dart b/test/codegen/ruby_net_http_codegen_test.dart
index 7683eac4..217d8663 100644
--- a/test/codegen/ruby_net_http_codegen_test.dart
+++ b/test/codegen/ruby_net_http_codegen_test.dart
@@ -297,7 +297,12 @@ https.use_ssl = true
 request = Net::HTTP::Post.new(url)
 
 request["Content-Type"] = "text/plain"
-request.body = "{\n\"text\": \"I LOVE Flutter\"\n}";
+request.body = <<HEREDOC
+{
+"text": "I LOVE Flutter"
+}
+HEREDOC
+
 response = https.request(request)
 
 puts "Response Code: #{response.code}"
@@ -311,14 +316,24 @@ puts "Response Body: #{response.body}"
     test('POST 2', () {
       const expectedCode = r"""require "uri"
 require "net/http"
-require "json"
+
 url = URI("https://api.apidash.dev/case/lower")
 https = Net::HTTP.new(url.host, url.port)
 https.use_ssl = true
 request = Net::HTTP::Post.new(url)
 
 request["Content-Type"] = "application/json"
-request.body = JSON.dump("{\n\"text\": \"I LOVE Flutter\",\n\"flag\": null,\n\"male\": true,\n\"female\": false,\n\"no\": 1.2,\n\"arr\": [\"null\", \"true\", \"false\", null]\n}")
+request.body = <<HEREDOC
+{
+"text": "I LOVE Flutter",
+"flag": null,
+"male": true,
+"female": false,
+"no": 1.2,
+"arr": ["null", "true", "false", null]
+}
+HEREDOC
+
 response = https.request(request)
 
 puts "Response Code: #{response.code}"
@@ -332,7 +347,7 @@ puts "Response Body: #{response.body}"
     test('POST 3', () {
       const expectedCode = r"""require "uri"
 require "net/http"
-require "json"
+
 url = URI("https://api.apidash.dev/case/lower")
 https = Net::HTTP.new(url.host, url.port)
 https.use_ssl = true
@@ -340,7 +355,12 @@ request = Net::HTTP::Post.new(url)
 
 request["Content-Type"] = "application/json"
 request["User-Agent"] = "Test Agent"
-request.body = JSON.dump("{\n\"text\": \"I LOVE Flutter\"\n}")
+request.body = <<HEREDOC
+{
+"text": "I LOVE Flutter"
+}
+HEREDOC
+
 response = https.request(request)
 
 puts "Response Code: #{response.code}"
@@ -513,14 +533,20 @@ puts "Response Body: #{response.body}"
     test('PUT 1', () {
       const expectedCode = r"""require "uri"
 require "net/http"
-require "json"
+
 url = URI("https://reqres.in/api/users/2")
 https = Net::HTTP.new(url.host, url.port)
 https.use_ssl = true
 request = Net::HTTP::Put.new(url)
 
 request["Content-Type"] = "application/json"
-request.body = JSON.dump("{\n\"name\": \"morpheus\",\n\"job\": \"zion resident\"\n}")
+request.body = <<HEREDOC
+{
+"name": "morpheus",
+"job": "zion resident"
+}
+HEREDOC
+
 response = https.request(request)
 
 puts "Response Code: #{response.code}"
@@ -536,14 +562,20 @@ puts "Response Body: #{response.body}"
     test('PATCH 1', () {
       const expectedCode = r"""require "uri"
 require "net/http"
-require "json"
+
 url = URI("https://reqres.in/api/users/2")
 https = Net::HTTP.new(url.host, url.port)
 https.use_ssl = true
 request = Net::HTTP::Patch.new(url)
 
 request["Content-Type"] = "application/json"
-request.body = JSON.dump("{\n\"name\": \"marfeus\",\n\"job\": \"accountant\"\n}")
+request.body = <<HEREDOC
+{
+"name": "marfeus",
+"job": "accountant"
+}
+HEREDOC
+
 response = https.request(request)
 
 puts "Response Code: #{response.code}"
@@ -578,14 +610,20 @@ puts "Response Body: #{response.body}"
     test('DELETE 2', () {
       const expectedCode = r"""require "uri"
 require "net/http"
-require "json"
+
 url = URI("https://reqres.in/api/users/2")
 https = Net::HTTP.new(url.host, url.port)
 https.use_ssl = true
 request = Net::HTTP::Delete.new(url)
 
 request["Content-Type"] = "application/json"
-request.body = JSON.dump("{\n\"name\": \"marfeus\",\n\"job\": \"accountant\"\n}")
+request.body = <<HEREDOC
+{
+"name": "marfeus",
+"job": "accountant"
+}
+HEREDOC
+
 response = https.request(request)
 
 puts "Response Code: #{response.code}"