Fix duplication of parameters in qeuery string
This commit is contained in:
parent
0dafa5e4ee
commit
f421551018
|
@ -181,14 +181,15 @@ module Google
|
||||||
# @return [Array<(Symbol, Addressable::URI, Hash, [#read,#to_str])>]
|
# @return [Array<(Symbol, Addressable::URI, Hash, [#read,#to_str])>]
|
||||||
def to_http_request
|
def to_http_request
|
||||||
request = (
|
request = (
|
||||||
if self.uri
|
if self.api_method
|
||||||
|
self.api_method.generate_request(self.parameters, self.body, self.headers)
|
||||||
|
elsif self.uri
|
||||||
unless self.parameters.empty?
|
unless self.parameters.empty?
|
||||||
self.uri.query = Addressable::URI.form_encode(self.parameters)
|
self.uri.query = Addressable::URI.form_encode(self.parameters)
|
||||||
end
|
end
|
||||||
[self.http_method, self.uri.to_s, self.headers, self.body]
|
[self.http_method, self.uri.to_s, self.headers, self.body]
|
||||||
else
|
|
||||||
self.api_method.generate_request(self.parameters, self.body, self.headers)
|
|
||||||
end)
|
end)
|
||||||
|
return request
|
||||||
end
|
end
|
||||||
|
|
||||||
##
|
##
|
||||||
|
@ -227,7 +228,7 @@ module Google
|
||||||
def to_env(connection)
|
def to_env(connection)
|
||||||
method, uri, headers, body = self.to_http_request
|
method, uri, headers, body = self.to_http_request
|
||||||
http_request = connection.build_request(method) do |req|
|
http_request = connection.build_request(method) do |req|
|
||||||
req.url(uri)
|
req.url(uri.to_s)
|
||||||
req.headers.update(headers)
|
req.headers.update(headers)
|
||||||
req.body = body
|
req.body = body
|
||||||
end
|
end
|
||||||
|
|
|
@ -432,8 +432,7 @@ describe Google::APIClient do
|
||||||
|
|
||||||
it 'should generate requests against the correct URIs' do
|
it 'should generate requests against the correct URIs' do
|
||||||
conn = stub_connection do |stub|
|
conn = stub_connection do |stub|
|
||||||
stub.get('/plus/v1/people/107807692475771887386/activities/public' +
|
stub.get('/plus/v1/people/107807692475771887386/activities/public') do |env|
|
||||||
'?collection=public&userId=107807692475771887386') do |env|
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue