google-api-client 0.9.8 → 0.10.2

data/google-api-client.gemspec

@@ -20,13 +20,14 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.0'
 
-  spec.add_runtime_dependency 'representable', '~> 2.3.0'
-  spec.add_runtime_dependency 'retriable', '~> 2.0'
+  spec.add_runtime_dependency 'representable', '~> 3.0'
+  spec.add_runtime_dependency 'retriable', '>= 2.0', '< 4.0'
   spec.add_runtime_dependency 'addressable', '~> 2.3'
   spec.add_runtime_dependency 'mime-types', '>= 1.6'
   spec.add_runtime_dependency 'hurley', '~> 0.1'
   spec.add_runtime_dependency 'googleauth', '~> 0.5'
-  spec.add_runtime_dependency 'thor', '~> 0.19'
   spec.add_runtime_dependency 'httpclient', '~> 2.7'
   spec.add_runtime_dependency 'memoist', '~> 0.11'
+
+  spec.add_development_dependency 'thor', '~> 0.19'
 end

data/lib/google/apis/core/api_command.rb

@@ -26,7 +26,11 @@ module Google
       class ApiCommand < HttpCommand
         JSON_CONTENT_TYPE = 'application/json'
         FIELDS_PARAM = 'fields'
-        RATE_LIMIT_ERRORS = %w(rateLimitExceeded userRateLimitExceeded)
+        ERROR_REASON_MAPPING = {
+          'rateLimitExceeded' => Google::Apis::RateLimitError,
+          'userRateLimitExceeded' => Google::Apis::RateLimitError,
+          'projectNotLinked' => Google::Apis::ProjectNotLinkedError
+        }
 
         # JSON serializer for request objects
         # @return [Google::Apis::Core::JsonRepresentation]
@@ -51,7 +55,7 @@ module Google
           query[FIELDS_PARAM] = normalize_fields_param(query[FIELDS_PARAM]) if query.key?(FIELDS_PARAM)
           if request_representation && request_object
             header[:content_type] ||= JSON_CONTENT_TYPE
-            self.body = request_representation.new(request_object).to_json(skip_undefined: true)
+            self.body = request_representation.new(request_object).to_json(user_options: { skip_undefined: true })
           end
           super
         end
@@ -94,10 +98,12 @@ module Google
             error = parse_error(body)
             if error
               message = sprintf('%s: %s', error['reason'], error['message'])
-              raise Google::Apis::RateLimitError.new(message,
-                                                     status_code: status,
-                                                     header: header,
-                                                     body: body) if RATE_LIMIT_ERRORS.include?(error['reason'])
+              raise ERROR_REASON_MAPPING[error['reason']].new(
+                message,
+                status_code: status,
+                header: header,
+                body: body
+              ) if ERROR_REASON_MAPPING.key?(error['reason'])
             end
             super(status, header, body, message)
           else
@@ -105,6 +111,10 @@ module Google
           end
         end
 
+        def allow_form_encoding?
+          request_representation.nil? && super
+        end
+
         private
 
         # Attempt to parse a JSON error message, returning the first found error

data/lib/google/apis/core/base_service.rb

@@ -42,11 +42,12 @@ module Google
         #  True (default) if results should be cached so multiple iterations can be used.
         # @param [Symbol] items
         #   Name of the field in the result containing the items. Defaults to :items
-        def initialize(service, max: nil, items: :items, cache: true, &block)
+        def initialize(service, max: nil, items: :items, cache: true, response_page_token: :next_page_token, &block)
           @service = service
           @block = block
           @max = max
           @items_field = items
+          @response_page_token_field = response_page_token
           if cache
             @result_cache = Hash.new do |h, k|
               h[k] = @block.call(k, @service)
@@ -63,14 +64,21 @@ module Google
           item_count = 0
           loop do
             @last_result = @fetch_proc.call(page_token)
-            for item in @last_result.send(@items_field)
-              item_count = item_count + 1
-              break if @max && item_count > @max
-              yield item
+            items = @last_result.send(@items_field)
+            if items.kind_of?(Array)
+              for item in items
+                item_count = item_count + 1
+                break if @max && item_count > @max
+                yield item
+              end
+            elsif items
+              # yield singular non-nil items (for genomics API)
+              yield items
             end
             break if @max && item_count >= @max
-            break if @last_result.next_page_token.nil? || @last_result.next_page_token == page_token
-            page_token = @last_result.next_page_token
+            next_page_token = @last_result.send(@response_page_token_field)
+            break if next_page_token.nil? || next_page_token == page_token
+            page_token = next_page_token
           end
         end
       end
@@ -264,9 +272,9 @@ module Google
         # @example Retrieve all files,
         #   file_list = service.fetch_all { |token, s| s.list_files(page_token: token) }
         #   file_list.each { |f| ... }
-        def fetch_all(max: nil, items: :items, cache: true,  &block)
+        def fetch_all(max: nil, items: :items, cache: true, response_page_token: :next_page_token, &block)
           fail "fetch_all may not be used inside a batch" if batch?
-          return PagedResults.new(self, max: max, items: items, cache: cache, &block)
+          return PagedResults.new(self, max: max, items: items, cache: cache, response_page_token: response_page_token, &block)
         end
 
         protected

data/lib/google/apis/core/download.rb

@@ -23,6 +23,7 @@ module Google
       # Streaming/resumable media download support
       class DownloadCommand < ApiCommand
         RANGE_HEADER = 'range'
+        OK_STATUS = [200, 201, 206]
 
         # File or IO to write content to
         # @return [String, File, #write]
@@ -65,7 +66,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def execute_once(client, &block)
-          client.get(@download_url || url) do |req|
+          response = client.get(@download_url || url) do |req|
             apply_request_options(req)
             check_if_rewind_needed = false
             if @offset > 0
@@ -73,7 +74,7 @@ module Google
               req.header[RANGE_HEADER] = sprintf('bytes=%d-', @offset)
               check_if_rewind_needed = true
             end
-            req.on_body(200, 201, 206) do |res, chunk|
+            req.on_body(*OK_STATUS) do |res, chunk|
               check_status(res.status_code, chunk) unless res.status_code.nil?
               if check_if_rewind_needed && res.status_code != 206
                 # Oh no! Requested a chunk, but received the entire content
@@ -88,6 +89,10 @@ module Google
               @download_io.flush
             end
           end
+
+          # Since the on_body block only runs on success, check status again just in case it failed
+          check_status(response.status_code, response.body) unless OK_STATUS.include?(response.status_code.to_i)
+
           if @close_io_on_finish
             result = nil
           else

data/lib/google/apis/core/http_command.rb

@@ -146,7 +146,7 @@ module Google
           self.url = url.expand(params) if url.is_a?(Addressable::Template)
           url.query_values = query.merge(url.query_values || {})
 
-          if [:post, :put].include?(method)  && body.nil?
+          if allow_form_encoding?
             @form_encoded = true
             self.body = Addressable::URI.form_encode(url.query_values(Array))
             self.header['Content-Type'] = 'application/x-www-form-urlencoded; charset=UTF-8'
@@ -306,6 +306,10 @@ module Google
           req.options.open_timeout = options.open_timeout_sec
         end
 
+        def allow_form_encoding?
+          [:post, :put].include?(method) && body.nil?
+        end
+
         private
 
         def form_encoded?

data/lib/google/apis/core/json_representation.rb

@@ -55,7 +55,7 @@ module Google
           def if_fn(name)
             ivar_name = "@#{name}".to_sym
             lambda do |opts|
-              if opts[:skip_undefined]
+              if opts[:options][:user_options] and opts[:options][:user_options][:skip_undefined]
                 if respond_to?(:key?)
                   self.key?(name) || instance_variable_defined?(ivar_name)
                 else
@@ -137,7 +137,7 @@ module Google
 
         def to_json
           representation = self.class.const_get(:Representation)
-          representation.new(self).to_json(skip_undefined: true)
+          representation.new(self).to_json(user_options: { skip_undefined: true })
         end
       end
     end

data/lib/google/apis/core/upload.rb

@@ -17,8 +17,14 @@ require 'google/apis/core/http_command'
 require 'google/apis/core/api_command'
 require 'google/apis/errors'
 require 'addressable/uri'
-require 'mime-types'
 require 'tempfile'
+begin
+  require 'mime/types/columnar'
+rescue LoadError
+  # Temporary until next major bump when we can tighten
+  # dependency to mime-types >-=3.0
+  require 'mime-types'
+end
 
 module Google
   module Apis

data/lib/google/apis/errors.rb

@@ -19,7 +19,7 @@ module Google
       attr_reader :status_code
       attr_reader :header
       attr_reader :body
-      
+
       def initialize(err, status_code: nil, header: nil, body: nil)
         @cause = nil
 
@@ -42,7 +42,7 @@ module Google
         end
       end
     end
-    
+
     # An error which is raised when there is an unexpected response or other
     # transport error that prevents an operation from succeeding.
     class TransmissionError < Error
@@ -61,6 +61,10 @@ module Google
     class RateLimitError < Error
     end
 
+    # A 403 HTTP error occurred.
+    class ProjectNotLinkedError < Error
+    end
+
     # A 401 HTTP error occurred.
     class AuthorizationError < Error
     end

data/lib/google/apis/generator/annotator.rb

@@ -25,12 +25,18 @@ require 'addressable/uri'
 
 module Google
   module Apis
+
     # @private
     class Generator
+
       # Helper for picking names for methods, properties, types, etc. Performs various normaliations
       # as well as allows for overriding individual names from a configuration file for cases
       # where algorithmic approaches produce poor APIs.
       class Names
+        ActiveSupport::Inflector.inflections do |inflections|
+          u = inflections.uncountable('send_as', 'as')
+        end
+
         include Google::Apis::Core::Logging
         include NameHelpers
 

data/lib/google/apis/version.rb

@@ -15,7 +15,7 @@
 module Google
   module Apis
     # Client library version
-    VERSION = '0.9.8'
+    VERSION = '0.10.2'
 
     # Current operating system
     # @private

data/samples/cli/lib/samples/bigquery.rb

@@ -0,0 +1,101 @@
+# Copyright 2016 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'google/apis/bigquery_v2'
+require 'base_cli'
+
+
+module Samples
+  # Examples for the Google BigQuery API
+  #
+  # Sample usage:
+  #
+  #     $ ./google-api-samples bigquery list_datasets --project_id=publicdata
+  #     $ ./google-api-samples bigquery list_tables --project_id=publicdata --dataset_id=samples
+  #     $ ./google-api-samples bigquery list_table_data --project_id=publicdata --dataset_id=samples --table_id=wikipedia --max_results=10
+  class Bigquery < BaseCli
+    Bigquery = Google::Apis::BigqueryV2
+
+    desc 'list datasets', 'List datasets'
+    method_option :project_id, type: :string
+    def list_datasets
+      bigquery = Bigquery::BigqueryService.new
+      bigquery.authorization = user_credentials_for(Bigquery::AUTH_BIGQUERY)
+
+      begin
+        project_id = options[:project_id] || 'publicdata'
+        result = bigquery.list_datasets(project_id)
+        data = []
+        data << ['id','kind']
+        result.datasets.each do |dataset|
+          data << [
+            dataset.id,
+            dataset.kind,
+          ]
+        end
+        print_table(data)
+      end
+    end
+
+    desc 'list tables', 'List tables'
+    method_option :project_id, type: :string
+    method_option :dataset_id, type: :string
+    def list_tables
+      bigquery = Bigquery::BigqueryService.new
+      bigquery.authorization = user_credentials_for(Bigquery::AUTH_BIGQUERY)
+
+      begin
+        project_id = options[:project_id] || 'publicdata'
+        dataset_id = options[:dataset_id] || 'samples'
+        result = bigquery.list_tables(project_id, dataset_id)
+        data = []
+        data << ['id','kind']
+        result.tables.each do |table|
+          data << [
+            table.id,
+            table.kind,
+          ]
+        end
+        print_table(data)
+      end
+    end
+
+    desc 'list table data', 'List table data'
+    method_option :project_id, type: :string
+    method_option :dataset_id, type: :string
+    method_option :table_id, type: :string
+    def list_table_data
+      bigquery = Bigquery::BigqueryService.new
+      bigquery.authorization = user_credentials_for(Bigquery::AUTH_BIGQUERY)
+
+      begin
+        project_id = options[:project_id] || 'publicdata'
+        dataset_id = options[:dataset_id] || 'samples'
+        table_id = options[:table_id] || 'wikipedia'
+        max_results = options[:max_results] || 10
+        result = bigquery.list_table_data(project_id, dataset_id, table_id, max_results: max_results)
+
+        datas = []
+        result.rows.each do |row|
+          data = []
+          row.f.each do |field|
+            data << field.v
+          end
+          datas << data
+        end
+        print_table(datas)
+      end
+    end
+  end
+end

data/samples/cli/lib/samples/calendar.rb

@@ -36,7 +36,7 @@ module Samples
 
       event = {
         summary: options[:summary],
-        attendees: Array(options[:attenddes]).map { |email| { email: email } },
+        attendees: Array(options[:attendees]).map { |email| { email: email } },
         start: {
           date_time: DateTime.parse(options[:start])
         },

data/samples/cli/lib/samples/gmail.rb

@@ -28,6 +28,33 @@ module Samples
   class Gmail < BaseCli
     Gmail = Google::Apis::GmailV1
 
+    desc 'get ID', 'Get a message for an id with the gmail API'
+    def get(id)
+      gmail = Gmail::GmailService.new
+      gmail.authorization = user_credentials_for(Gmail::AUTH_SCOPE)
+
+      result = gmail.get_user_message('me', id)
+      payload = result.payload
+      headers = payload.headers
+
+      date = headers.any? { |h| h.name == 'Date' } ? headers.find { |h| h.name == 'Date' }.value : ''
+      from = headers.any? { |h| h.name == 'From' } ? headers.find { |h| h.name == 'From' }.value : ''
+      to = headers.any? { |h| h.name == 'To' } ? headers.find { |h| h.name == 'To' }.value : ''
+      subject = headers.any? { |h| h.name == 'Subject' } ? headers.find { |h| h.name == 'Subject' }.value : ''
+
+      body = payload.body.data
+      if body.nil? && payload.parts.any?
+        body = payload.parts.map { |part| part.body.data }.join
+      end
+
+      puts "id: #{result.id}"
+      puts "date: #{date}"
+      puts "from: #{from}"
+      puts "to: #{to}"
+      puts "subject: #{subject}"
+      puts "body: #{body}"
+    end
+
     desc 'send TEXT', 'Send a message with the gmail API'
     method_option :to, type: :string, required: true
     method_option :from, type: :string, required: true
@@ -46,5 +73,52 @@ module Samples
                               upload_source: StringIO.new(message.to_s),
                               content_type: 'message/rfc822')
     end
+
+    desc 'list', 'list messages with the gmail API'
+    method_option :limit, type: :numeric, default: 100
+    def list
+      gmail = Gmail::GmailService.new
+      gmail.authorization = user_credentials_for(Gmail::AUTH_SCOPE)
+
+      messages = []
+      next_page = nil
+      begin
+        result = gmail.list_user_messages('me', max_results: [options[:limit], 500].min, page_token: next_page)
+        messages += result.messages
+        break if messages.size >= options[:limit]
+        next_page = result.next_page_token
+      end while next_page
+
+      puts "Found #{messages.size} messages"
+    end
+
+    desc 'search QUERY', 'Search messages matching the specified query with the gmail API'
+    method_option :limit, type: :numeric, default: 100
+    def search(query)
+      gmail = Gmail::GmailService.new
+      gmail.authorization = user_credentials_for(Gmail::AUTH_SCOPE)
+
+      ids =
+        gmail.fetch_all(max: options[:limit], items: :messages) do |token|
+          gmail.list_user_messages('me', max_results: [options[:limit], 500].min, q: query, page_token: token)
+        end.map(&:id)
+
+      callback = lambda do |result, err|
+        if err
+          puts "error: #{err.inspect}"
+        else
+          headers = result.payload.headers
+          date = headers.any? { |h| h.name == 'Date' } ? headers.find { |h| h.name == 'Date' }.value : ''
+          subject = headers.any? { |h| h.name == 'Subject' } ? headers.find { |h| h.name == 'Subject' }.value : ''
+          puts "#{result.id}, #{date}, #{subject}"
+        end
+      end
+
+      ids.each_slice(1000) do |ids_array|
+        gmail.batch do |gm|
+          ids_array.each { |id| gm.get_user_message('me', id, &callback) }
+        end
+      end
+    end
   end
 end