Add request opts to perform_request method args

Author: estolfo

elasticsearch-api/lib/elasticsearch/api/namespace/common.rb

@@ -34,8 +34,8 @@ def initialize(client)
 
         # Delegates the `perform_request` method to the wrapped client
         #
-        def perform_request(method, path, params={}, body=nil, headers=nil)
-          client.perform_request method, path, params, body, headers
+        def perform_request(method, path, params={}, body=nil, headers=nil, request_opts={})
+          client.perform_request method, path, params, body, headers, request_opts
         end
       end
 

elasticsearch-api/utils/endpoint_spec.rb

@@ -17,6 +17,8 @@
 
 # encoding: UTF-8
 
+require_relative 'endpoint_specifics'
+
 module Elasticsearch
   module API
     class EndpointSpec
@@ -36,6 +38,8 @@ def initialize(filepath)
         @path_parts = parse_endpoint_parts(@spec)
         @params = @spec['params'] || {}
         @paths = @spec['url']['paths'].map { |b| b['path'] } if @spec['url']
+        @path_params   = path_variables.flatten.uniq.collect(&:to_sym)
+        @perform_request_opts = { endpoint: @endpoint_name }
         @http_method = parse_http_method(@spec)
         @deprecation_note = @spec['url']['paths'].last&.[]('deprecated')
         @http_path        = parse_http_path(@paths)
@@ -53,7 +57,9 @@ def initialize(filepath)
                   :http_path,
                   :required_parts,
                   :http_method,
-                  :namespace_depth
+                  :namespace_depth,
+                  :path_params,
+                  :perform_request_opts
 
       def body
         @spec['body']

elasticsearch-api/utils/endpoint_specifics.rb

@@ -84,7 +84,7 @@ def module_name_helper(name)
       def ping_perform_request
         <<~SRC
           begin
-            perform_request(method, path, params, body, headers).status == 200 ? true : false
+            perform_request(method, path, params, body, headers, request_opts).status == 200 ? true : false
           rescue Exception => e
             if e.class.to_s =~ /NotFound|ConnectionFailed/ || e.message =~ /Not\s*Found|404|ConnectionFailed/i
               false

elasticsearch-api/utils/thor/generate_source.rb

@@ -23,7 +23,6 @@
 require 'coderay'
 require 'pry'
 require_relative 'generator/files_helper'
-require_relative '../endpoint_specifics'
 require_relative '../endpoint_spec'
 
 module Elasticsearch

elasticsearch-api/utils/thor/templates/_perform_request.erb

@@ -20,30 +20,30 @@
   <%= self.send("#{@spec.method_name}_body_helper".to_s) %>
   headers.merge!("Content-Type" => "application/x-ndjson")
   Elasticsearch::API::Response.new(
-    perform_request(method, path, params, payload, headers)
+    perform_request(method, path, params, payload, headers, request_opts)
   )
 <%- elsif @spec.method_name == 'ping' -%>
   <%= ping_perform_request %>
 <%- else -%>
   <%- if needs_ignore_404?(@spec.endpoint_name) %>
     Utils.__rescue_from_not_found do
-      perform_request(method, path, params, body, headers).status == 200 ? true : false
+      perform_request(method, path, params, body, headers, request_opts).status == 200 ? true : false
     end
   <%- elsif needs_complex_ignore_404?(@spec.endpoint_name) -%>
     if Array(arguments[:ignore]).include?(404)
     Utils.__rescue_from_not_found {
       Elasticsearch::API::Response.new(
-        perform_request(method, path, params, body, headers)
+        perform_request(method, path, params, body, headers, request_opts)
       )
     }
     else
     Elasticsearch::API::Response.new(
-      perform_request(method, path, params, body, headers)
+      perform_request(method, path, params, body, headers, request_opts)
     )
     end
   <%- else -%>
     Elasticsearch::API::Response.new(
-      perform_request(method, path, params, body, headers)
+      perform_request(method, path, params, body, headers, request_opts)
     )
   <%- end -%>
 <%- end -%>

elasticsearch-api/utils/thor/templates/method.erb

@@ -24,6 +24,15 @@ module Elasticsearch
 <%= ERB.new(File.new("./thor/templates/_documentation_top.erb").read, trim_mode: '-').result(binding) -%>
 <%# Method definition -%>
 <%= '  '*(@spec.namespace_depth+3) -%>def <%= @spec.method_name %>(arguments = {})
+request_opts = <%= @spec.perform_request_opts %>
+<%- unless @spec.path_params.empty? %>
+  defined_params =<%=  @spec.path_params %>.inject({}) do |set_variables, variable|
+    set_variables[variable] = arguments[variable] if arguments.key?(variable)
+    set_variables
+  end
+  request_opts[:defined_params] = defined_params unless defined_params.empty?
+<%- end %>
+<%-    %>
 <%- if @spec.endpoint_name == 'create' -%>
   <%= '  '*(@spec.namespace_depth+3) %>if arguments[:id]
   <%= '  '*(@spec.namespace_depth+3) %>  index arguments.update op_type: 'create'