google-api-client 0.10.3 → 0.11.0

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

@@ -51,6 +51,8 @@ module Google
           when 'string', 'boolean', 'number', 'integer', 'any'
             return 'DateTime' if format == 'date-time'
             return 'Date' if format == 'date'
+            return 'Fixnum' if format == 'int64'
+            return 'Fixnum' if format == 'uint64'
             return TYPE_MAP[type]
           when 'array'
             return sprintf('Array<%s>', items.generated_type)

data/lib/google/apis/generator/templates/_representation.tmpl

@@ -33,7 +33,7 @@ class <%= cls.generated_class_name %>
 <%       elsif property.type == 'array' -%>
     collection :<%= property.generated_name %>, as: '<%= property.name %>'<%= include('representation_type', :lead => ', ', :type => property.items, :api => api) %>
 <%       else -%>
-    property :<%= property.generated_name %>,<% if property.format == 'byte' %> :base64 => true,<%end%> as: '<%= property.name %>'<%= include('representation_type', :lead => ', ', :type => property, :api => api) %>
+    property :<%= property.generated_name %>,<% if ['uint64', 'int64'].include?(property.format) %> :numeric_string => true,<%end%><% if property.format == 'byte' %> :base64 => true,<%end%> as: '<%= property.name %>'<%= include('representation_type', :lead => ', ', :type => property, :api => api) %>
 <%       end -%>
 <%     end -%>
 <%   end -%>

data/lib/google/apis/generator/templates/service.rb.tmpl

@@ -42,6 +42,7 @@ module Google
 <% end -%>
         def initialize
           super('<%= api.root_url %>', '<%= api.service_path %>')
+          @batch_path = '<%= api.batch_path %>'
         end
 <% for api_method in api.all_methods -%>
 <%= indent(include('method', :api_method => api_method, :api => api), 8) -%>

data/lib/google/apis/options.rb

@@ -15,18 +15,22 @@
 module Google
   module Apis
     # General options for API requests
-    ClientOptions =  Struct.new(
+    ClientOptions = Struct.new(
       :application_name,
       :application_version,
       :proxy_url,
-      :use_net_http)
+      :open_timeout_sec,
+      :read_timeout_sec,
+      :send_timeout_sec,
+      :log_http_requests)
 
     RequestOptions = Struct.new(
       :authorization,
       :retries,
       :header,
-      :timeout_sec,
-      :open_timeout_sec)
+      :normalize_unicode,
+      :skip_serialization,
+      :skip_deserialization)
 
     # General client options
     class ClientOptions
@@ -36,7 +40,12 @@ module Google
       #   @return [String] Version of the application, for identification in the User-Agent header
       # @!attribute [rw] proxy_url
       #   @return [String] URL of a proxy server
-
+      # @!attribute [rw] log_http_requests
+      #   @return [Boolean] True if raw HTTP requests should be logged
+      # @!attribute [rw] open_timeout_sec
+      #   @return [Fixnum] How long, in seconds, before failed connections time out
+      # @!attribute [rw] read_timeout_sec
+      #   @return [Fixnum] How long, in seconds, before requests time out
       # Get the default options
       # @return [Google::Apis::ClientOptions]
       def self.default
@@ -50,12 +59,14 @@ module Google
       #   @return [Signet::OAuth2::Client, #apply(Hash)] OAuth2 credentials
       # @!attribute [rw] retries
       #   @return [Fixnum] Number of times to retry requests on server error
-      # @!attribute [rw] timeout_sec
-      #   @return [Fixnum] How long, in seconds, before requests time out
-      # @!attribute [rw] open_timeout_sec
-      #   @return [Fixnum] How long, in seconds, before failed connections time out
       # @!attribute [rw] header
       #   @return [Hash<String,String] Additional HTTP headers to include in requests
+      # @!attribute [rw] normalize_unicode
+      #   @return [Boolean] True if unicode strings should be normalized in path parameters
+      # @!attribute [rw] skip_serialization
+      #   @return [Boolean] True if body object should be treated as raw text instead of an object.
+      # @!attribute [rw] skip_deserialization
+      #   @return [Boolean] True if response should be returned in raw form instead of deserialized.
 
       # Get the default options
       # @return [Google::Apis::RequestOptions]
@@ -75,11 +86,12 @@ module Google
       end
     end
     
-    ClientOptions.default.use_net_http = false
+    ClientOptions.default.log_http_requests = false
     ClientOptions.default.application_name = 'unknown'
     ClientOptions.default.application_version = '0.0.0'
-
     RequestOptions.default.retries = 0
-    RequestOptions.default.open_timeout_sec = 20
+    RequestOptions.default.normalize_unicode = false
+    RequestOptions.default.skip_serialization = false
+    RequestOptions.default.skip_deserialization = false
   end
 end

data/lib/google/apis/version.rb

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

data/samples/web/Gemfile

@@ -2,6 +2,5 @@ source 'https://rubygems.org'
 
 gem 'google-api-client', '~> 0.9'
 gem 'google-id-token', '~> 1.3'
-gem 'sinatra', '~> 1.4'
 gem 'redis', '~> 3.2'
 gem 'dotenv'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-api-client
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.0
 platform: ruby
 authors:
 - Steven Bazyl
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
@@ -51,44 +51,30 @@ dependencies:
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: hurley
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: googleauth
   requirement: !ruby/object:Gem::Requirement
@@ -107,44 +93,56 @@ dependencies:
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 2.8.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: memoist
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
-  type: :runtime
+        version: '0.19'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 description: 
 email:
 - sbazyl@google.com
@@ -168,6 +166,7 @@ files:
 - Rakefile
 - api_names.yaml
 - bin/generate-api
+- dl.rb
 - generated/google/apis/acceleratedmobilepageurl_v1.rb
 - generated/google/apis/acceleratedmobilepageurl_v1/classes.rb
 - generated/google/apis/acceleratedmobilepageurl_v1/representations.rb
@@ -240,6 +239,10 @@ files:
 - generated/google/apis/appsactivity_v1/classes.rb
 - generated/google/apis/appsactivity_v1/representations.rb
 - generated/google/apis/appsactivity_v1/service.rb
+- generated/google/apis/appsmarket_v2.rb
+- generated/google/apis/appsmarket_v2/classes.rb
+- generated/google/apis/appsmarket_v2/representations.rb
+- generated/google/apis/appsmarket_v2/service.rb
 - generated/google/apis/appstate_v1.rb
 - generated/google/apis/appstate_v1/classes.rb
 - generated/google/apis/appstate_v1/representations.rb
@@ -740,9 +743,9 @@ files:
 - lib/google/apis/core/api_command.rb
 - lib/google/apis/core/base_service.rb
 - lib/google/apis/core/batch.rb
+- lib/google/apis/core/composite_io.rb
 - lib/google/apis/core/download.rb
 - lib/google/apis/core/hashable.rb
-- lib/google/apis/core/http_client_adapter.rb
 - lib/google/apis/core/http_command.rb
 - lib/google/apis/core/json_representation.rb
 - lib/google/apis/core/logging.rb
@@ -794,7 +797,6 @@ files:
 - samples/web/views/drive.erb
 - samples/web/views/home.erb
 - samples/web/views/layout.erb
-- third_party/hurley_patches.rb
 homepage: https://github.com/google/google-api-ruby-client
 licenses:
 - Apache 2.0

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

@@ -1,82 +0,0 @@
-require 'httpclient'
-require 'hurley'
-require 'hurley/client'
-
-module Google
-  module Apis
-    module Core
-      # HTTPClient adapter for Hurley.
-      class HttpClientAdapter
-
-        def call(request)
-          client = ::HTTPClient.new
-          configure_client(client, request)
-
-          begin
-            ::Hurley::Response.new(request) do |res|
-              http_res = client.request(request.verb.to_s.upcase, request.url.to_s, nil, request.body_io, request.header.to_hash, false) do |http_res, chunk|
-                copy_response(http_res, res)
-                res.receive_body(chunk)
-              end
-              copy_response(http_res, res)
-            end
-          rescue ::HTTPClient::TimeoutError, Errno::ETIMEDOUT
-            raise ::Hurley::Timeout, $!
-          rescue ::HTTPClient::BadResponseError => err
-            if err.message.include?('status 407')
-              raise ::Hurley::ConnectionFailed, %{407 "Proxy Authentication Required "}
-            else
-              raise Hurley::ClientError, $!
-            end
-          rescue Errno::ECONNREFUSED, EOFError
-            raise ::Hurley::ConnectionFailed, $!
-          rescue => err
-            if defined?(OpenSSL) && OpenSSL::SSL::SSLError === err
-              raise Hurley::SSLError, err
-            else
-              raise
-            end
-          end
-        end
-
-        def copy_response(http_res, res)
-          unless res.status_code
-            res.status_code = http_res.status.to_i
-            http_res.header.all.each do |(k,v)|
-              res.header[k] = v
-            end
-          end
-        end
-
-        def configure_client(client, request)
-          client.transparent_gzip_decompression = true
-          if request.options.proxy
-            proxy = request.options.proxy
-            client.proxy = sprintf('%s:%d', proxy.host, proxy.port)
-            if proxy.user && proxy.password
-              client.set_proxy_auth proxy.user, proxy.password
-            end
-          end
-          if request.options.timeout
-            client.connect_timeout = request.options.timeout
-            client.receive_timeout = request.options.timeout
-            client.send_timeout = request.options.timeout
-          end
-          if request.options.open_timeout
-            client.connect_timeout = request.options.open_timeout
-            client.send_timeout = request.options.open_timeout
-          end
-          ssl_config = client.ssl_config
-          ssl_opts = request.ssl_options
-          ssl_config.verify_mode = ssl_opts.openssl_verify_mode
-          ssl_config.cert_store = ssl_opts.openssl_cert_store
-          ssl_config.add_trust_ca ssl_opts.ca_file if ssl_opts.ca_file
-          ssl_config.add_trust_ca ssl_opts.ca_path if ssl_opts.ca_path
-          ssl_config.client_cert = ssl_opts.openssl_client_cert if ssl_opts.openssl_client_cert
-          ssl_config.client_key = ssl_opts.openssl_client_key if ssl_opts.openssl_client_key
-          ssl_config.verify_depth = ssl_opts.verify_depth if ssl_opts.verify_depth
-        end
-      end
-    end
-  end
-end

data/third_party/hurley_patches.rb

@@ -1,103 +0,0 @@
-#
-# Copyright (c) 2015 Rick Olson
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-require 'hurley'
-require 'hurley/client'
-require 'hurley/connection'
-require 'net/https'
-
-# Temporary monkey patch for streaming downloads. These are fixed in HEAD,
-# but pending a 0.3 release.
-if Hurley::VERSION == '0.2'
-  module Hurley
-    class Response
-      def location
-        @location ||= begin
-          return unless loc = @header[:location]
-          verb = STATUS_FORCE_GET.include?(status_code) ? :get : request.verb
-          statuses, receiver = request.send(:body_receiver)
-          new_request = Request.new(verb, request.url.join(Url.parse(loc)), request.header, request.body, request.options, request.ssl_options)
-          new_request.on_body(*statuses, &receiver) unless receiver.is_a?(Hurley::BodyReceiver)
-          new_request
-        end
-      end
-    end
-
-    class Connection
-      def call(request)
-        net_http_connection(request) do |http|
-          begin
-            Response.new(request) do |res|
-              perform_request(http, request, res)
-
-              # net/http only raises exception on 407 with ssl...?
-              if res.status_code == 407
-                raise ConnectionFailed, %(407 "Proxy Authentication Required")
-              end
-            end
-          rescue *NET_HTTP_EXCEPTIONS => err
-            if defined?(OpenSSL) && OpenSSL::SSL::SSLError === err
-              raise SSLError, err
-            else
-              raise ConnectionFailed, err
-            end
-          end
-        end
-
-      rescue ::Timeout::Error => err
-        raise Timeout, err
-      end
-
-      private
-
-      def net_http_request(request)
-        http_req = Net::HTTPGenericRequest.new(
-          request.verb.to_s.upcase, # request method
-          !!request.body,           # is there a request body
-          :head != request.verb,    # is there a response body
-          request.url.request_uri,  # request uri path
-          request.header,           # request headers
-        )
-
-        if body = request.body_io
-          http_req.body_stream = body
-        end
-
-        http_req
-      end
-
-      def perform_request(http, request, res)
-        http.request(net_http_request(request)) do |http_res|
-          res.status_code = http_res.code.to_i
-          http_res.each_header do |key, value|
-            res.header[key] = value
-          end
-
-          if :get == request.verb
-            http_res.read_body { |chunk| res.receive_body(chunk) }
-          else
-            res.receive_body(http_res.body)
-          end
-        end
-      end
-    end
-  end
-end