projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '8697-ruby187-compat'
[arvados.git]
/
sdk
/
ruby
/
lib
/
arvados.rb
diff --git
a/sdk/ruby/lib/arvados.rb
b/sdk/ruby/lib/arvados.rb
index 753c518b3191ebbfefbd4407ca67c2f9b83daa45..7a3f4b4226210646cbdd098d5594ff354f42778e 100644
(file)
--- a/
sdk/ruby/lib/arvados.rb
+++ b/
sdk/ruby/lib/arvados.rb
@@
-209,7
+209,7
@@
class Arvados
:parameters => parameters,
:body_object => body,
:headers => {
:parameters => parameters,
:body_object => body,
:headers => {
-
authorization:
'OAuth2 '+arvados.config['ARVADOS_API_TOKEN']
+
:authorization =>
'OAuth2 '+arvados.config['ARVADOS_API_TOKEN']
})
resp = JSON.parse result.body, :symbolize_names => true
if resp[:errors]
})
resp = JSON.parse result.body, :symbolize_names => true
if resp[:errors]
@@
-217,7
+217,7
@@
class Arvados
elsif resp[:uuid] and resp[:etag]
self.new(resp)
elsif resp[:items].is_a? Array
elsif resp[:uuid] and resp[:etag]
self.new(resp)
elsif resp[:items].is_a? Array
- resp.merge(
items:
resp[:items].collect do |i|
+ resp.merge(
:items =>
resp[:items].collect do |i|
self.new(i)
end)
else
self.new(i)
end)
else