projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4062: Merge branch 'master' into 4062-infinite-scroll-repeat-TC
[arvados.git]
/
sdk
/
ruby
/
lib
/
arvados.rb
diff --git
a/sdk/ruby/lib/arvados.rb
b/sdk/ruby/lib/arvados.rb
index 567423ff4f154f0bd684669fad1f7e96b6b96c5b..6a9a52b1067f97dfa0a05a047fcf35db86b8b9ec 100644
(file)
--- a/
sdk/ruby/lib/arvados.rb
+++ b/
sdk/ruby/lib/arvados.rb
@@
-108,17
+108,23
@@
class Arvados
class Google::APIClient
def discovery_document(api, version)
api = api.to_s
class Google::APIClient
def discovery_document(api, version)
api = api.to_s
- return @discovery_documents["#{api}:#{version}"] ||=
+ discovery_uri = self.discovery_uri(api, version)
+ discovery_uri_hash = Digest::MD5.hexdigest(discovery_uri)
+ return @discovery_documents[discovery_uri_hash] ||=
begin
# fetch new API discovery doc if stale
begin
# fetch new API discovery doc if stale
- cached_doc = File.expand_path
'~/.cache/arvados/discovery_uri.json'
- if not File.exist?(cached_doc) or (Time.now - File.mtime(cached_doc)) > 86400
+ cached_doc = File.expand_path
"~/.cache/arvados/discovery-#{discovery_uri_hash}.json" rescue nil
+ if
cached_doc.nil? or
not File.exist?(cached_doc) or (Time.now - File.mtime(cached_doc)) > 86400
response = self.execute!(:http_method => :get,
response = self.execute!(:http_method => :get,
- :uri =>
self.discovery_uri(api, version)
,
+ :uri =>
discovery_uri
,
:authenticated => false)
:authenticated => false)
- FileUtils.makedirs(File.dirname cached_doc)
- File.open(cached_doc, 'w') do |f|
- f.puts response.body
+ begin
+ FileUtils.makedirs(File.dirname cached_doc)
+ File.open(cached_doc, 'w') do |f|
+ f.puts response.body
+ end
+ rescue
+ return JSON.load response.body
end
end
end
end
@@
-210,8
+216,6
@@
class Arvados
end
def self.api_exec(method, parameters={})
api_method = arvados_api.send(api_models_sym).send(method.name.to_sym)
end
def self.api_exec(method, parameters={})
api_method = arvados_api.send(api_models_sym).send(method.name.to_sym)
- parameters = parameters.
- merge(:api_token => arvados.config['ARVADOS_API_TOKEN'])
parameters.each do |k,v|
parameters[k] = v.to_json if v.is_a? Array or v.is_a? Hash
end
parameters.each do |k,v|
parameters[k] = v.to_json if v.is_a? Array or v.is_a? Hash
end
@@
-230,7
+234,10
@@
class Arvados
execute(:api_method => api_method,
:authenticated => false,
:parameters => parameters,
execute(:api_method => api_method,
:authenticated => false,
:parameters => parameters,
- :body => body)
+ :body => body,
+ :headers => {
+ authorization: 'OAuth2 '+arvados.config['ARVADOS_API_TOKEN']
+ })
resp = JSON.parse result.body, :symbolize_names => true
if resp[:errors]
raise Arvados::TransactionFailedError.new(resp[:errors])
resp = JSON.parse result.body, :symbolize_names => true
if resp[:errors]
raise Arvados::TransactionFailedError.new(resp[:errors])