Corrected headers retrieval from Faraday's response. Added automatic Http method name generation.

This commit is contained in:
Nick Lebedev 2015-07-28 21:46:06 +03:00
Родитель 980a213211
Коммит 90e2b9bbab
4 изменённых файлов: 12 добавлений и 12 удалений

Просмотреть файл

@ -126,7 +126,7 @@ namespace Microsoft.Rest.Generator.Ruby
}
}
public virtual string InitializeResponseBody
public virtual string InitializeResponseBody
{
get { return string.Empty; }
}
@ -231,7 +231,7 @@ namespace Microsoft.Rest.Generator.Ruby
builder.AppendLine("{0} = URI.join({1}.base_url, {2})", outputVariableName, ClientReference, inputVariableName);
}
// Filling query parameters (which are directly in the url query part).
// Filling query parameters (which are directly in the url query part).
var queryParametres = ParameterTemplateModels.Where(p => p.Location == ParameterLocation.Query).ToList();
if (queryParametres.Any())
@ -256,12 +256,12 @@ namespace Microsoft.Rest.Generator.Ruby
//builder.AppendLine("# trim all duplicate forward slashes in the url");
//builder.AppendLine("var regex = /([^:]\\/)\\/+/gi;");
//builder.AppendLine("{0} = {0}.replace(regex, '$1');", urlVariableName);
return builder.ToString();
}
/// <summary>
/// Gets the expression for default header setting.
/// Gets the expression for default header setting.
/// </summary>
public virtual string SetDefaultHeaders
{

Просмотреть файл

@ -70,7 +70,7 @@ def @(Model.Name)(@(Model.MethodParameterDeclaration))
@EmptyLine
# Send Request
promise = Concurrent::Promise.new do
connection.put do |request|
connection.@(Model.HttpMethod.ToString().ToLower()) do |request|
request.headers = request_headers
@if (Model.RequestBody != null)
{

Просмотреть файл

@ -90,9 +90,9 @@ module MsRestAzure
fail CloudError if azure_response.nil?
fail CloudError if azure_response.response.nil?
if (azure_response.response.code != "200" &&
azure_response.response.code != "202" &&
azure_response.response.code != "204")
status_code = azure_response.response.status
if (status_code != 200 && status_code != 202 && status_code != 204)
fail CloudError
end

Просмотреть файл

@ -52,8 +52,8 @@ module MsRestAzure
def get_delay_in_milliseconds
return @retry_timeout unless @retry_timeout.nil?
if (!response.nil? && !response['Retry-After'].nil?)
return response['Retry-After'].to_i * 1000
if (!response.nil? && !response.headers['Retry-After'].nil?)
return response.headers['Retry-After'].to_i * 1000
end
return MsRestAzure::AzureAsyncOperation.DEFAULT_DELAY
@ -66,8 +66,8 @@ module MsRestAzure
@response = response
if (!response.nil?)
@azure_async_operation_header_link = response['Azure-AsyncOperation'] unless response['Azure-AsyncOperation'].nil?
@location_header_link = response['Location'] unless response['Location'].nil?
@azure_async_operation_header_link = response.headers['Azure-AsyncOperation'] unless response.headers['Azure-AsyncOperation'].nil?
@location_header_link = response.headers['Location'] unless response.headers['Location'].nil?
end
end