From 9c40b96d8521efe9c08c4948f2c75184b6be92b3 Mon Sep 17 00:00:00 2001 From: Steven Bazyl Date: Thu, 13 Aug 2015 12:08:28 -0700 Subject: [PATCH] Avoid overwritting parameters with local vars in method template --- lib/google/apis/generator/helpers.rb | 2 +- lib/google/apis/generator/templates/_method.tmpl | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/google/apis/generator/helpers.rb b/lib/google/apis/generator/helpers.rb index b90192469..e57fb6cd9 100644 --- a/lib/google/apis/generator/helpers.rb +++ b/lib/google/apis/generator/helpers.rb @@ -6,7 +6,7 @@ module Google module NameHelpers KEYWORDS = %w(__ENCODING__ def in self __LINE__ defined? module super __FILE__ do next then BEGIN else nil true END elsif not undef alias end or unless and ensure redo until begin - false rescue when break for retry while case if return yield class) + false rescue when break for retry while case if return yield class command) PLURAL_METHODS = %w(list search) # Check to see if the method name should be plauralized diff --git a/lib/google/apis/generator/templates/_method.tmpl b/lib/google/apis/generator/templates/_method.tmpl index eb4e370ec..6d8bb6568 100644 --- a/lib/google/apis/generator/templates/_method.tmpl +++ b/lib/google/apis/generator/templates/_method.tmpl @@ -50,24 +50,23 @@ # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification # @raise [Google::Apis::AuthorizationError] Authorization is required def <%= api_method.generated_name %>(<% for param in api_method.required_parameters %><%= param.generated_name %>, <% end %><% if api_method.request %><%= api.schemas[api_method.request._ref].generated_name %>_object = nil, <% end %><% for param in api_method.optional_query_parameters %><%= param.generated_name %>: nil, <% end %><% for param in api.parameters.values.reject {|p| p.name == 'key'} %><%= param.generated_name %>: nil, <% end %><% if api_method.supports_media_upload? %>upload_source: nil, content_type: nil, <% elsif api_method.supports_media_download? %>download_dest: nil, <% end %>options: nil, &block) - path = '<%= api_method.path %>' <% if api_method.supports_media_upload? -%> if upload_source.nil? - command = make_simple_command(:<%= api_method.http_method.downcase %>, path, options) + command = make_simple_command(:<%= api_method.http_method.downcase %>, '<%= api_method.path %>', options) else - command = make_upload_command(:<%= api_method.http_method.downcase %>, path, options) + command = make_upload_command(:<%= api_method.http_method.downcase %>, '<%= api_method.path %>', options) command.upload_source = upload_source command.upload_content_type = content_type end <% elsif api_method.supports_media_download? -%> if download_dest.nil? - command = make_simple_command(:<%= api_method.http_method.downcase %>, path, options) + command = make_simple_command(:<%= api_method.http_method.downcase %>, '<%= api_method.path %>', options) else - command = make_download_command(:<%= api_method.http_method.downcase %>, path, options) + command = make_download_command(:<%= api_method.http_method.downcase %>, '<%= api_method.path %>', options) command.download_dest = download_dest end <% else -%> - command = make_simple_command(:<%= api_method.http_method.downcase %>, path, options) + command = make_simple_command(:<%= api_method.http_method.downcase %>, '<%= api_method.path %>', options) <% end -%> <% if api_method.request -%> command.request_representation = <%= api.schemas[api_method.request._ref].generated_type %>::Representation