almodovar 1.7.6 → 1.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bf8daf20a34b735694f237e74c7d6a3dbd2d3aeb383ed8a9fb4b9fee48d14b3
-  data.tar.gz: 946f4449c0931dc085259a6238eae7b42306264b90bba73d9ba2291b24e72918
+  metadata.gz: b5e3ab978aae76e66bdf9720e0b0138ae3be35c51ee8406d6771bfa06e726df9
+  data.tar.gz: b51554cee84fc6bf7ed9875ea1b0be779d154af92da9a2468c00313f06d799f2
 SHA512:
-  metadata.gz: 2c815dad7020c2e24db4fdd5f8633522638cba2e9eae3c2a9d7e682902653e5c83dc2f1ee618ba6c541054af14ad3ceedc1edcf1151256415c976d05b3e5f347
-  data.tar.gz: 5595081a995e00af88b03720c555ab573048b1b5359f461cd818e41d6e0885cf658df79bbf865c024525b415c0f81013bcbb1dfca6b1dec168b2c118f974921b
+  metadata.gz: ac0df4ec63782ae8409e3d094bf747035a5721ab2d8074d754fd6e053f0f8478159e56bf1cd66e6e22ca95a92f4969cd136e520f7cf6335a0e32929188c5af8e
+  data.tar.gz: 21f7223520a6eb116ea50400b9f788c20a52ff2c173aac9088b1a9dbbb34a99998498e2f2a1795dac380876b77f76ac59a1c9ec103d7335909bfe03298613370

data/README.rdoc

@@ -1,4 +1,4 @@
-=Almodovar {<img src="http://travis-ci.org/bebanjo/almodovar.png" />}[http://travis-ci.org/bebanjo/almodovar]
+=Almodovar {<img src="https://github.com/bebanjo/almodovar/workflows/CI/badge.svg" />}[http://travis-ci.org/bebanjo/almodovar]
 
 Almodovar is a client for BeBanjo's Sequence & Movida API written in Ruby (it's actually a generic client which plays nice with any RESTful API following some conventions).
   

data/lib/almodovar/http_client.rb

@@ -38,8 +38,15 @@ module Almodovar
 
     private
 
-    def merge_headers(headers)
-      (self.headers ||= {}).merge(headers)
+    def merge_headers(req_headers)
+      (default_headers || {}).
+        merge(self.headers ||= {}).
+        merge(req_headers)
+    end
+
+    def default_headers
+      defaults = Almodovar::default_options[:headers] || {}
+      defaults = defaults.is_a?(Proc) ? defaults.call() : defaults
     end
 
     def requires_auth?

data/lib/almodovar/resource_collection.rb

@@ -17,7 +17,12 @@ module Almodovar
     def create(attrs = {})
       raise ArgumentError.new("You must specify one only root element which is the type of resource (e.g. `:project => { :name => 'Wadus' }` instead of just `:name => 'Wadus'`)") if attrs.size > 1
       root, body = attrs.first
-      response = http.post(@url, body.to_xml(root: root, convert_links: true, skip_links_one_level: true), query_params, { "Content-Type" => "application/xml" })
+      if body.is_a?(Array)
+        body = body.to_xml(root: root)
+      else
+        body = body.to_xml(root: root, convert_links: true, skip_links_one_level: true)
+      end
+      response = http.post(@url, body, query_params, { "Content-Type" => "application/xml" })
       check_errors(response, @url, query_params)
       Resource.new(nil, @auth, Nokogiri::XML.parse(response.body).root)
     end

data/lib/almodovar/version.rb

@@ -1,3 +1,3 @@
 module Almodovar
-  VERSION = '1.7.6'
+  VERSION = '1.7.8'
 end

data/lib/almodovar.rb

@@ -21,24 +21,41 @@ module Almodovar
   DEFAULT_RECEIVE_TIMEOUT = 120
 
   class << self
+
+    # default_options allows to configure some settings on the underlying HTTP client used by Almodovar:
+    #   - send_timeout: Request sending timeout in sec. Defaults to 120
+    #   - connect_timeout: Connect timeout in sec. Defaults to 30
+    #   - receive_timeout: Response receiving timeout in sec. Defaults to 120
+    #   - user_agent: User-Agent header in HTTP request. defaults to Almodovar/#{Almodovar::VERSION}
+    #   - force_basic_auth: flag for sending Authorization header w/o getting 401 first. Useful during tests
+    #   - headers: is for providing default headers Hash that all HTTP
+    #     requests should have, such as custom 'X-Request-Id' header in tracing.
+    #     As Almodovar does not expose http API, this accept a proc which will be
+    #     evaluated per request. You can override :headers with Almodovar::HTTPClient headers method
+    #     or using Hash parameter in HTTP request methods but this is not accessible on default Almodovar usage.
     def default_options
       default = {
         send_timeout: DEFAULT_SEND_TIMEOUT,
         connect_timeout: DEFAULT_CONNECT_TIMEOUT,
         receive_timeout: DEFAULT_RECEIVE_TIMEOUT,
         user_agent: "Almodovar/#{Almodovar::VERSION}",
-        force_basic_auth: false
+        force_basic_auth: false,
+        headers: nil,
       }
       default.merge(@default_options || {})
     end
 
     def default_options=(options = {})
-      @default_options = {
-        send_timeout: options[:send_timeout],
-        connect_timeout: options[:connect_timeout],
-        receive_timeout: options[:receive_timeout],
-        force_basic_auth: options[:force_basic_auth]
-      }
+      @default_options ||= {}
+      # Only assign provided keys too keep defaults when merging
+      %i(send_timeout connect_timeout receive_timeout force_basic_auth headers).each do |key|
+        @default_options[key] = options[key] if options.has_key?(key)
+      end
+      @default_options
+    end
+
+    def reset_options
+      @default_options = nil
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: almodovar
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.7.8
 platform: ruby
 authors:
 - BeBanjo S.L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2022-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder