Headers precedence

datocms · Jul 20, 2018 · ccbff4d · ccbff4d
1 parent 68874b0
commit ccbff4d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/lib/dato/api_client.rb b/lib/dato/api_client.rb
@@ -75,15 +75,17 @@ def request(*args)
     private
 
     def connection
+      default_headers = {
+        'Accept' => 'application/json',
+        'Content-Type' => 'application/json',
+        'Authorization' => "Bearer #{@token}",
+        'User-Agent' => "ruby-client v#{Dato::VERSION}",
+        'X-Api-Version' => "2"
+      }
+
       options = {
         url: base_url,
-        headers: extra_headers.merge(
-          'Accept' => 'application/json',
-          'Content-Type' => 'application/json',
-          'Authorization' => "Bearer #{@token}",
-          'User-Agent' => "ruby-client v#{Dato::VERSION}",
-          'X-Api-Version' => "2"
-        )
+        headers: default_headers.merge(extra_headers)
       }
 
       @connection ||= Faraday.new(options) do |c|

diff --git a/lib/dato/version.rb b/lib/dato/version.rb
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Dato
-  VERSION = '0.6.5'
+  VERSION = '0.6.6'
 end