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 a6ebc36ef9662f5a5b93973606f14d0dc8917625..7a3f4b4226210646cbdd098d5594ff354f42778e 100644 (file)
--- a/sdk/ruby/lib/arvados.rb
+++ b/sdk/ruby/lib/arvados.rb
@@ -1,10 +1,11 @@
 require 'rubygems'
-require 'google/api_client'
 require 'active_support/inflector'
 require 'json'
 require 'fileutils'
 require 'andand'
 
+require 'arvados/google_api_client'
+
 ActiveSupport::Inflector.inflections do |inflect|
   inflect.irregular 'specimen', 'specimens'
   inflect.irregular 'human', 'humans'
@@ -105,34 +106,6 @@ class Arvados
     end
   end
 
-  class Google::APIClient
-    def discovery_document(api, version)
-      api = api.to_s
-      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-#{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 => discovery_uri,
-                                     :authenticated => false)
-            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
-
-          File.open(cached_doc) { |f| JSON.load f }
-        end
-    end
-  end
-
   def client
     @client ||= Google::APIClient.
       new(:host => @arvados_api_host,
@@ -236,7 +209,7 @@ class Arvados
                 :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]
@@ -244,7 +217,7 @@ class Arvados
       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