active_rest_client 0.9.70 → 0.9.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 937a7fb9791b557ba265f3d538d78b193497c5c8
-  data.tar.gz: 41e9cf89ffb0d2f26339d8fa78b079eb0845c8cf
+  metadata.gz: 0b3b9e60fbe7fcac66d2abb8fdfca13ffc67a4af
+  data.tar.gz: 7193b387bb571a86de67db438a993357571490d6
 SHA512:
-  metadata.gz: dc629bf7df910f02a2b1d26d38beed6029e0e45c4ada2745d1138246221fe4e701f4dc97cfa676bd66a4f8b17a400727bd2b25b6f4f9aa4fb3d60f7210714050
-  data.tar.gz: d990eb013e401ab7c2b5a231e05d95548fce79bccc55946b2ff3402bc3f3802f92b2daa60e5c25ea83135f87172f2f59be75f2203c2482e23d46d3ae9fe18180
+  metadata.gz: d1fcb9dd01cc0a5bd476fcb1733a421ee8a490e94bb695593469c1cfc9675a5285ad43f946b557d6ec064d5dc2d1f643504cbae03b45fa88b12a2bc823515f58
+  data.tar.gz: 1ce2d5a2bcbe5ff8ffd2ea4fcace14f25c98c234b5c8cfffd90828b4304a3e365611986994607e6412ebd70313ea7737ad539d18ea4dca638f3fd5db726b35e9

data/lib/active_rest_client/connection.rb

@@ -37,7 +37,7 @@ module ActiveRestClient
     def get(path, headers={})
       make_safe_request(path) do
         @session.get(path) do |req|
-          req.headers = headers
+          req.headers = req.headers.merge(headers)
         end
       end
     end
@@ -45,7 +45,7 @@ module ActiveRestClient
     def put(path, data, headers={})
       make_safe_request(path) do
         @session.put(path) do |req|
-          req.headers = headers
+          req.headers = req.headers.merge(headers)
           req.body = data
         end
       end
@@ -54,7 +54,7 @@ module ActiveRestClient
     def post(path, data, headers={})
       make_safe_request(path) do
         @session.post(path) do |req|
-          req.headers = headers
+          req.headers = req.headers.merge(headers)
           req.body = data
         end
       end
@@ -63,7 +63,7 @@ module ActiveRestClient
     def delete(path, headers={})
       make_safe_request(path) do
         @session.delete(path) do |req|
-          req.headers = headers
+          req.headers = req.headers.merge(headers)
         end
       end
     end

data/lib/active_rest_client/version.rb

@@ -1,3 +1,3 @@
 module ActiveRestClient
-  VERSION = "0.9.70"
+  VERSION = "0.9.71"
 end

data/spec/lib/connection_spec.rb

@@ -5,6 +5,11 @@ describe ActiveRestClient::Connection do
     @connection = ActiveRestClient::Connection.new("http://www.example.com")
   end
 
+  after do
+    ActiveRestClient::Base._reset_configuration!
+    @connection.reconnect
+  end
+
   it "should contain a Farday connection" do
     expect(@connection.session).to be_a_kind_of(Faraday::Connection)
   end
@@ -45,6 +50,54 @@ describe ActiveRestClient::Connection do
     expect(result.body).to eq("{result:true}")
   end
 
+  describe "with default Faraday headers" do
+    before do
+      @default_headers = { "User-Agent" => "Custom" }
+
+      ActiveRestClient::Base.faraday_config do |faraday|
+        faraday.adapter ActiveRestClient::Base.adapter
+        faraday.headers.update(@default_headers)
+      end
+      @connection.reconnect
+    end
+
+    it "should pass a GET request through to Faraday preserving headers" do
+      stub_request(:get, "www.example.com/foo").
+        with(:headers => @default_headers).
+        to_return(body: "{result:true}")
+
+      result = @connection.get("/foo")
+      expect(result.body).to eq("{result:true}")
+    end
+
+    it "should pass a PUT request through to Faraday" do
+      stub_request(:put, "www.example.com/foo").
+        with(body: "body").
+        to_return(body: "{result:true}", :headers => @default_headers)
+
+      result = @connection.put("/foo", "body")
+      expect(result.body).to eq("{result:true}")
+    end
+
+    it "should pass a POST request through to Faraday" do
+      stub_request(:post, "www.example.com/foo").
+        with(body: "body", :headers => @default_headers).
+        to_return(body: "{result:true}")
+
+      result = @connection.post("/foo", "body")
+      expect(result.body).to eq("{result:true}")
+    end
+
+    it "should pass a DELETE request through to Faraday" do
+      stub_request(:delete, "www.example.com/foo").
+        with(:headers => @default_headers).
+        to_return(body: "{result:true}")
+
+      result = @connection.delete("/foo")
+      expect(result.body).to eq("{result:true}")
+    end
+  end
+
   it "should retry once in the event of a connection failed" do
     stub_request(:get, "www.example.com/foo").to_raise(Faraday::ConnectionFailed.new("Foo"))
     expect { @connection.get("/foo") }.to raise_error(ActiveRestClient::ConnectionFailedException)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_rest_client
 version: !ruby/object:Gem::Version
-  version: 0.9.70
+  version: 0.9.71
 platform: ruby
 authors:
 - Which Ltd