google-api-client 0.9.pre1 → 0.9.pre2

data/generated/google/apis/replicapool_v1beta2/representations.rb

@@ -227,6 +227,7 @@ module Google
       class ReplicaPoolAutoHealingPolicy
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
+          property :action_type, as: 'actionType'
           property :health_check, as: 'healthCheck'
         end
       end

data/generated/google/apis/replicapool_v1beta2.rb

@@ -26,7 +26,7 @@ module Google
     # @see https://developers.google.com/compute/docs/instance-groups/manager/v1beta2
     module ReplicapoolV1beta2
       VERSION = 'V1beta2'
-      REVISION = '20150311'
+      REVISION = '20150708'
 
       # View and manage your data across Google Cloud Platform services
       AUTH_CLOUD_PLATFORM = 'https://www.googleapis.com/auth/cloud-platform'

data/generated/google/apis/resourceviews_v1beta2.rb

@@ -26,7 +26,7 @@ module Google
     # @see https://developers.google.com/compute/
     module ResourceviewsV1beta2
       VERSION = 'V1beta2'
-      REVISION = '20150326'
+      REVISION = '20150708'
 
       # View and manage your data across Google Cloud Platform services
       AUTH_CLOUD_PLATFORM = 'https://www.googleapis.com/auth/cloud-platform'

data/generated/google/apis/storage_v1/classes.rb

@@ -781,7 +781,8 @@ module Google
         attr_accessor :content_type
       
         # CRC32c checksum, as described in RFC 4960, Appendix B; encoded using base64 in
-        # big-endian byte order.
+        # big-endian byte order. For more information about using the CRC32c checksum,
+        # see Hashes and ETags: Best Practices.
         # Corresponds to the JSON property `crc32c`
         # @return [String]
         attr_accessor :crc32c
@@ -806,7 +807,8 @@ module Google
         # @return [String]
         attr_accessor :kind
       
-        # MD5 hash of the data; encoded using base64.
+        # MD5 hash of the data; encoded using base64. For more information about using
+        # the MD5 hash, see Hashes and ETags: Best Practices.
         # Corresponds to the JSON property `md5Hash`
         # @return [String]
         attr_accessor :md5_hash

data/generated/google/apis/storage_v1.rb

@@ -25,7 +25,7 @@ module Google
     # @see https://developers.google.com/storage/docs/json_api/
     module StorageV1
       VERSION = 'V1'
-      REVISION = '20150326'
+      REVISION = '20150710'
 
       # View and manage your data across Google Cloud Platform services
       AUTH_CLOUD_PLATFORM = 'https://www.googleapis.com/auth/cloud-platform'

data/generated/google/apis/youtube_analytics_v1.rb

@@ -36,7 +36,7 @@ module Google
       # View and manage your assets and associated content on YouTube
       AUTH_YOUTUBEPARTNER = 'https://www.googleapis.com/auth/youtubepartner'
 
-      # View YouTube Analytics monetary reports for your YouTube content
+      # View monetary and non-monetary YouTube Analytics reports for your YouTube content
       AUTH_YT_ANALYTICS_MONETARY_READONLY = 'https://www.googleapis.com/auth/yt-analytics-monetary.readonly'
 
       # View YouTube Analytics reports for your YouTube content

data/generated/google/apis/youtube_v3/classes.rb

@@ -4029,9 +4029,9 @@ module Google
         attr_accessor :configuration_issues
       
         # The last time this status was updated (in seconds)
-        # Corresponds to the JSON property `lastUpdateTimeS`
+        # Corresponds to the JSON property `lastUpdateTimeSeconds`
         # @return [String]
-        attr_accessor :last_update_time_s
+        attr_accessor :last_update_time_seconds
       
         # The status code of this stream
         # Corresponds to the JSON property `status`
@@ -4045,7 +4045,7 @@ module Google
         # Update properties of this object
         def update!(**args)
           @configuration_issues = args[:configuration_issues] unless args[:configuration_issues].nil?
-          @last_update_time_s = args[:last_update_time_s] unless args[:last_update_time_s].nil?
+          @last_update_time_seconds = args[:last_update_time_seconds] unless args[:last_update_time_seconds].nil?
           @status = args[:status] unless args[:status].nil?
         end
       end

data/generated/google/apis/youtube_v3/representations.rb

@@ -1671,7 +1671,7 @@ module Google
         class Representation < Google::Apis::Core::JsonRepresentation
           collection :configuration_issues, as: 'configurationIssues', class: Google::Apis::YoutubeV3::LiveStreamConfigurationIssue, decorator: Google::Apis::YoutubeV3::LiveStreamConfigurationIssue::Representation
       
-          property :last_update_time_s, as: 'lastUpdateTimeS'
+          property :last_update_time_seconds, as: 'lastUpdateTimeSeconds'
           property :status, as: 'status'
         end
       end

data/generated/google/apis/youtube_v3/service.rb

@@ -1663,6 +1663,84 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
+        # Binds a YouTube broadcast to a stream or removes an existing binding between a
+        # broadcast and a stream. A broadcast can only be bound to one video stream,
+        # though a video stream may be bound to more than one broadcast.
+        # @param [String] id
+        #   The id parameter specifies the unique ID of the broadcast that is being bound
+        #   to a video stream.
+        # @param [String] on_behalf_of_content_owner
+        #   Note: This parameter is intended exclusively for YouTube content partners.
+        #   The onBehalfOfContentOwner parameter indicates that the request's
+        #   authorization credentials identify a YouTube CMS user who is acting on behalf
+        #   of the content owner specified in the parameter value. This parameter is
+        #   intended for YouTube content partners that own and manage many different
+        #   YouTube channels. It allows content owners to authenticate once and get access
+        #   to all their video and channel data, without having to provide authentication
+        #   credentials for each individual channel. The CMS account that the user
+        #   authenticates with must be linked to the specified YouTube content owner.
+        # @param [String] on_behalf_of_content_owner_channel
+        #   This parameter can only be used in a properly authorized request. Note: This
+        #   parameter is intended exclusively for YouTube content partners.
+        #   The onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID
+        #   of the channel to which a video is being added. This parameter is required
+        #   when a request specifies a value for the onBehalfOfContentOwner parameter, and
+        #   it can only be used in conjunction with that parameter. In addition, the
+        #   request must be authorized using a CMS account that is linked to the content
+        #   owner that the onBehalfOfContentOwner parameter specifies. Finally, the
+        #   channel that the onBehalfOfContentOwnerChannel parameter value specifies must
+        #   be linked to the content owner that the onBehalfOfContentOwner parameter
+        #   specifies.
+        #   This parameter is intended for YouTube content partners that own and manage
+        #   many different YouTube channels. It allows content owners to authenticate once
+        #   and perform actions on behalf of the channel specified in the parameter value,
+        #   without having to provide authentication credentials for each separate channel.
+        # @param [String] part
+        #   The part parameter specifies a comma-separated list of one or more
+        #   liveBroadcast resource properties that the API response will include. The part
+        #   names that you can include in the parameter value are id, snippet,
+        #   contentDetails, and status.
+        # @param [String] stream_id
+        #   The streamId parameter specifies the unique ID of the video stream that is
+        #   being bound to a broadcast. If this parameter is omitted, the API will remove
+        #   any existing binding between the broadcast and a video stream.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::YoutubeV3::LiveBroadcast] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::YoutubeV3::LiveBroadcast]
+        #
+        # @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 bind_direct_live_broadcast(id: nil, on_behalf_of_content_owner: nil, on_behalf_of_content_owner_channel: nil, part: nil, stream_id: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          path = 'liveBroadcasts/bind/direct'
+          command =  make_simple_command(:post, path, options)
+          command.response_representation = Google::Apis::YoutubeV3::LiveBroadcast::Representation
+          command.response_class = Google::Apis::YoutubeV3::LiveBroadcast
+          command.query['id'] = id unless id.nil?
+          command.query['onBehalfOfContentOwner'] = on_behalf_of_content_owner unless on_behalf_of_content_owner.nil?
+          command.query['onBehalfOfContentOwnerChannel'] = on_behalf_of_content_owner_channel unless on_behalf_of_content_owner_channel.nil?
+          command.query['part'] = part unless part.nil?
+          command.query['streamId'] = stream_id unless stream_id.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
         # Controls the settings for a slate that can be displayed in the broadcast
         # stream.
         # @param [Boolean] display_slate

data/generated/google/apis/youtube_v3.rb

@@ -25,7 +25,7 @@ module Google
     # @see https://developers.google.com/youtube/v3
     module YoutubeV3
       VERSION = 'V3'
-      REVISION = '20150529'
+      REVISION = '20150706'
 
       # Manage your YouTube account
       AUTH_YOUTUBE = 'https://www.googleapis.com/auth/youtube'

data/google-api-client.gemspec

@@ -27,5 +27,4 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'googleauth', '~> 0.2'
   spec.add_runtime_dependency 'thor', '~> 0.19'
   spec.add_runtime_dependency 'memoist', '~> 0.11'
-  spec.add_runtime_dependency 'virtus', '~> 1.0'
 end

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

@@ -23,13 +23,15 @@ module Google
     #
     # @example
     #
-    #    client = Google::APIClient.new
     #    flow = Google::APIClient::InstalledAppFlow.new(
     #      :client_id => '691380668085.apps.googleusercontent.com',
     #      :client_secret => '...',
     #      :scope => 'https://www.googleapis.com/auth/drive'
     #    )
-    #    client.authorization = flow.authorize
+    #    authorization = flow.authorize
+    #    Drive = Google::Apis::DriveV2
+    #    drive = Drive::DriveService.new
+    #    drive.authorization = authorization
     #
     class InstalledAppFlow
 
@@ -83,7 +85,7 @@ module Google
       #
       # @return [Signet::OAuth2::Client]
       #  Authorization instance, nil if user cancelled.
-      def authorize(storage=nil)
+      def authorize(storage=nil, options=nil)
         auth = @authorization
 
         server = WEBrick::HTTPServer.new(
@@ -105,7 +107,7 @@ module Google
             server.stop
           end
 
-          Launchy.open(auth.authorization_uri.to_s)
+          Launchy.open(auth.authorization_uri(options).to_s)
           server.start
         ensure
           server.shutdown

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

@@ -0,0 +1,93 @@
+# Copyright 2010 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.
+
+module Google
+  class APIClient
+    ##
+    # Helper for loading keys from the PKCS12 files downloaded when
+    # setting up service accounts at the APIs Console.
+    #
+    module KeyUtils
+      ##
+      # Loads a key from PKCS12 file, assuming a single private key
+      # is present.
+      #
+      # @param [String] keyfile
+      #    Path of the PKCS12 file to load. If not a path to an actual file,
+      #    assumes the string is the content of the file itself.
+      # @param [String] passphrase
+      #   Passphrase for unlocking the private key
+      #
+      # @return [OpenSSL::PKey] The private key for signing assertions.
+      def self.load_from_pkcs12(keyfile, passphrase)
+        load_key(keyfile, passphrase) do |content, pass_phrase|
+          OpenSSL::PKCS12.new(content, pass_phrase).key
+        end
+      end
+
+
+      ##
+      # Loads a key from a PEM file.
+      #
+      # @param [String] keyfile
+      #    Path of the PEM file to load. If not a path to an actual file,
+      #    assumes the string is the content of the file itself.
+      # @param [String] passphrase
+      #   Passphrase for unlocking the private key
+      #
+      # @return [OpenSSL::PKey] The private key for signing assertions.
+      #
+      def self.load_from_pem(keyfile, passphrase)
+        load_key(keyfile, passphrase) do | content, pass_phrase|
+          OpenSSL::PKey::RSA.new(content, pass_phrase)
+        end
+      end
+
+      private
+
+      ##
+      # Helper for loading keys from file or memory. Accepts a block
+      # to handle the specific file format.
+      #
+      # @param [String] keyfile
+      #    Path of thefile to load. If not a path to an actual file,
+      #    assumes the string is the content of the file itself.
+      # @param [String] passphrase
+      #   Passphrase for unlocking the private key
+      #
+      # @yield [String, String]
+      #   Key file & passphrase to extract key from
+      # @yieldparam [String] keyfile
+      #   Contents of the file
+      # @yieldparam [String] passphrase
+      #   Passphrase to unlock key
+      # @yieldreturn [OpenSSL::PKey]
+      #   Private key
+      #
+      # @return [OpenSSL::PKey] The private key for signing assertions.
+      def self.load_key(keyfile, passphrase, &block)
+        begin
+          begin
+            content = File.open(keyfile, 'rb') { |io| io.read }
+          rescue
+            content = keyfile
+          end
+          block.call(content, passphrase)
+        rescue OpenSSL::OpenSSLError
+          raise ArgumentError.new("Invalid keyfile or passphrase")
+        end
+      end
+    end
+  end
+end

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

@@ -79,23 +79,30 @@ module Google
         #
         # @param [Fixnum] status
         #   HTTP status code of response
+        # @param [Hurley::Header] header
+        #   HTTP response headers
         # @param [String] body
         #   HTTP response body
+        # @param [String] message
+        #   Error message text
         # @return [void]
         # @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 check_status(status, body = nil)
+        def check_status(status, header = nil, body = nil, message = nil)
           case status
           when 400, 402...500
             error = parse_error(body)
             if error
-              logger.debug { error }
-              fail Google::Apis::RateLimitError, error if RATE_LIMIT_ERRORS.include?(error['reason'])
+              message = error['reason'] if error.has_key?('reason')
+              raise Google::Apis::RateLimitError.new(message,
+                                                     status_code: status, 
+                                                     header: header, 
+                                                     body: body) if RATE_LIMIT_ERRORS.include?(message)
             end
-            super(status, error)
+            super(status, header, body, message)
           else
-            super(status, body)
+            super(status, header, body, message)
           end
         end
 

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

@@ -159,7 +159,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 process_response(status, header, body)
-          check_status(status, body)
+          check_status(status, header, body)
           decode_response_body(header[:content_type], body)
         end
 
@@ -167,28 +167,38 @@ module Google
         #
         # @param [Fixnum] status
         #   HTTP status code of response
+        # @param 
+        # @param [Hurley::Header] header
+        #   HTTP response headers
         # @param [String] body
         #   HTTP response body
+        # @param [String] message
+        #   Error message text
         # @return [void]
         # @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 check_status(status, body = nil)
+        def check_status(status, header = nil, body = nil, message = nil)
           # TODO: 304 Not Modified depends on context...
           case status
           when 200...300
             nil
           when 301, 302, 303, 307
-            fail Google::Apis::RedirectError, header[:location]
+            message ||= sprintf('Redirect to %s', header[:location]) 
+            raise Google::Apis::RedirectError.new(message, status_code: status, header: header, body: body)
           when 401
-            fail Google::Apis::AuthorizationError, body
+            message ||= 'Unauthorized'
+            raise Google::Apis::AuthorizationError.new(message, status_code: status, header: header, body: body)
           when 304, 400, 402...500
-            fail Google::Apis::ClientError, body
+            message ||= 'Invalid request' 
+            raise Google::Apis::ClientError.new(message, status_code: status, header: header, body: body)
           when 500...600
-            fail Google::Apis::ServerError, body
+            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))
-            fail Google::Apis::TransmissionError, body
+            message ||= 'Unknown error'
+            raise Google::Apis::TransmissionError.new(message, status_code: status, header: header, body: body)
           end
         end
 

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

@@ -14,8 +14,8 @@
 
 require 'representable/json'
 require 'representable/json/hash'
-require 'representable/coercion'
 require 'base64'
+require 'date'
 
 module Google
   module Apis
@@ -72,6 +72,11 @@ module Google
               options[:render_filter] = ->(value, _doc, *_args) { Base64.urlsafe_encode64(value) }
               options[:parse_filter] = ->(fragment, _doc, *_args) { Base64.urlsafe_decode64(fragment) }
             end
+            if options[:type] == DateTime
+              options[:render_filter] = ->(value, _doc, *_args) { value.is_a?(DateTime) ? value.rfc3339(3) : value.to_s }
+              options[:parse_filter] = ->(fragment, _doc, *_args) { DateTime.parse(fragment) }
+            end
+            
             options[:render_nil] = true
             options[:getter] = getter_fn(name)
             options[:if] = if_fn(name)
@@ -114,7 +119,6 @@ module Google
       # @see https://github.com/apotonick/representable
       class JsonRepresentation < Representable::Decorator
         include Representable::JSON
-        include Representable::Coercion
         feature JsonRepresentationSupport
       end
     end