google-api-client 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a59d2cdff30d2d331bea0998da8d5c0ddb1b467
-  data.tar.gz: 76c712189ee38c05d6c4a19b7cf8fab437ab5d55
+  metadata.gz: 1b144a44272f08c1d1afebee4a0605f0bdfbb979
+  data.tar.gz: 12569977c6f24d207d619d2c07f280d8c6e88fca
 SHA512:
-  metadata.gz: 572cdced03d8d48a4283e6928a562b2eaa364d1a706dec8cad766258016b927e55f782bd7afc124a95694b26d9260ba7a547f27d897a945eb023d9071f859b46
-  data.tar.gz: 314ec88326a0d47fd2136f096c9930208361addf4571cb32ef52b304f21c75c8af3cb69b1c58c3de9ded633c1a65194f82ce7703bae5ab7d00c9ce8bf442e932
+  metadata.gz: 555fb114b9964c23803499d70cd90a373d49ed9a68c8821cded8b701c1bc581c26961a313b9b1583519c284a713bf57f1eda59b4167e71f1fde9ca6850439201
+  data.tar.gz: 733c081171862ddfac514512d4b09ed407c8b7b8099167e4a7a1c114f5d941840f5bdd085d5d890a793e0e4687d5c4094bde4b2b2cfedcd168eb2c5b3db4cba9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.13.2
+* Light generator refactoring
+* Recover from non-Ranged responses without rewinding (#593)
+
 # 0.13.1
 * Regenerate APIs
 

data/bin/generate-api

@@ -26,9 +26,8 @@ module Google
     Discovery = Google::Apis::DiscoveryV1
 
     desc 'gen OUTDIR', 'Generate ruby API from an API description'
-    method_options url: :array, file: :array, from_discovery: :boolean, id: :array,
-                   preferred_only: :boolean, verbose: :boolean, names: :string,
-                   names_out: :string
+    method_options url: :array, file: :array, from_discovery: :boolean, preferred_only: :boolean,
+                   verbose: :boolean, names: :string, names_out: :string
     method_option :preferred_only, default: true
     def gen(dir)
       ensure_active_support
@@ -38,7 +37,7 @@ module Google
       Google::Apis.logger.level = Logger::DEBUG if options[:verbose]
       generate_from_url(options[:url]) if options[:url]
       generate_from_file(options[:file]) if options[:file]
-      generate_from_discovery(preferred_only: options[:preferred_only], id: options[:id] ) if options[:id] || options[:from_discovery]
+      generate_from_discovery(preferred_only: options[:preferred_only]) if options[:from_discovery]
       create_file(options[:names_out]) { |*| generator.dump_api_names } if options[:names_out]
     end
 
@@ -69,16 +68,22 @@ module Google
         end
       end
 
-      def generate_from_discovery(preferred_only: false, id: nil)
+      def generate_from_discovery(preferred_only: false)
         say 'Fetching API list'
-        id = Array(id)
         apis = discovery.list_apis
         apis.items.each do |api|
-          if (id.empty? && preferred_only && api.preferred?) || id.include?(api.id)
-            say sprintf('Loading %s, version %s from %s', api.name, api.version, api.discovery_rest_url)
-            generate_from_url(api.discovery_rest_url)
-          else
+          if (preferred_only && !api.preferred?)
             say sprintf('Ignoring disoverable API %s', api.id)
+          else
+	    # The Discovery service may returned cached versions of a Discovery document that are
+	    # not the most recent revision. That means that subsequent requests to the same
+	    # Discovery document URL can return different documents. The
+	    # `discovery-artifact-manager` repo always holds the most recent revision, so it's
+	    # easier to use that document than to force revision checking against the URL returned
+	    # by the Discovery index.
+            discovery_rest_url = "https://raw.githubusercontent.com/googleapis/discovery-artifact-manager/master/discoveries/#{api.name}.#{api.version}.json"
+            say sprintf('Loading %s, version %s from %s', api.name, api.version, discovery_rest_url)
+            generate_from_url(discovery_rest_url)
           end
         end
       end

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

@@ -67,12 +67,11 @@ module Google
         def execute_once(client, &block)
           request_header = header.dup
           apply_request_options(request_header)
+          download_offset = nil
 
-          check_if_rewind_needed = false
           if @offset > 0
             logger.debug { sprintf('Resuming download from offset %d', @offset) }
             request_header[RANGE_HEADER] = sprintf('bytes=%d-', @offset)
-            check_if_rewind_needed = true
           end
 
           http_res = client.get(url.to_s,
@@ -80,17 +79,24 @@ module Google
                      header: request_header,
                      follow_redirect: true) do |res, chunk|
             status = res.http_header.status_code.to_i
-            if OK_STATUS.include?(status)
-              if check_if_rewind_needed && status != 206
-                # Oh no! Requested a chunk, but received the entire content
-                # Attempt to rewind the stream
-                @download_io.rewind
-                check_if_rewind_needed = false
-              end
-              # logger.debug { sprintf('Writing chunk (%d bytes, %d total)', chunk.length, bytes_read) }
-              @download_io.write(chunk)
-              @offset += chunk.length
+            next unless OK_STATUS.include?(status)
+
+            download_offset ||= (status == 206 ? @offset : 0)
+            download_offset  += chunk.bytesize
+
+            if download_offset - chunk.bytesize == @offset
+              next_chunk = chunk
+            else
+              # Oh no! Requested a chunk, but received the entire content
+              chunk_index = @offset - (download_offset - chunk.bytesize)
+              next_chunk = chunk.byteslice(chunk_index..-1)
+              next if next_chunk.nil?
             end
+
+            # logger.debug { sprintf('Writing chunk (%d bytes, %d total)', chunk.length, bytes_read) }
+            @download_io.write(next_chunk)
+
+            @offset += next_chunk.bytesize
           end
 
           @download_io.flush

data/lib/google/apis/generator.rb

@@ -27,8 +27,9 @@ module Google
       Discovery = Google::Apis::DiscoveryV1
 
       # Load templates
-      def initialize(api_names: nil)
-        @names = Google::Apis::Generator::Names.new(api_names || File.join(Google::Apis::ROOT, 'api_names.yaml'))
+      def initialize(api_names: nil, api_names_out: nil)
+        @names = Google::Apis::Generator::Names.new(api_names_out || File.join(Google::Apis::ROOT, 'api_names_out.yaml'),
+                                                    api_names || File.join(Google::Apis::ROOT, 'api_names.yaml'))
         @module_template = Template.load('module.rb')
         @service_template = Template.load('service.rb')
         @classes_template = Template.load('classes.rb')

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

@@ -41,13 +41,17 @@ module Google
         include Google::Apis::Core::Logging
         include NameHelpers
 
-        def initialize(file_path = nil)
-          if file_path
-            logger.info { sprintf('Loading API names from %s', file_path) }
-            @names = YAML.load(File.read(file_path)) || {}
+        def initialize(names_out_file_path = nil, names_file_path = nil)
+          if names_out_file_path
+            logger.info { sprintf('Loading API names from %s', names_out_file_path) }
+            @names = YAML.load(File.read(names_out_file_path)) || {}
           else
             @names = {}
           end
+          if names_file_path
+            logger.info { sprintf('Loading API names from %s', names_file_path) }
+            @names = @names.merge(YAML.load(File.read(names_file_path)) || {})
+          end
           @path = []
         end
 
@@ -64,13 +68,6 @@ module Google
           pick_name(normalize_param_name(@path.last))
         end
 
-        # Determine the ruby method name to generate for a given method in discovery.
-        # @param [Google::Apis::DiscoveryV1::RestMethod] method
-        #  Fragment of the discovery doc describing the method
-        def infer_method_name(method)
-          pick_name(infer_method_name_for_rpc(method) || infer_method_name_from_id(method))
-        end
-
         def infer_property_name
           pick_name(normalize_property_name(@path.last))
         end
@@ -85,12 +82,16 @@ module Google
           preferred_name
         end
 
+        def [](key)
+          @names[key]
+        end
+
         def []=(key, value)
           @names[key] = value
         end
 
         def dump
-          YAML.dump(@names)
+          YAML.dump(Hash[@names.sort])
         end
 
         def key
@@ -101,12 +102,11 @@ module Google
           @names[sprintf('%s?%s', key, opt_name)]
         end
 
-        private
-
         # For RPC style methods, pick a name based off the request objects.
         # @param [Google::Apis::DiscoveryV1::RestMethod] method
+        # @param [Boolean] pick_name
         #  Fragment of the discovery doc describing the method
-        def infer_method_name_for_rpc(method)
+        def infer_method_name_for_rpc(method, pick_name = true)
           return nil if method.request.nil?
           parts = method.id.split('.')
           parts.shift
@@ -122,7 +122,11 @@ module Google
               name = name.split('_').insert(1, resource_name).join('_')
             end
           end
-          name
+          if pick_name
+            pick_name(name)
+          else
+            name
+          end
         end
 
         # For REST style methods, build a method name from the verb/resource(s) in the method
@@ -149,7 +153,7 @@ module Google
             end.join('_') + '_' + resource_name
           end
           method_name = verb.split('_').insert(1, resource_path.split('_')).join('_')
-          method_name
+          pick_name(method_name)
         end
       end
 
@@ -161,10 +165,6 @@ module Google
         include NameHelpers
         include Google::Apis::Core::Logging
 
-        # Don't expose these in the API directly.
-        PARAMETER_BLACKLIST = %w(alt access_token bearer_token oauth_token pp prettyPrint
-                                 $.xgafv callback upload_protocol uploadType)
-
         # Prepare the API for the templates.
         # @param [Google::Apis::DiscoveryV1::RestDescription] description
         #  API Description
@@ -184,9 +184,33 @@ module Google
           @deferred_types = []
           @strip_prefixes = []
           @all_methods = {}
+          @dup_method_names_for_rpc = collect_dup_method_names_for_rpc
           @path = []
         end
 
+        def collect_method_names_for_rpc(resource, method_names_for_rpc)
+          resource.api_methods.each do |_k, v|
+            # First look for the method name in the `@names` hash. If there's
+            # no override set, generate it without inserting the generated name
+            # into the `@names` hash.
+            method_name_for_rpc = @names[@names.key]
+            if method_name_for_rpc.nil?
+              method_name_for_rpc = @names.infer_method_name_for_rpc(v, false)
+            end
+            method_names_for_rpc << method_name_for_rpc if method_name_for_rpc
+          end unless resource.api_methods.nil?
+
+          resource.resources.each do |_k, v|
+            collect_method_names_for_rpc(v, method_names_for_rpc)
+          end unless resource.resources.nil?
+        end
+
+        def collect_dup_method_names_for_rpc
+          method_names_for_rpc = []
+          collect_method_names_for_rpc(@rest_description, method_names_for_rpc)
+          method_names_for_rpc.group_by{ |e| e }.select { |k, v| v.size > 1 }.map(&:first)
+        end
+
         def annotate_api
           @names.with_path(@rest_description.id) do
             @strip_prefixes << @rest_description.name
@@ -196,7 +220,6 @@ module Google
               end
             end
             @rest_description.force_alt_json = @names.option('force_alt_json')
-            @rest_description.parameters.reject! { |k, _v| PARAMETER_BLACKLIST.include?(k) }
             annotate_parameters(@rest_description.parameters)
             annotate_resource(@rest_description.name, @rest_description)
             @rest_description.schemas.each do |k, v|
@@ -245,7 +268,20 @@ module Google
         def annotate_method(method, parent_resource = nil)
           @names.with_path(method.id) do
             method.parent = parent_resource
-            method.generated_name = @names.infer_method_name(method)
+	    # Grab the method name generated from the request object without
+	    # inserting into, or querying, the names hash.
+            method_name_for_rpc = @names.infer_method_name_for_rpc(method, false)
+	    # If `method_name_for_rpc` is a duplicate (more than one method in
+	    # the API will generate this name), generate the method name from
+	    # the method ID instead.
+            if @dup_method_names_for_rpc.include?(method_name_for_rpc)
+              method.generated_name = @names.infer_method_name_from_id(method)
+            # Otherwise, proceed as normal.
+            elsif method_name_for_rpc
+              method.generated_name = @names.infer_method_name_for_rpc(method)
+            else
+              method.generated_name = @names.infer_method_name_from_id(method)
+            end
             check_duplicate_method(method)
             annotate_parameters(method.parameters)
           end

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

@@ -39,7 +39,7 @@ module Google
         attr_accessor :path
 
         def properties
-          @properties ||= {}
+          Hash[(@properties || {}).sort]
         end
 
         def qualified_name
@@ -68,6 +68,10 @@ module Google
         attr_accessor :generated_name
         attr_accessor :parent
 
+        def parameters
+          Hash[(@parameters || {}).sort]
+        end
+
         def path_parameters
           return [] if parameter_order.nil? || parameters.nil?
           parameter_order.map { |name| parameters[name] }.select { |param| param.location == 'path' }
@@ -92,6 +96,14 @@ module Google
       class RestResource
         attr_accessor :parent
 
+        def api_methods
+          Hash[(@api_methods || {}).sort]
+        end
+
+        def resources
+          Hash[(@resources || {}).sort]
+        end
+
         def all_methods
           m = []
           m << api_methods.values unless api_methods.nil?
@@ -104,6 +116,10 @@ module Google
         attr_accessor :force_alt_json
         alias_method :force_alt_json?, :force_alt_json
 
+        # Don't expose these in the API directly.
+        PARAMETER_BLACKLIST = %w(alt access_token bearer_token oauth_token pp prettyPrint
+                                 $.xgafv callback upload_protocol uploadType)
+
         def version
           ActiveSupport::Inflector.camelize(@version.gsub(/\W/, '-')).gsub(/-/, '_')
         end
@@ -125,6 +141,14 @@ module Google
           ActiveSupport::Inflector.camelize(sprintf('%sService', class_name))
         end
 
+        def api_methods
+          Hash[(@api_methods || {}).sort]
+        end
+
+        def resources
+          Hash[(@resources || {}).sort]
+        end
+
         def all_methods
           m = []
           m << api_methods.values unless api_methods.nil?
@@ -132,11 +156,23 @@ module Google
           m.flatten
         end
 
+        def parameters
+          Hash[(@parameters || {}).sort].reject! { |k, _v| PARAMETER_BLACKLIST.include?(k) }
+        end
+
+        def schemas
+          Hash[(@schemas || {}).sort]
+        end
+
         class Auth
           class Oauth2
             class Scope
               attr_accessor :constant
             end
+
+            def scopes
+              Hash[(@scopes || {}).sort]
+            end
           end
         end
       end

data/lib/google/apis/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-api-client
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Steven Bazyl
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable