foreman_api 0.1.3 → 0.1.4

data/doc/top-level-namespace.html

@@ -6,7 +6,7 @@
 <title>
   Top Level Namespace
   
-    &mdash; Documentation by YARD 0.8.5.2
+    &mdash; Documentation by YARD 0.8.3
   
 </title>
 
@@ -103,9 +103,9 @@
 </div>
 
     <div id="footer">
-  Generated on Tue Mar 19 09:50:22 2013 by
+  Generated on Thu Jun 20 12:05:19 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.5.2 (ruby-1.8.7).
+  0.8.3 (ruby-1.9.3).
 </div>
 
   </body>

data/lib/foreman_api/base.rb

@@ -32,14 +32,22 @@ module ForemanApi
     def initialize(config, options = {})
       config = config.dup
       self.logger = config.delete(:logger)
-      @client = RestClient::Resource.new(
-          config[:base_url],
-          { :user     => config[:username],
-            :password => config[:password],
-            :oauth    => config[:oauth],
-            :headers  => { :content_type => 'application/json',
-                           :accept       => "application/json;version=#{API_VERSION}" }
-          }.merge(options))
+
+      headers = {
+        :content_type => 'application/json',
+        :accept       => "application/json;version=#{API_VERSION}"
+      }
+      headers.merge!(config[:headers]) unless config[:headers].nil?
+      headers.merge!(options.delete(:headers)) unless options[:headers].nil?
+
+      resource_config = {
+        :user     => config[:username],
+        :password => config[:password],
+        :oauth    => config[:oauth],
+        :headers  => headers
+      }.merge(options)
+
+      @client = RestClient::Resource.new(config[:base_url], resource_config)
       @config = config
     end