google-api-client 0.9.pre3 → 0.9.pre4

data/google-api-client.gemspec

@@ -15,16 +15,16 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib', 'generated']
+  spec.require_paths = ['lib', 'generated', 'third_party']
 
-  spec.add_runtime_dependency 'representable', '~> 2.1'
+  spec.add_runtime_dependency 'representable', '~> 2.3.0'
   spec.add_runtime_dependency 'multi_json', '~> 1.11'
   spec.add_runtime_dependency 'retriable', '~> 2.0'
   spec.add_runtime_dependency 'activesupport', '>= 3.2'
   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.2'
+  spec.add_runtime_dependency 'googleauth', '~> 0.5'
   spec.add_runtime_dependency 'thor', '~> 0.19'
   spec.add_runtime_dependency 'memoist', '~> 0.11'
 end

data/lib/google/api_client/auth/installed_app.rb

@@ -33,6 +33,7 @@ module Google
     #    drive = Drive::DriveService.new
     #    drive.authorization = authorization
     #
+    # @deprecated Use google-auth-library-ruby instead
     class InstalledAppFlow
 
       RESPONSE_BODY = <<-HTML
@@ -85,7 +86,7 @@ module Google
       #
       # @return [Signet::OAuth2::Client]
       #  Authorization instance, nil if user cancelled.
-      def authorize(storage=nil, options=nil)
+      def authorize(storage=nil, options={})
         auth = @authorization
 
         server = WEBrick::HTTPServer.new(
@@ -125,4 +126,3 @@ module Google
 
   end
 end
-

data/lib/google/api_client/auth/key_utils.rb

@@ -18,6 +18,7 @@ module Google
     # Helper for loading keys from the PKCS12 files downloaded when
     # setting up service accounts at the APIs Console.
     #
+    # @deprecated Use google-auth-library-ruby instead
     module KeyUtils
       ##
       # Loads a key from PKCS12 file, assuming a single private key

data/lib/google/api_client/auth/storage.rb

@@ -21,6 +21,7 @@ module Google
     # JSON serialized file. Meant to resemble the serialized format
     # http://google-api-python-client.googlecode.com/hg/docs/epy/oauth2client.file.Storage-class.html
     #
+    # @deprecated Use google-auth-library-ruby instead
     class Storage
 
       AUTHORIZATION_URI = 'https://accounts.google.com/o/oauth2/auth'

data/lib/google/api_client/auth/storages/file_store.rb

@@ -21,6 +21,7 @@ module Google
     # JSON serialized file. Meant to resemble the serialized format
     # http://google-api-python-client.googlecode.com/hg/docs/epy/oauth2client.file.Storage-class.html
     #
+    # @deprecated Use google-auth-library-ruby instead
     class FileStore
 
       attr_accessor :path

data/lib/google/api_client/auth/storages/redis_store.rb

@@ -16,6 +16,7 @@ require 'json'
 
 module Google
   class APIClient
+    # @deprecated Use google-auth-library-ruby instead
     class RedisStore
 
       DEFAULT_REDIS_CREDENTIALS_KEY = "google_api_credentials"

data/lib/google/api_client/client_secrets.rb

@@ -23,7 +23,7 @@ module Google
     # inspired by the Google API Python client.
     #
     # @see https://developers.google.com/api-client-library/python/guide/aaa_client_secrets
-    #
+    # @deprecated Use google-auth-library-ruby instead
     # @example
     #   {
     #     "web": {
@@ -46,7 +46,6 @@ module Google
     #     }
     #   }
     class ClientSecrets
-      
       ##
       # Reads client configuration from a file
       #
@@ -77,7 +76,7 @@ module Google
       end
 
       ##
-      # Intialize OAuth client settings.
+      # Initialize OAuth client settings.
       #
       # @param [Hash] options
       #   Parsed client secrets files
@@ -122,7 +121,7 @@ module Google
       def to_json
         return MultiJson.dump(to_hash)
       end
-      
+
       def to_hash
         {
           self.flow => ({
@@ -147,7 +146,7 @@ module Google
           end
         }
       end
-      
+
       def to_authorization
         gem 'signet', '>= 0.4.0'
         require 'signet/oauth_2/client'

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

@@ -96,8 +96,8 @@ module Google
             if error
               message = error['reason'] if error.has_key?('reason')
               raise Google::Apis::RateLimitError.new(message,
-                                                     status_code: status, 
-                                                     header: header, 
+                                                     status_code: status,
+                                                     header: header,
                                                      body: body) if RATE_LIMIT_ERRORS.include?(message)
             end
             super(status, header, body, message)

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

@@ -292,6 +292,7 @@ module Google
         def new_client
           client = Hurley::Client.new
           client.request_options.timeout = request_options.timeout_sec
+          client.request_options.open_timeout = request_options.open_timeout_sec
           client.request_options.proxy = client_options.proxy_url
           client.request_options.query_class = Hurley::Query::Flat
           client.ssl_options.ca_file = File.join(Google::Apis::ROOT, 'lib', 'cacerts.pem')

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

@@ -31,7 +31,7 @@ require 'google/apis/core/http_command'
 require 'google/apis/core/upload'
 require 'google/apis/core/download'
 require 'addressable/uri'
-
+require 'securerandom'
 module Google
   module Apis
     module Core
@@ -47,6 +47,7 @@ module Google
         def initialize(method, url)
           super(method, url)
           @calls = []
+          @base_id = SecureRandom.uuid
         end
 
         ##
@@ -78,9 +79,12 @@ module Google
             parts = split_parts(body, m[1])
             deserializer = CallDeserializer.new
             parts.each_index do |index|
-              call, callback = @calls[index]
+              response = deserializer.to_http_response(parts[index])
+              outer_header = response.shift
+              call_id = header_to_id(outer_header[:content_id]) || index
+              call, callback = @calls[call_id]
               begin
-                result = call.process_response(*deserializer.to_http_response(parts[index])) unless call.nil?
+                result = call.process_response(*response) unless call.nil?
                 success(result, &callback)
               rescue => e
                 error(e, &callback)
@@ -103,9 +107,11 @@ module Google
 
           serializer = CallSerializer.new
           multipart = Multipart.new(boundary: BATCH_BOUNDARY, content_type: MULTIPART_MIXED)
-          @calls.each do |(call, _)|
+          @calls.each_index do |index|
+            call, _ = @calls[index]
+            content_id = id_to_header(index)
             io = serializer.to_upload_io(call)
-            multipart.add_upload(io)
+            multipart.add_upload(io, content_id: content_id)
           end
           self.body = multipart.assemble
 
@@ -120,6 +126,17 @@ module Google
           end
           fail Google::Apis::ClientError, 'Invalid command object' unless command.is_a?(HttpCommand)
         end
+
+        def id_to_header(call_id)
+          return sprintf('<%s+%i>', @base_id, call_id)
+        end
+
+        def header_to_id(content_id)
+          match = /<response-.*\+(\d+)>/.match(content_id)
+          return match[1].to_i if match
+          return nil
+        end
+
       end
 
       # Wrapper request for batching multiple uploads in a single server request
@@ -180,19 +197,19 @@ module Google
       # Deconstructs a raw HTTP response part
       # @private
       class CallDeserializer
-        # Convert a single batched response into a BatchedCallResponse object.
+        # Parse a batched response.
         #
         # @param [String] call_response
         #   the response to parse.
         # @return [Array<(Fixnum, Hurley::Header, String)>]
         #   Status, header, and response body.
         def to_http_response(call_response)
-          _, outer_body = split_header_and_body(call_response)
+          outer_header, outer_body = split_header_and_body(call_response)
           status_line, payload = outer_body.split(/\n/, 2)
           _, status = status_line.split(' ', 3)
 
           header, body = split_header_and_body(payload)
-          [status.to_i, header, body]
+          [outer_header, status.to_i, header, body]
         end
 
         protected

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

@@ -71,7 +71,7 @@ module Google
               logger.debug { sprintf('Resuming download from offset %d', @offset) }
               req.header[RANGE_HEADER] = sprintf('bytes=%d-', @offset)
             end
-            req.on_body do |res, chunk|
+            req.on_body(200, 201) do |res, chunk|
               check_status(res.status_code, chunk) unless res.status_code.nil?
               logger.debug { sprintf('Writing chunk (%d bytes)', chunk.length) }
               @offset += chunk.length

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

@@ -19,6 +19,7 @@ require 'google/apis/errors'
 require 'retriable'
 require 'hurley'
 require 'hurley/addressable'
+require 'hurley_patches'
 require 'google/apis/core/logging'
 require 'pp'
 
@@ -91,7 +92,6 @@ module Google
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def execute(client)
           prepare!
-          proc = block_given? ? Proc.new : nil
           begin
             Retriable.retriable tries: options.retries + 1,
                                 base_interval: 1,
@@ -104,11 +104,19 @@ module Google
               Retriable.retriable tries: auth_tries,
                                   on: [Google::Apis::AuthorizationError],
                                   on_retry: proc { |*| refresh_authorization } do
-                return execute_once(client, &proc)
+                execute_once(client).tap do |result|
+                  if block_given?
+                    yield result, nil
+                  end
+                end
               end
             end
           rescue => e
-            raise e if proc.nil?
+            if block_given?
+              yield nil, e
+            else
+              raise e
+            end
           end
         ensure
           release!
@@ -136,7 +144,7 @@ module Google
         def prepare!
           header.update(options.header) if options && options.header
           self.url = url.expand(params) if url.is_a?(Addressable::Template)
-          url.query_values = query
+          url.query_values = query.merge(url.query_values || {})
         end
 
         # Release any resources used by this command
@@ -167,7 +175,7 @@ module Google
         #
         # @param [Fixnum] status
         #   HTTP status code of response
-        # @param 
+        # @param
         # @param [Hurley::Header] header
         #   HTTP response headers
         # @param [String] body
@@ -184,16 +192,16 @@ module Google
           when 200...300
             nil
           when 301, 302, 303, 307
-            message ||= sprintf('Redirect to %s', header[:location]) 
+            message ||= sprintf('Redirect to %s', header[:location])
             raise Google::Apis::RedirectError.new(message, status_code: status, header: header, body: body)
           when 401
             message ||= 'Unauthorized'
             raise Google::Apis::AuthorizationError.new(message, status_code: status, header: header, body: body)
           when 304, 400, 402...500
-            message ||= 'Invalid request' 
+            message ||= 'Invalid request'
             raise Google::Apis::ClientError.new(message, status_code: status, header: header, body: body)
           when 500...600
-            message ||= 'Server error' 
+            message ||= 'Server error'
             raise Google::Apis::ServerError.new(message, status_code: status, header: header, body: body)
           else
             logger.warn(sprintf('Encountered unexpected status code %s', status))
@@ -244,25 +252,29 @@ module Google
         # @private
         # @param [Hurley::Client] client
         #   HTTP client
-        # @yield [result, err] Result or error if block supplied
         # @return [Object]
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @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)
+        def execute_once(client)
           body.rewind if body.respond_to?(:rewind)
           begin
             logger.debug { sprintf('Sending HTTP %s %s', method, url) }
             response = client.send(method, url, body) do |req|
+              # Temporary workaround for Hurley bug where the connection preference
+              # is ignored and it uses nested anyway
+              req.url.query_class = Hurley::Query::Flat
+              query.each { | k, v| req.url.query[k] = v }
+              # End workaround
               apply_request_options(req)
             end
             logger.debug { response.status_code }
             logger.debug { response.inspect }
             response = process_response(response.status_code, response.header, response.body)
-            success(response, &block)
+            success(response)
           rescue => e
             logger.debug { sprintf('Caught error %s', e) }
-            error(e, rethrow: true, &block)
+            error(e, rethrow: true)
           end
         end
 

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

@@ -31,7 +31,7 @@ module Google
         #   Multipart boundary
         # @param [String] value
         #   JSON content
-        def initialize(boundary, value)
+        def initialize(boundary, value, header = {})
           @part = build_part(boundary, value)
           @length = @part.bytesize
           @io = StringIO.new(@part)
@@ -95,19 +95,25 @@ module Google
         # @param [Hash] header
         #  Headers for the part
         def build_head(boundary, type, content_len, header)
+          content_id = ''
+          if header[:content_id]
+            content_id = sprintf(CID_FORMAT, header[:content_id])
+          end
           sprintf(HEAD_FORMAT,
                   boundary,
                   content_len.to_i,
+                  content_id,
                   header[:content_type] || type,
                   header[:content_transfer_encoding] || DEFAULT_TR_ENCODING)
         end
 
         DEFAULT_TR_ENCODING = 'binary'.freeze
         FOOT = "\r\n".freeze
+        CID_FORMAT = "Content-ID: %s\r\n"
         HEAD_FORMAT = <<-END
 --%s\r
 Content-Length: %d\r
-Content-Type: %s\r
+%sContent-Type: %s\r
 Content-Transfer-Encoding: %s\r
 \r
         END
@@ -137,9 +143,12 @@ Content-Transfer-Encoding: %s\r
         #
         # @param [String] body
         #   JSON text
+        # @param [String] content_id
+        #   Optional unique ID of this part
         # @return [self]
-        def add_json(body)
-          @parts << Google::Apis::Core::JsonPart.new(@boundary, body)
+        def add_json(body, content_id: nil)
+          header = { :content_id => content_id }
+          @parts << Google::Apis::Core::JsonPart.new(@boundary, body, header)
           self
         end
 
@@ -147,9 +156,14 @@ Content-Transfer-Encoding: %s\r
         #
         # @param [Google::Apis::Core::UploadIO] upload_io
         #   IO stream
+        # @param [String] content_id
+        #   Optional unique ID of this part
         # @return [self]
-        def add_upload(upload_io)
-          @parts << Google::Apis::Core::FilePart.new(@boundary, upload_io)
+        def add_upload(upload_io, content_id: nil)
+          header = { :content_id => content_id }
+          @parts << Google::Apis::Core::FilePart.new(@boundary,
+                                                     upload_io,
+                                                     header)
           self
         end
 

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

@@ -178,7 +178,6 @@ module Google
         def process_response(status, header, body)
           @offset = Integer(header[BYTES_RECEIVED_HEADER]) if header.key?(BYTES_RECEIVED_HEADER)
           @upload_url = header[UPLOAD_URL_HEADER] if header.key?(UPLOAD_URL_HEADER)
-
           upload_status = header[UPLOAD_STATUS_HEADER]
           logger.debug { sprintf('Upload status %s', upload_status) }
           if upload_status == STATUS_ACTIVE
@@ -254,12 +253,16 @@ 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)
-          if @state == :start
+          case @state
+          when :start
             response = send_start_command(client)
-          else
+            result = process_response(response.status_code, response.header, response.body)
+          when :active
             response = send_query_command(client)
+            result = process_response(response.status_code, response.header, response.body)
+          when :cancelled, :final
+            error(@last_error, rethrow: true, &block)
           end
-          result = process_response(response.status_code, response.header, response.body)
           if @state == :active
             response = send_upload_command(client)
             result = process_response(response.status_code, response.header, response.body)
@@ -267,6 +270,10 @@ module Google
 
           success(result, &block) if @state == :final
         rescue => e
+          # Some APIs like Youtube generate non-retriable 401 errors and mark
+          # the upload as finalized. Save the error just in case we get
+          # retried.
+          @last_error = e
           error(e, rethrow: true, &block)
         end
       end