Merge 868e368 into 54c8a81

lib/unleash/client.rb

@@ -64,7 +64,10 @@ def register
       http.use_ssl = true if uri.scheme == 'https'
       http.open_timeout = Unleash.configuration.timeout # in seconds
       http.read_timeout = Unleash.configuration.timeout # in seconds
-      headers = {'Content-Type' => 'application/json'}
+      headers = {}
+      headers.merge(Unleash.configuration.custom_http_headers || {})
+      headers['Content-Type'] = 'application/json'
+
       request = Net::HTTP::Post.new(uri.request_uri, headers)
       request.body = info.to_json
 

lib/unleash/configuration.rb

@@ -4,6 +4,7 @@
 module Unleash
   class Configuration
     attr_accessor :url, :app_name, :instance_id,
+      :custom_http_headers,
       :disable_metrics, :timeout, :retry_limit,
       :refresh_interval, :metrics_interval,
       :backup_file, :logger, :log_level
@@ -13,6 +14,7 @@ def initialize(opts = {})
       self.url           = opts[:url]         || nil
       self.instance_id   = opts[:instance_id] || SecureRandom.uuid
 
+      self.custom_http_headers = (opts[:custom_http_headers].is_a? Hash) ? opts[:custom_http_headers] : {}
       self.disable_metrics  = opts[:disable_metrics]  || false
       self.refresh_interval = opts[:refresh_interval] || 15
       self.metrics_interval = opts[:metrics_interval] || 10

lib/unleash/metrics_reporter.rb

@@ -43,7 +43,9 @@ def send
       http.use_ssl = true if uri.scheme == 'https'
       http.open_timeout = Unleash.configuration.timeout # in seconds
       http.read_timeout = Unleash.configuration.timeout # in seconds
-      headers = {'Content-Type' => 'application/json'}
+      headers = {}
+      headers.merge(Unleash.configuration.custom_http_headers || {})
+      headers['Content-Type'] = 'application/json'
       request = Net::HTTP::Post.new(uri.request_uri, headers)
       request.body = generated_report.to_json
 

lib/unleash/toggle_fetcher.rb

@@ -48,8 +48,12 @@ def fetch
       http.use_ssl = true if uri.scheme == 'https'
       http.open_timeout = Unleash.configuration.timeout # in seconds
       http.read_timeout = Unleash.configuration.timeout # in seconds
-      request = Net::HTTP::Get.new(uri.request_uri)
-      request['If-None-Match'] = self.etag unless self.etag.nil?
+      headers = {}
+      headers.merge(Unleash.configuration.custom_http_headers || {})
+      headers['Content-Type'] = 'application/json'
+      headers['If-None-Match'] = self.etag unless self.etag.nil?
+
+      request = Net::HTTP::Get.new(uri.request_uri, headers)
 
       response = http.request(request)
 

spec/unleash/configuration_spec.rb

@@ -5,20 +5,22 @@
 
   describe 'Configuration' do
     it "should have the correct defaults" do
-      config = Unleash::Configuration.new()
+      config = Unleash::Configuration.new
 
       expect(config.app_name).to be_nil
       expect(config.url).to be_nil
       expect(config.instance_id).to be_truthy
+      expect(config.custom_http_headers).to eq({})
       expect(config.disable_metrics).to be_falsey
 
       expect(config.refresh_interval).to eq(15)
       expect(config.metrics_interval).to eq(10)
       expect(config.timeout).to eq(30)
       expect(config.retry_limit).to eq(1)
 
-      # expect(config.validate!).to raise_error(ArgumentError)
       expect(config.backup_file).to_not be_nil
+
+      expect{ config.validate! }.to raise_error(ArgumentError)
     end
 
     it "should by default be invalid" do
@@ -50,6 +52,46 @@
       expect(config.client_register_url).to eq('https://testurl/api/client/register')
     end
 
+    it "should allow hashes for custom_http_headers via yield" do
+      Unleash.configure do |config|
+        config.url      = 'http://test-url/'
+        config.app_name = 'my-test-app'
+        config.custom_http_headers = {'X-API-KEY': '123'}
+      end
+      expect{ Unleash.configuration.validate! }.not_to raise_error
+      expect(Unleash.configuration.custom_http_headers).to eq({'X-API-KEY': '123'})
+    end
+
+    it "should allow hashes for custom_http_headers via new client" do
+      config = Unleash::Configuration.new(
+        url: 'https://testurl/api',
+        app_name: 'test-app',
+        custom_http_headers: {'X-API-KEY': '123'})
+
+      expect{ config.validate! }.not_to raise_error
+      expect(config.custom_http_headers).to eq({'X-API-KEY': '123'})
+    end
+
+    it "should not accept invalid custom_http_headers via yield" do
+      expect do
+        Unleash.configure do |config|
+          config.url      = 'http://test-url/'
+          config.app_name = 'my-test-app'
+          config.custom_http_headers = 123.456
+        end
+      end.to raise_error(ArgumentError)
+    end
+
+    # TODO: consider having consisten behaviour?
+    it "should swallow silently invalid custom_http_headers if set via client" do
+      config = Unleash::Configuration.new(
+        url: 'https://testurl/api',
+        app_name: 'test-app',
+        custom_http_headers: 123.0)
+      expect(config.custom_http_headers).to eq({})
+      expect{ config.validate! }.not_to raise_error
+    end
+
   end
 
 end