Fix JSON body reencoding and Rubocop configuration (#95)

Author: guillemm

.rubocop.yml

@@ -23,13 +23,13 @@ Metrics/ModuleLength:
   Enabled: false
 PerceivedComplexity:
   Enabled: false
-Style/SpaceBeforeFirstArg:
+Layout/SpaceBeforeFirstArg:
   Enabled: true
 Style/ClassAndModuleChildren:
   Enabled: false
-Style/EmptyLinesAroundBlockBody:
+Layout/EmptyLinesAroundBlockBody:
   Enabled: true
-Style/FileName:
+Naming/FileName:
   Enabled: true
 Style/RescueModifier:
   Enabled: true
@@ -39,7 +39,7 @@ Metrics/BlockLength:
   Enabled: false
 Style/NumericLiterals:
   Enabled: false
-Style/ExtraSpacing:
+Layout/ExtraSpacing:
   Enabled: true
   AllowForAlignment: false
   ForceEqualSignAlignment: false

lib/ruby_http_client.rb

@@ -149,7 +149,12 @@ def build_request(name, args)
          (!@request_headers.key?('Content-Type') ||
           @request_headers['Content-Type'] == 'application/json')
 
-        @request.body = @request_body.to_json
+        # If body is a hash, encode it; else leave it alone
+        @request.body = if @request_body.class == Hash
+                          @request_body.to_json
+                        else
+                          @request_body
+                        end
         @request['Content-Type'] = 'application/json'
       elsif !@request_body && (name.to_s == 'post')
         @request['Content-Type'] = ''

test/test_ruby_http_client.rb

@@ -12,6 +12,14 @@ def initialize(response)
   end
 end
 
+class MockResponseWithRequestBody < MockResponse
+  attr_reader :request_body
+
+  def initialize(response)
+    @request_body = response['request_body']
+  end
+end
+
 class MockRequest < SendGrid::Client
   def make_request(_http, _request)
     response = {}
@@ -22,6 +30,17 @@ def make_request(_http, _request)
   end
 end
 
+class MockRequestWithRequestBody < SendGrid::Client
+  def make_request(_http, request)
+    response = {}
+    response['code'] = 200
+    response['body'] = { 'message' => 'success' }
+    response['headers'] = { 'headers' => 'test' }
+    response['request_body'] = request.body
+    MockResponseWithRequestBody.new(response)
+  end
+end
+
 class TestClient < Minitest::Test
   def setup
     @headers = JSON.parse('
@@ -158,6 +177,48 @@ def test_build_request_post_multipart
     assert_equal('hogebody', client.request.body)
   end
 
+  def test_json_body_encode
+    headers = {
+      'Content-Type' => 'application/json'
+    }
+    client = MockRequestWithRequestBody.new(
+      host: 'https://localhost',
+      request_headers: headers
+    )
+    name = 'post'
+    args = [{ 'request_body' => { 'this_is' => 'json' } }]
+    response = client.build_request(name, args)
+    assert_equal('{"this_is":"json"}', response.request_body)
+  end
+
+  def test_json_body_do_not_reencode
+    headers = {
+      'Content-Type' => 'application/json'
+    }
+    client = MockRequestWithRequestBody.new(
+      host: 'https://localhost',
+      request_headers: headers
+    )
+    name = 'post'
+    args = [{ 'request_body' => '{"this_is":"json"}' }]
+    response = client.build_request(name, args)
+    assert_equal('{"this_is":"json"}', response.request_body)
+  end
+
+  def test_json_body_do_not_reencode_simplejson
+    headers = {
+      'Content-Type' => 'application/json'
+    }
+    client = MockRequestWithRequestBody.new(
+      host: 'https://localhost',
+      request_headers: headers
+    )
+    name = 'post'
+    args = [{ 'request_body' => 'true' }]
+    response = client.build_request(name, args)
+    assert_equal('true', response.request_body)
+  end
+
   def add_ssl
     uri = URI.parse('https://localhost:4010')
     http = Net::HTTP.new(uri.host, uri.port)