lib/vidispine/api/client/http_client.rb in vidispine-1.5.1 vs lib/vidispine/api/client/http_client.rb in vidispine-1.5.2

- old
+ new

@@ -186,13 +186,15 @@ # @option args [String] :path ('') # @option args [Hash] :query ({}) # @option args [Any] :body (nil) # @param [Hash] options # @option options [Hash] :default_request_headers (@default_request_headers) + # @option options [Hash] :headers + # @option options [Hash] :query def build_request(method_name = :get, args = { }, options = { }) headers = args[:headers] || options[:headers] || { } path = args[:path] || '' - query = args[:query] || { } + query = args[:query] || options[:query] || { } body = args[:body] # Allow the default request headers to be overridden _default_request_headers = options.fetch(:default_request_headers, default_request_headers) _default_request_headers ||= { } \ No newline at end of file