arvados 0.1.20140812091227 → 0.1.20140812101132

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c6ce242e75a8a7f3aadac18be9789f07b1a4af9
-  data.tar.gz: 5412a9cc3bfe2a93dd766c67852e65879d4d9dfe
+  metadata.gz: b37978dafb1cdd898c967c329fad09ccb6f57ef6
+  data.tar.gz: 8686d4fb2237999c743a805ef4fb0137a7014a37
 SHA512:
-  metadata.gz: 142ae61b26e21e78f70f0081e53839788d451bcc05fefaeb2009acacb12ca628228d43e4ede640624ec2316eac471743d2f5ece7f08647abdec7fc522925d68c
-  data.tar.gz: ac35615d40b37a29c3c7196b0f3449f2147c8df1dd85ad1860e912bc0d1a0ee71dde76652cabb5e092aea3687cd7eaec363b1887e868cf30278833e6724bdebd
+  metadata.gz: 31f4f97986124fd655f20989255111283b5361567dcf0031ca4dad367658b0a1f15fb88c73def06e5f760470cb801edce682bbad8ef982aabc22da89d97e84a9
+  data.tar.gz: ff1674d188cd176da086928a5054af4f3636ff85049ff8a7764bd7db713a5a0e94b71df06e6d0d745555f07f11b331e24fa695cbb9ffe74c2e113f03bb0eb119

data/lib/arvados.rb

@@ -108,17 +108,23 @@ class Arvados
   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
-          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,
-                                     :uri => self.discovery_uri(api, version),
+                                     :uri => discovery_uri,
                                      :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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arvados
 version: !ruby/object:Gem::Version
-  version: 0.1.20140812091227
+  version: 0.1.20140812101132
 platform: ruby
 authors:
 - Arvados Authors
@@ -86,7 +86,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: This is the Arvados SDK gem, git revision ed1580a38c1aae0910cef83605622a41d927fba3
+description: This is the Arvados SDK gem, git revision 57ee96926d2d3d315ece3b2cbfb20d0fe01ab912
 email: gem-dev@curoverse.com
 executables: []
 extensions: []