Fixing already encoded bodies in plain requests

lib/flexirest/request.rb

@@ -259,8 +259,11 @@ def prepare_params
       elsif http_method == :delete && @method[:options][:send_delete_body]
         @post_params = default_params.merge(params || {})
         @get_params = {}
+      elsif params.is_a? String
+        @post_params = params
+        @get_params = {}
       else
-        @post_params = default_params.merge(params || {})
+        @post_params = (default_params || {}).merge(params || {})
         @get_params = {}
       end
 
@@ -362,10 +365,22 @@ def prepare_request_body(params = nil)
         end
         @body = ""
       elsif request_body_type == :form_encoded
-        @body ||= (params || @post_params || {}).to_query
+        @body ||= if params.is_a?(String)
+          params
+        elsif @post_params.is_a?(String)
+          @post_params
+        else
+          (params || @post_params || {}).to_query
+        end
         headers["Content-Type"] ||= "application/x-www-form-urlencoded"
       elsif request_body_type == :json
-        @body ||= (params || @post_params || {}).to_json
+        @body ||= if params.is_a?(String)
+          params
+        elsif @post_params.is_a?(String)
+          @post_params
+        else
+          (params || @post_params || {}).to_json
+        end
         headers["Content-Type"] ||= "application/json; charset=utf-8"
       end
     end

lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.5.4"
+  VERSION = "1.5.5"
 end

spec/lib/base_spec.rb

@@ -311,6 +311,18 @@ class DummyExample < Flexirest::Base
       EmptyExample._request("http://api.example.com/")
     end
 
+    it "allows already encoded bodies" do
+      Flexirest::ConnectionManager.reset!
+      connection = double("Connection")
+      allow(connection).to receive(:base_url).and_return("http://api.example.com")
+      expect(Flexirest::ConnectionManager).to receive(:get_connection).with("http://api.example.com/").and_return(connection)
+      expect(connection).
+        to receive(:post).
+        with("http://api.example.com/", "{\"test\":\"value\"}",an_instance_of(Hash)).
+        and_return(::FaradayResponseMock.new(OpenStruct.new(body:"{\"first_name\":\"John\", \"id\":1234}", response_headers:{}, status:200)))
+      EmptyExample._request("http://api.example.com/", :post, {test: "value"}.to_json, request_body_type: :json)
+    end
+
     it "passes headers" do
       stub_request(:get, "http://api.example.com/v1").
         with(headers: {'Accept'=>'application/hal+json, application/json;q=0.5', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Connection'=>'Keep-Alive', 'Content-Type'=>'application/x-www-form-urlencoded', 'X-Something'=>'foo/bar', 'User-Agent'=>/Flexirest\//}).