[API] Code Generator: remove namespace depth in templates, RuboCop deals with that

Author: picandocodigo

elasticsearch-api/utils/thor/endpoint_spec.rb

@@ -32,7 +32,7 @@ def initialize(filepath)
 
         full_namespace = parse_full_namespace
         @namespace_depth = full_namespace.size > 0 ? full_namespace.size - 1 : 0
-        @module_namespace = full_namespace[0, namespace_depth]
+        @module_namespace = full_namespace[0, @namespace_depth]
         @method_name = full_namespace.last
 
         @path_parts = parse_endpoint_parts(@spec)
@@ -56,7 +56,6 @@ def initialize(filepath)
                   :http_path,
                   :required_parts,
                   :http_method,
-                  :namespace_depth,
                   :path_params,
                   :perform_request_opts
 

elasticsearch-api/utils/thor/endpoint_specifics.rb

@@ -136,11 +136,11 @@ def msearch_template_body_helper
 
       def bulk_body_helper
         <<~SRC
-          if body.is_a? Array
-            payload = Elasticsearch::API::Utils.__bulkify(body)
-          else
-            payload = body
-          end
+          payload = if body.is_a? Array
+                      Elasticsearch::API::Utils.__bulkify(body)
+                    else
+                      body
+                    end
         SRC
       end
 

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

@@ -30,5 +30,5 @@ when 'mtermvectors'
 <%- when 'ml.find_file_structure' %>
   body = Utils.__bulkify(arguments.delete(:body))
 <%- else -%>
-  <%= '  '*(@spec.namespace_depth+3) %>body   = <%= @spec.body.nil? ? 'nil' : 'arguments.delete(:body)' %>
+  body   = <%= @spec.body.nil? ? 'nil' : 'arguments.delete(:body)' %>
 <%- end -%>

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

@@ -17,12 +17,12 @@
 # under the License.
 %>
 <%- if @spec.documentation['description'] -%>
-  <%= '  '*(@spec.namespace_depth+3) %># <%= @spec.documentation['description'] .gsub("\n", "\n#{'  '*(@spec.namespace_depth+3)}# ") -%>
+  # <%= @spec.documentation['description'].gsub("\n", "\n  # ") -%>
 <%- else %>
-  <%= '  '*(@spec.namespace_depth+3) %># TODO: Description
+  # TODO: Description
 <%- end %>
 <%= stability_doc_helper(@spec.stability) -%>
-<%= '  '*(@spec.namespace_depth+3) %>#
+#
 <%- unless @spec.path_parts.nil? || @spec.path_parts.empty? %><%# URL parts -%>
   <%- @spec.path_parts.each do |name, info| -%>
     <%= docs(name, info) -%>
@@ -37,10 +37,9 @@
   <%- if @spec.method_name == 'bulk' -%>
     <%= bulk_doc_helper(@spec.body['description']) -%>
   <%- else -%>
-    <%= '  '*(@spec.namespace_depth+1) +
-    '# @option arguments [Hash] :body ' + (@spec.body['description'] ?
-                                           @spec.body['description'].strip : 'TODO: Description') +
-                                           (@spec.body['required'] ? ' (*Required*)' : '') + "\n"
+    <%= '# @option arguments [Hash] :body ' + (@spec.body['description'] ?
+                                               @spec.body['description'].strip : 'TODO: Description') +
+                                              (@spec.body['required'] ? ' (*Required*)' : '') + "\n"
     -%>
   <%- end -%>
 <%- end -%>
@@ -51,7 +50,7 @@
   # Deprecated since version <%=  @spec.deprecation_note['version'] %>
   #
 <% end -%>
-<%= '  '*(@spec.namespace_depth+3) -%>#
+#
 <%# Documentation link -%>
-<%=  '  '*(@spec.namespace_depth+3) %># @see <%= @spec.documentation['url'] ? Elasticsearch::API::FilesHelper.documentation_url(@spec.documentation['url']) : "[TODO]" %>
-<%= '  '*(@spec.namespace_depth+3) %>#
+# @see <%= @spec.documentation['url'] ? Elasticsearch::API::FilesHelper.documentation_url(@spec.documentation['url']) : "[TODO]" %>
+#

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

@@ -18,19 +18,19 @@
 %>
 <%- @spec.path_parts.each do |name, _| %>
   <%- unless @spec.method_name == 'get_field_mapping' && name == 'fields' %>
-    <%= '  '*(@spec.namespace_depth+3) + "_#{name}" %> = arguments.delete(:<%=name %>)
+    <%= "_#{name}" %> = arguments.delete(:<%=name %>)
   <%- end -%>
 <%- end -%>
 
-<%= '  '*(@spec.namespace_depth+4) %>method = <%= @spec.http_method %>
+method = <%= @spec.http_method %>
 <%- if @spec.method_name == 'termvectors' %>
   endpoint = arguments.delete(:endpoint) || '_termvectors'
 <%- end -%>
-<%= '  '*(@spec.namespace_depth+4) %>path   = <%= @spec.http_path %>
+path   = <%= @spec.http_path %>
 <%- if [email protected]? || needs_ignore_404?(@spec.endpoint_name) || needs_complex_ignore_404?(@spec.endpoint_name)-%>
-  <%= '  '*(@spec.namespace_depth+4) %>params = Utils.process_params(arguments)
+  params = Utils.process_params(arguments)
 <%- else -%>
-  <%= '  '*(@spec.namespace_depth+4) %>params = {}
+  params = {}
 <%- end -%>
 <%- @spec.specific_params.each do |param| -%>
   <%= param %>

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

@@ -47,4 +47,4 @@
     )
   <%- end -%>
 <%- end -%>
-<%= '  '*(@spec.namespace_depth+3) %>end
+end

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

@@ -16,14 +16,14 @@
 # under the License.
 #
 module Elasticsearch
-<%= '  '*(@spec.namespace_depth) %>module API
+module API
 <%- @spec.module_namespace.each_with_index do |name, i| -%>
   <%= '  '*i %>module <%= module_name_helper(name) %>
 <%- end -%>
-<%= '  '*(@spec.namespace_depth+2) %>module Actions
+module Actions
 <%= 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 = {})
+def <%= @spec.method_name %>(arguments = {})
   request_opts = { endpoint: arguments[:endpoint] || "<%= @spec.endpoint_name %>" }
 <%- unless @spec.path_params.empty? %>
   defined_params =<%=  @spec.path_params %>.inject({}) do |set_variables, variable|
@@ -34,20 +34,20 @@ module Elasticsearch
 <%- end %>
 <%-    %>
 <%- if @spec.endpoint_name == 'create' -%>
-  <%= '  '*(@spec.namespace_depth+3) %>if arguments[:id]
-  <%= '  '*(@spec.namespace_depth+3) %>  index arguments.update op_type: 'create'
-  <%= '  '*(@spec.namespace_depth+3) %>else
-  <%= '  '*(@spec.namespace_depth+3) %>  index arguments
-  <%= '  '*(@spec.namespace_depth+3) %>end
-  <%= '  '*(@spec.namespace_depth+2) %>end
+if arguments[:id]
+  index arguments.update op_type: 'create'
+else
+  index arguments
+end
+end
 <%- else -%>
   <%- if @spec.method_name == 'get_field_mapping' %>
     arguments = arguments.clone
     _fields = arguments.delete(:field) || arguments.delete(:fields)
     raise ArgumentError, "Required argument 'field' missing" unless _fields
   <%- else -%>
     <%- @spec.required_parts.each do |required| %><%# Arguments -%>
-      <%= '  '*(@spec.namespace_depth+3) + "raise ArgumentError, \"Required argument '#{required}' missing\" unless arguments[:#{required}]" + "\n" -%>
+      <%= "raise ArgumentError, \"Required argument '#{required}' missing\" unless arguments[:#{required}]" + "\n" -%>
     <%- end -%>
     arguments = arguments.clone
     <%- end -%>
@@ -70,10 +70,10 @@ module Elasticsearch
     termvectors(arguments.merge endpoint: '_termvector')
   end
 <%- end -%>
-
 <%- @spec.namespace_depth.downto(1) do |i| -%>
-<%= '  '*(i-1) %>end
+  <%= '  '*(i-1) %>end
 <%- end if @spec.namespace_depth > 0 -%>
+
     end
   end
 end