Merge pull request abronte#38 from kysnm/change_google_api_client_0_9_3

Change google api client 0.9.3

Author: abronte

Gemfile.lock

@@ -2,63 +2,54 @@ PATH
   remote: .
   specs:
     bigquery (0.9.0)
-      google-api-client (= 0.8.6)
+      google-api-client (= 0.9.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.5)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.3.8)
-    autoparse (0.3.3)
-      addressable (>= 2.3.1)
-      extlib (>= 0.9.15)
-      multi_json (>= 1.0.0)
+    addressable (2.4.0)
     byebug (2.7.0)
       columnize (~> 0.3)
       debugger-linecache (~> 1.2)
     coderay (1.1.0)
     columnize (0.8.9)
     debugger-linecache (1.2.0)
-    extlib (0.9.16)
-    faraday (0.9.1)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    google-api-client (0.8.6)
-      activesupport (>= 3.2)
+    google-api-client (0.9.3)
       addressable (~> 2.3)
-      autoparse (~> 0.3)
-      extlib (~> 0.9)
-      faraday (~> 0.9)
-      googleauth (~> 0.3)
-      launchy (~> 2.4)
-      multi_json (~> 1.10)
-      retriable (~> 1.4)
-      signet (~> 0.6)
-    googleauth (0.4.1)
+      googleauth (~> 0.5)
+      httpclient (~> 2.7)
+      hurley (~> 0.1)
+      memoist (~> 0.11)
+      mime-types (>= 1.6)
+      representable (~> 2.3.0)
+      retriable (~> 2.0)
+      thor (~> 0.19)
+    googleauth (0.5.1)
       faraday (~> 0.9)
       jwt (~> 1.4)
       logging (~> 2.0)
       memoist (~> 0.12)
-      multi_json (= 1.11)
-      signet (~> 0.6)
-    i18n (0.7.0)
-    json (1.8.3)
-    jwt (1.5.1)
-    launchy (2.4.3)
-      addressable (~> 2.3)
-    little-plugger (1.1.3)
+      multi_json (~> 1.11)
+      os (~> 0.9)
+      signet (~> 0.7)
+    httpclient (2.7.1)
+    hurley (0.2)
+    jwt (1.5.3)
+    little-plugger (1.1.4)
     logging (2.0.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    memoist (0.12.0)
+    memoist (0.14.0)
     method_source (0.8.2)
+    mime-types (3.0)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0221)
     minitest (5.3.4)
-    multi_json (1.11.0)
+    multi_json (1.11.2)
     multipart-post (2.0.0)
+    os (0.9.6)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
@@ -67,17 +58,17 @@ GEM
       byebug (~> 2.7)
       pry (~> 0.9.12)
     rake (10.3.2)
-    retriable (1.4.1)
-    signet (0.6.1)
+    representable (2.3.0)
+      uber (~> 0.0.7)
+    retriable (2.1.0)
+    signet (0.7.2)
       addressable (~> 2.3)
-      extlib (~> 0.9)
       faraday (~> 0.9)
       jwt (~> 1.5)
       multi_json (~> 1.10)
     slop (3.5.0)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
+    thor (0.19.1)
+    uber (0.0.15)
 
 PLATFORMS
   ruby
@@ -88,3 +79,6 @@ DEPENDENCIES
   minitest
   pry-byebug
   rake
+
+BUNDLED WITH
+   1.11.2

bigquery.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.files           = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
 
-  s.add_dependency "google-api-client", "0.8.6"
+  s.add_dependency "google-api-client", "0.9.3"
 
   s.add_development_dependency "bundler"
   s.add_development_dependency "rake"

lib/big_query.rb

@@ -1,5 +1,6 @@
 require 'json'
-require 'google/api_client'
+require 'google/apis/bigquery_v2'
+require 'google/api_client/auth/key_utils'
 require 'big_query/version'
 require 'big_query/errors'
 require 'big_query/client'

lib/big_query/client.rb

@@ -4,6 +4,10 @@
 require 'big_query/client/tables'
 require 'big_query/client/datasets'
 require 'big_query/client/load'
+require 'big_query/client/hashable'
+require 'big_query/client/options'
+require 'big_query/client/response'
+require 'big_query/client/job_types'
 
 module BigQuery
   class Client
@@ -13,15 +17,35 @@ class Client
     include BigQuery::Client::Tables
     include BigQuery::Client::Datasets
     include BigQuery::Client::Insert
+    include BigQuery::Client::Hashable
+    include BigQuery::Client::Options
+    include BigQuery::Client::Response
+    include BigQuery::Client::JobTypes
 
     attr_accessor :dataset, :project_id
 
     def initialize(opts = {})
-      @client = Google::APIClient.new(
-        application_name: 'BigQuery ruby app',
-        application_version: BigQuery::VERSION,
-        faraday_option: opts['faraday_option']
-      )
+      # for debug
+      # Google::Apis.logger.level = Logger::DEBUG
+
+      @client = Google::Apis::BigqueryV2::BigqueryService.new
+
+      @client.client_options.application_name = 'BigQuery ruby app'
+      @client.client_options.application_version = BigQuery::VERSION
+
+      # Memo:
+      # The google-api-client 0.9 is HTTP Client no longer in Faraday
+      # We accepts the options for backward compatibility
+      # (HTTP Client is replaced in the near future HTTP::Client...)
+      # https://github.com/google/google-api-ruby-client/issues/336#issuecomment-179400592
+      if opts['faraday_option'].is_a?(Hash)
+        @client.request_options.timeout_sec = opts['faraday_option']['timeout']
+        @client.request_options.open_timeout_sec = opts['faraday_option']['open_timeout']
+      # We accept the request_option instead of faraday_option
+      elsif opts['request_option'].is_a?(Hash)
+        @client.request_options.timeout_sec = opts['request_option']['timeout_sec']
+        @client.request_options.open_timeout_sec = opts['request_option']['open_timeout_sec']
+      end
 
       begin
         key = Google::APIClient::KeyUtils.load_from_pkcs12(opts['key'], 'notasecret')
@@ -38,8 +62,6 @@ def initialize(opts = {})
 
       refresh_auth
 
-      @bq = @client.discovered_api("bigquery", "v2")
-
       @project_id = opts['project_id']
       @dataset = opts['dataset']
     end
@@ -50,31 +72,10 @@ def refresh_auth
 
     private
 
-    # Performs the api calls with the given params adding the defined project and
-    # dataset params if not defined
-    #
-    # @param opts [Hash] options for the api call
-    # @return [Hash] json response
-    def api(opts)
-      if opts[:parameters]
-        opts[:parameters] = opts[:parameters].merge({"projectId" => @project_id})
-      else
-        opts[:parameters] = {"projectId" => @project_id}
-      end
-
-      resp = @client.execute(opts)
-      data = parse_body(resp)
+    def api(resp)
+      data = deep_stringify_keys(resp.to_h)
       handle_error(data) if data && is_error?(data)
       data
     end
-
-    # Parses json body if present and is a json formatted
-    #
-    # @param resp [Faraday::Response] response object
-    # @return [Hash]
-    def parse_body(resp)
-      return nil unless resp.body && !resp.body.empty?
-      JSON.parse(resp.body)
-    end
   end
 end

lib/big_query/client/datasets.rb

@@ -6,11 +6,12 @@ module Datasets
       #
       # @return [Hash] json api response
       def datasets(parameters = {})
-        response = api({
-          api_method: @bq.datasets.list,
-          parameters: parameters
-        })
-
+        response = api(
+          @client.list_datasets(
+            @project_id,
+            parameters
+          )
+        )
         response['datasets'] || []
       end
 
@@ -29,23 +30,27 @@ def datasets_formatted(parameters = {})
       # examples:
       #
       # @bq.create_dataset('new_dataset')
-      def create_dataset(datasetId)
+      def create_dataset(dataset_id)
+        dataset = Google::Apis::BigqueryV2::Dataset.new(
+          dataset_reference:  { project_id: @project_id, dataset_id: dataset_id }
+        )
         api(
-          api_method: @bq.datasets.insert,
-          body_object: { "datasetReference" => {
-                            "datasetId" => datasetId,
-                            "projectId" => @project_id,
-                          }
-                        }
+          @client.insert_dataset(
+            @project_id,
+            dataset
+          )
         )
       end
 
       # Deletes the given datasetId
       #
       # @param datasetId [String] dataset id to insert into
-      def delete_dataset(datasetId)
-        api(api_method: @bq.datasets.delete,
-            parameters: { 'datasetId' => datasetId }
+      def delete_dataset(dataset_id)
+        api(
+          @client.delete_dataset(
+            @project_id,
+            dataset_id
+          )
         )
       end
     end

lib/big_query/client/hashable.rb

@@ -0,0 +1,17 @@
+module BigQuery
+  class Client
+    module Hashable
+
+      def process_value(val, convert_key_proc)
+        case val
+        when Hash
+          Hash[val.map {|k, v| [convert_key_proc.call(k), process_value(v, convert_key_proc)] }]
+        when Array
+          val.map{ |v| process_value(v, convert_key_proc) }
+        else
+          val
+        end
+      end
+    end
+  end
+end

lib/big_query/client/job_types.rb

@@ -0,0 +1,44 @@
+module BigQuery
+  class Client
+    module JobTypes
+
+      def _copy(opts)
+        _opts = opts.dup
+        if (_opts[:source_tables])
+          _opts[:source_tables] = _opts[:source_tables].dup.map { |source_table| Google::Apis::BigqueryV2::TableReference.new(source_table) }
+        else
+          _opts[:source_table] = Google::Apis::BigqueryV2::TableReference.new(_opts[:source_table])
+        end
+        _opts[:destination_table] = Google::Apis::BigqueryV2::TableReference.new(_opts[:destination_table])
+
+        Google::Apis::BigqueryV2::JobConfigurationTableCopy.new(
+          _opts
+        )
+      end
+
+      def _extract(opts)
+        _opts = opts.dup
+        _opts[:source_table] = Google::Apis::BigqueryV2::TableReference.new(_opts[:source_table])
+        Google::Apis::BigqueryV2::JobConfigurationExtract.new(
+          _opts
+        )
+      end
+
+      def _load(opts)
+        _opts = opts.dup
+        _opts[:destination_table] = Google::Apis::BigqueryV2::TableReference.new(_opts[:destination_table])
+        _opts[:schema] = Google::Apis::BigqueryV2::TableSchema.new(_opts[:schema]) if _opts[:schema]
+        Google::Apis::BigqueryV2::JobConfigurationLoad.new(
+          _opts
+        )
+      end
+
+      def _query(opts)
+        _opts = opts.dup
+        Google::Apis::BigqueryV2::JobConfigurationQuery.new(
+          _opts
+        )
+      end
+    end
+  end
+end