flexirest 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96d88b8be9d4f041d00c6da07228fb7dccc57092
-  data.tar.gz: 9b7314b8f2685ccc77f0de3093558bd49abc0bec
+  metadata.gz: c539f302332de70b8e529cc91c7dabc1969d0749
+  data.tar.gz: 24540b75ac1730f4070324816f911b88259371eb
 SHA512:
-  metadata.gz: 7b863f36580dddf3415740f2f2ca7cb8ded5371404e9384996d8c11a18dea26dfd76674f3972eee2d6c92aa2b1f5d159217d5d3c56c902b3dc219103b7388789
-  data.tar.gz: 30dd6fe0eaa1e9b4c63f9f7802a6b1f1b98c060231bf246e5993710f58f19c000ee05af5b6111e4a5a32b2cca68e84ed0452596cd78af1452ae5349fd5f60b7c
+  metadata.gz: a810e9776a26e970f4fd2be25501e84b7fb33a1056281ffb7cbb75fa55f23285a5dcad5f4d28d948bcc55e72cacebe540eab968352704c30acddc13423edbb70
+  data.tar.gz: 4e971064716e6bb1d38e4c4714570395fbd98cfadb435493c27300cfa30af34308738b4b267e855c082b2e78302f4d6f5c011faecc4fd009c29e3c4fb1765cb5

data/lib/flexirest/request.rb

@@ -259,8 +259,11 @@ module Flexirest
       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 @@ module Flexirest
         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

data/lib/flexirest/version.rb

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

data/spec/lib/base_spec.rb

@@ -311,6 +311,18 @@ describe Flexirest::Base do
       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\//}).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Andy Jeffries