Put header in Faraday init and remove constants

inloco · Aug 10, 2023 · 7e9f6e5 · 7e9f6e5
1 parent d9ebaa5
commit 7e9f6e5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/lib/incognia_api/client.rb b/lib/incognia_api/client.rb
@@ -14,7 +14,12 @@ def initialize(client_id:, client_secret:, host:)
       @client_secret = client_secret
       @host = host
 
-      @connection = Faraday.new(host) do |faraday|
+      headers = { 'User-Agent' => "incognia-ruby/#{Incognia::VERSION} " \
+                          "({#{RbConfig::CONFIG['host']}}) " \
+                          "{#{RbConfig::CONFIG['arch']}} " \
+                          "Ruby/#{RbConfig::CONFIG['ruby_version']}" }
+
+      @connection = Faraday.new(host, headers: headers) do |faraday|
         faraday.request :json
         faraday.response :json, content_type: /\bjson$/
         faraday.response :raise_error
@@ -26,12 +31,6 @@ def initialize(client_id:, client_secret:, host:)
     def request(method, endpoint = nil, data = nil, headers = {})
       json_data = JSON.generate(data) if data
 
-      user_agent_header = "incognia-ruby/#{Incognia::VERSION} " + 
-                          "({#{Util::OS_HOST}}) {#{Util::OS_ARCH}} " +
-                          "Ruby/#{Util::LANGUAGE_VERSION}"
-
-      headers.merge!('User-Agent' => user_agent_header)
-
       connection.send(method, endpoint, json_data, headers) do |r|
         r.headers[Faraday::Request::Authorization::KEY] ||= Faraday::Request
           .lookup_middleware(:authorization)

diff --git a/lib/incognia_api/util.rb b/lib/incognia_api/util.rb
@@ -1,9 +1,5 @@
 module Incognia
   module Util
-    OS_HOST = RbConfig::CONFIG['host']
-    OS_ARCH = RbConfig::CONFIG['arch']
-    LANGUAGE_VERSION = RbConfig::CONFIG['ruby_version']
-
     def self.symbolize_names(object)
       case object
       when Hash

diff --git a/spec/client_spec.rb b/spec/client_spec.rb
@@ -52,10 +52,10 @@ module Incognia
       end
 
       it "injects User-Agent header" do
-        user_agent_header = { 'User-Agent' => "incognia-ruby/#{Incognia::VERSION} " +
-                                              "({#{Util::OS_HOST}}) " +
-                                              "{#{Util::OS_ARCH}} " +
-                                              "Ruby/#{Util::LANGUAGE_VERSION}" }
+        user_agent_header = { 'User-Agent' => "incognia-ruby/#{Incognia::VERSION} " \
+                              "({#{RbConfig::CONFIG['host']}}) " \
+                              "{#{RbConfig::CONFIG['arch']}} " \
+                              "Ruby/#{RbConfig::CONFIG['ruby_version']}" }
 
         stub_token_request
         stub = stub_request(:post, test_endpoint)