gds-api-adapters 49.3.0 → 49.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1811f31795287b01d49addb28509c144263c3fcc
-  data.tar.gz: e43b4cc0b1e878fad234e34a1f91c45101a0bf8a
+  metadata.gz: 62fb1a303990d06bb0aa4c5839ae7a233626c461
+  data.tar.gz: baba94202d20913a07a3053a4d47a504c9c3b2f8
 SHA512:
-  metadata.gz: 6e2f4643a8a92cb59b64f264155394b493dc1b39571bf52d0bc0cdf39fc033357ef6351b7152de3bc7235193828bd75ade8f55824152e529c7b89c6083a05af0
-  data.tar.gz: 637d7d47848459512fd0277d9aaecd9a8ac0627d4a5c447a89d4e7feddaeeb39533ae3f3b9bdc8a4deddce0e8b25fa5bfbf9c1e3874d0dfd75f69a94c4e0b53a
+  metadata.gz: f347372495223c6fc802472f12d772dc8f86685303b74b7b8db6cfaa3b4fd98325b64672c7b2787dd85a8024e9ce5dfcc4370c00eb6c98121e1b831976379cc3
+  data.tar.gz: 2c4eaee67894ab3ac70d1ea25e546ef8a2e8ba95261ac88fe0f814a1e269e53e705fc4b918d704e020e3c9a009046306a646f1e8f3dc037964ba6794c9efa1d7

data/lib/gds_api/json_client.rb

@@ -59,9 +59,13 @@ module GdsApi
     end
 
     def self.default_request_with_json_body_headers
-      self.default_request_headers.merge(
+      self.default_request_headers.merge(self.json_body_headers)
+    end
+
+    def self.json_body_headers
+      {
         'Content-Type' => 'application/json',
-      )
+      }
     end
 
     DEFAULT_TIMEOUT_IN_SECONDS = 4
@@ -134,6 +138,9 @@ module GdsApi
     #                  from the Net::HTTPResponse
     def do_json_request(method, url, params = nil, additional_headers = {}, &create_response)
       begin
+        if params
+          additional_headers.merge!(self.class.json_body_headers)
+        end
         response = do_request_with_cache(method, url, (params.to_json if params), additional_headers)
       rescue RestClient::Exception => e
         # Attempt to parse the body as JSON if possible
@@ -242,16 +249,9 @@ module GdsApi
         url: url,
       }
 
-      case method
-      when :get, :delete
-        default_headers = self.class.default_request_headers
-      else
-        default_headers = self.class.default_request_with_json_body_headers
-      end
-
       method_params[:payload] = params
       method_params = with_timeout(method_params)
-      method_params = with_headers(method_params, default_headers, additional_headers)
+      method_params = with_headers(method_params, self.class.default_request_headers, additional_headers)
       method_params = with_auth_options(method_params)
       if URI.parse(url).is_a? URI::HTTPS
         method_params = with_ssl_options(method_params)

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '49.3.0'.freeze
+  VERSION = '49.3.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 49.3.0
+  version: 49.3.1
 platform: ruby
 authors:
 - James Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-26 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek