gapic-generator 0.6.15 → 0.7.5

data/templates/default/gem/gemspec.erb

@@ -21,13 +21,13 @@ Gem::Specification.new do |gem|
                       <%= gem.extra_files.inspect %>
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 2.4"
+  gem.required_ruby_version = ">= 2.5"
 
   <%- gem.dependency_list.each do |name, requirements| -%>
   gem.add_dependency <%= name.inspect %>, <%= requirements.map { |v| v.inspect }.join ", " %>
   <%- end -%>
 
-  gem.add_development_dependency "google-style", "~> 1.24.0"
+  gem.add_development_dependency "google-style", "~> 1.25.1"
   gem.add_development_dependency "minitest", "~> 5.14"
   gem.add_development_dependency "minitest-focus", "~> 1.1"
   gem.add_development_dependency "minitest-rg", "~> 5.2"

data/templates/default/gem/readme.erb

@@ -28,11 +28,11 @@ response = client.<%= method.name %> request
 
 ## Supported Ruby Versions
 
-This library is supported on Ruby 2.4+.
+This library is supported on Ruby 2.5+.
 
 Google provides official support for Ruby versions that are actively supported
 by Ruby Core—that is, Ruby versions that are either in normal maintenance or
-in security maintenance, and not end of life. Currently, this means Ruby 2.4
+in security maintenance, and not end of life. Currently, this means Ruby 2.5
 and later. Older versions of Ruby _may_ still work, but are unsupported and not
 recommended. See https://www.ruby-lang.org/en/downloads/branches/ for details
 about the Ruby support schedule.

data/templates/default/gem/rubocop.erb

@@ -8,14 +8,14 @@ AllCops:
     - "proto_docs/**/*"
     - "test/**/*"
 
+Layout/LineLength:
+  Enabled: false
 Metrics/AbcSize:
   Enabled: false
 Metrics/ClassLength:
   Enabled: false
 Metrics/CyclomaticComplexity:
   Enabled: false
-Metrics/LineLength:
-  Enabled: false
 Metrics/MethodLength:
   Enabled: false
 Metrics/ModuleLength:
@@ -25,13 +25,3 @@ Metrics/PerceivedComplexity:
 Naming/FileName:
   Exclude:
     - "lib/<%= gem.name %>.rb"
-Naming/PredicateName:
-  Enabled: false
-Style/AsciiComments:
-  Enabled: false
-Style/CaseEquality:
-  Enabled: false
-Style/IfUnlessModifier:
-  Enabled: false
-Style/ModuleFunction:
-  Enabled: false

data/templates/default/lib/_package.erb

@@ -6,13 +6,23 @@ require "<%= service.service_require %>"
 require "<%= package.gem.version_require %>"
 <% end %>
 <%- unless package.empty? -%>
+<%- if package.services.first.generate_grpc_clients? -%>
 ##
-# To load this package, including all its services, and instantiate a client:
+# To load this package, including all its services, and instantiate a <%= package.grpc_client_designation %>:
 #
 #     require "<%= package.package_require %>"
 #     client = <%= package.services.first.create_client_call %>
 #
 <%- end -%>
+<%- if package.services.first.generate_rest_clients? -%>
+##
+# To load this package, including all its services, and instantiate a REST client:
+#
+#     require "<%= package.package_require %>"
+#     client = <%= package.services.first.rest.create_client_call %>
+#
+<%- end -%>
+<%- end -%>
 module <%= package.module_name %>
 end
 <% @footer = capture do %>

data/templates/default/lib/_service.erb

@@ -1,4 +1,21 @@
 <%- assert_locals service -%>
+
+<%- if service.generate_rest_clients? -%>
+<% @requires = capture do %>
+require "gapic/config"
+require "gapic/config/method"
+
+require "<%= service.gem.version_require %>"
+
+<%- unless service.generic_endpoint? -%>
+require "<%= service.credentials_require %>"
+<%- end -%>
+<%- if service.paths? -%>
+require "<%= service.paths_require %>"
+<%- end -%>
+require "<%= service.rest.service_rest_require %>"
+<% end %>
+<%- else -%>
 <% @requires = capture do %>
 require "gapic/common"
 require "gapic/config"
@@ -22,13 +39,26 @@ require "<%= service.client_require %>"
 <%= indent service.doc_description, "# " %>
 #
 <%- end -%>
-# To load this service and instantiate a client:
+<%- end -%>
+<%- if service.generate_grpc_clients? -%>
+# To load this service and instantiate a <%= service.grpc_client_designation %>:
 #
 #     require "<%= service.service_require %>"
 #     client = <%= service.create_client_call %>
 #
+<%- end -%>
+<%- if service.generate_rest_clients? -%>
+# To load this service and instantiate a REST client:
+#
+#     require "<%= service.service_require %>"
+#     client = <%= service.rest.create_client_call %>
+#
+<%- end -%>
 module <%= service.module_name %>
 end
+
+
+
 <% @footer = capture do %>
 <%= render partial: "service/helpers", locals: { service: service} -%>
 <% end %>

data/templates/default/lib/rest/_rest.erb

@@ -0,0 +1,11 @@
+<%- assert_locals service -%>
+<% @requires = capture do %>
+require "gapic/rest"
+require "<%= service.rest.transcoding_helper_require %>"
+require "<%= service.rest.client_require %>"
+<% end %>
+module <%= service.module_name %>
+  # Client for the REST transport
+  module Rest
+  end
+end

data/templates/default/service/client/_config.erb

@@ -115,7 +115,7 @@ class Configuration
   def rpcs
     @rpcs ||= begin
       parent_rpcs = nil
-      parent_rpcs = @parent_config.rpcs if defined?(@parent_config) && @parent_config&.respond_to?(:rpcs)
+      parent_rpcs = @parent_config.rpcs if defined?(@parent_config) && @parent_config.respond_to?(:rpcs)
       Rpcs.new parent_rpcs
     end
   end
@@ -149,7 +149,7 @@ class Configuration
     # @private
     def initialize parent_rpcs = nil
       <%- method_service.methods.each do |method| -%>
-      <%= method.name %>_config = parent_rpcs&.<%= method.name %> if parent_rpcs&.respond_to? :<%= method.name %>
+      <%= method.name %>_config = parent_rpcs.<%= method.name %> if parent_rpcs.respond_to? :<%= method.name %>
       @<%= method.name %> = ::Gapic::Config::Method.new <%= method.name %>_config
       <%- end -%>
 

data/templates/default/service/rest.erb

@@ -0,0 +1,6 @@
+<%- assert_locals service -%>
+<%= render partial: "lib/rest/rest",
+           layout: "layouts/ruby",
+           locals: { service: service,
+                     namespace: service.namespace }
+%>

data/templates/default/service/rest/client.erb

@@ -0,0 +1,6 @@
+<%- assert_locals service -%>
+<%= render partial: "service/rest/client/client",
+           layout: "layouts/ruby",
+           locals: { service: service,
+                     namespace: service.rest.service_name_full }
+%>

data/templates/default/service/rest/client/_client.erb

@@ -0,0 +1,115 @@
+<%- assert_locals service -%>
+<% @requires = capture do %>
+  <%= render partial: "service/client/requires", locals: { service: service} -%>
+  require "<%= service.proto_service_require %>"
+<% end %>
+##
+# REST client for the <%= service.name %> service.
+#
+<%- if service.doc_description -%>
+<%= indent service.doc_description, "# " %>
+#
+<%- end -%>
+class <%= service.rest.client_name %>
+  include <%= service.rest.transcoding_helper_name %>
+<%- if service.paths? -%>
+  include <%= service.paths_name %>
+<%- end -%>
+
+  # @private
+  attr_reader :<%= service.stub_name %>
+
+  ##
+  # Configure the <%= service.name %> <%= service.rest.client_name %> class.
+  #
+  # See {<%= service.rest.client_name_full %>::Configuration}
+  # for a description of the configuration fields.
+  #
+  # ## Example
+  #
+  # To modify the configuration for all <%= service.name %> clients:
+  #
+  #     <%= service.rest.client_name_full %>.configure do |config|
+  #       config.timeout = 10.0
+  #     end
+  #
+  # @yield [config] Configure the <%= service.rest.client_name %> client.
+  # @yieldparam config [<%= service.rest.client_name %>::Configuration]
+  #
+  # @return [<%= service.rest.client_name %>::Configuration]
+  #
+  def self.configure
+<%= indent render(partial: "service/client/self_configure", locals: { service: service }), 4 %>
+  end
+
+  ##
+  # Configure the <%= service.name %> <%= service.rest.client_name %> instance.
+  #
+  # The configuration is set to the derived mode, meaning that values can be changed,
+  # but structural changes (adding new fields, etc.) are not allowed. Structural changes
+  # should be made on {<%= service.rest.client_name %>.configure}.
+  #
+  # See {<%= service.rest.client_name_full %>::Configuration}
+  # for a description of the configuration fields.
+  #
+  # @yield [config] Configure the <%= service.rest.client_name %> client.
+  # @yieldparam config [<%= service.rest.client_name %>::Configuration]
+  #
+  # @return [<%= service.rest.client_name %>::Configuration]
+  #
+  def configure
+    yield @config if block_given?
+    @config
+  end
+
+  ##
+  # Create a new <%= service.name %> REST client object.
+  #
+  # ## Examples
+  #
+  # To create a new <%= service.name %> REST client with the default
+  # configuration:
+  #
+  #     client = <%= service.rest.client_name_full %>.new
+  #
+  # To create a new <%= service.name %> REST client with a custom
+  # configuration:
+  #
+  #     client = <%= service.rest.client_name_full %>.new do |config|
+  #       config.timeout = 10.0
+  #     end
+  #
+  # @yield [config] Configure the <%= service.name %> client.
+  # @yieldparam config [<%= service.rest.client_name %>::Configuration]
+  #
+  def initialize
+    # These require statements are intentionally placed here to initialize
+    # the REST modules only when it's required.
+    require "gapic/rest"
+
+    # Create the configuration object
+    @config = Configuration.new <%= service.rest.client_name %>.configure
+
+    # Yield the configuration if needed
+    yield @config if block_given?
+
+    # Create credentials
+    credentials = @config.credentials
+    <%- unless service.generic_endpoint? -%>
+    credentials ||= Credentials.default scope: @config.scope
+    if credentials.is_a?(String) || credentials.is_a?(Hash)
+      credentials = Credentials.new credentials, scope: @config.scope
+    end
+    <%- end -%>
+    
+    @client_stub = ::Gapic::Rest::ClientStub.new endpoint: @config.endpoint, credentials: credentials
+  end
+
+  # Service calls
+  <%- service.methods.each do |method| -%>
+
+  <%= indent_tail render(partial: "service/rest/client/method/def", locals: { method: method }), 2 %>
+  <%- end %>
+
+  <%= indent_tail render(partial: "service/rest/client/config", locals: { service: service }), 2 %>
+end

data/templates/default/service/rest/client/_config.erb

@@ -0,0 +1,74 @@
+<%- assert_locals service -%>
+<%- method_service ||= service  -%>
+##
+# Configuration class for the <%= service.name %> REST API.
+#
+# This class represents the configuration for <%= service.name %> REST,
+# providing control over credentials, timeouts, retry behavior, logging. 
+#
+# Configuration can be applied globally to all clients, or to a single client
+# on construction.
+#
+<%- unless method_service.methods.empty? -%>
+# # Examples
+#
+# To modify the global config, setting the timeout for all calls to 10 seconds:
+#
+#     <%= service.client_name_full %>.configure do |config|
+#       config.timeout = 10.0
+#     end
+#
+# To apply the above configuration only to a new client:
+#
+#     client = <%= service.client_name_full %>.new do |config|
+#       config.timeout = 10.0
+#     end
+#
+<%- end -%>
+# @!attribute [rw] endpoint
+#   The hostname or hostname:port of the service endpoint.
+#   Defaults to `<%= service.client_endpoint.inspect %>`.
+#   @return [::String]
+# @!attribute [rw] credentials
+#   Credentials to send with calls. You may provide any of the following types:
+#    *  (`String`) The path to a service account key file in JSON format
+#    *  (`Hash`) A service account key as a Hash
+#    *  (`Google::Auth::Credentials`) A googleauth credentials object
+#       (see the [googleauth docs](https://googleapis.dev/ruby/googleauth/latest/index.html))
+#    *  (`Signet::OAuth2::Client`) A signet oauth2 client object
+#       (see the [signet docs](https://googleapis.dev/ruby/signet/latest/Signet/OAuth2/Client.html))
+#    *  (`nil`) indicating no credentials
+#   @return [::Object]
+# @!attribute [rw] scope
+#   The OAuth scopes
+#   @return [::Array<::String>]
+# @!attribute [rw] lib_name
+#   The library name as recorded in instrumentation and logging
+#   @return [::String]
+# @!attribute [rw] lib_version
+#   The library version as recorded in instrumentation and logging
+#   @return [::String]
+# @!attribute [rw] timeout
+#   The call timeout in seconds.
+#   @return [::Numeric]
+#
+class Configuration
+  extend ::Gapic::Config
+
+  config_attr :endpoint,      <%= service.client_endpoint.inspect %>, ::String
+  config_attr :credentials,   nil do |value|
+    allowed = [::String, ::Hash, ::Proc, ::Symbol, ::Google::Auth::Credentials, ::Signet::OAuth2::Client, nil]
+    allowed.any? { |klass| klass === value }
+  end
+  config_attr :scope,         nil, ::String, ::Array, nil
+  config_attr :lib_name,      nil, ::String, nil
+  config_attr :lib_version,   nil, ::String, nil
+  config_attr :timeout,       nil, ::Numeric, nil
+
+  # @private
+  def initialize parent_config = nil
+    @parent_config = parent_config unless parent_config.nil?
+
+    yield self if block_given?
+  end
+end

data/templates/default/service/rest/client/_requires.erb

@@ -0,0 +1 @@
+<%- assert_locals service -%>

data/templates/default/service/rest/client/method/_def.erb

@@ -0,0 +1,18 @@
+<%- assert_locals method -%>
+##
+<%- if method.doc_description -%>
+  <%= indent method.doc_description, "# " %>
+#
+<%- end -%>
+<%= render partial: "service/rest/client/method/docs/request", locals: { method: method } -%>
+<%= render partial: "service/rest/client/method/docs/result", locals: { method: method } -%>
+#
+<%= render partial: "service/rest/client/method/docs/error", locals: { method: method } -%>
+def <%= method.name %> request, options = nil
+<%= indent render(partial: "service/client/method/def/request", locals: { method: method }), 2 %>
+
+<%= indent render(partial: "service/rest/client/method/def/options_defaults", locals: { method: method }), 2 %>
+
+<%= indent render(partial: "service/rest/client/method/def/response_normal", locals: { method: method }), 2 %>
+<%= render partial: "service/rest/client/method/def/rescue", locals: { method: method } -%>
+end

data/templates/default/service/rest/client/method/def/_options_defaults.erb

@@ -0,0 +1,14 @@
+<%- assert_locals method -%>
+# Converts hash and nil to an options object
+options = ::Gapic::CallOptions.new(**options.to_h) if options.respond_to? :to_h
+
+# Customize the options with defaults
+call_metadata = {}
+
+# Set x-goog-api-client header
+call_metadata[:"x-goog-api-client"] ||= ::Gapic::Headers.x_goog_api_client \
+  lib_name: @config.lib_name, lib_version: @config.lib_version,
+  gapic_version: ::<%= method.service.gem.version_name_full %>
+
+options.apply_defaults timeout:      @config.timeout,
+                       metadata:     call_metadata

data/templates/default/service/rest/client/method/def/_rescue.erb

@@ -0,0 +1,3 @@
+<%- assert_locals method -%>
+rescue ::Faraday::Error => e
+  raise ::Gapic::Rest::Error.wrap_faraday_error e

data/templates/default/service/rest/client/method/def/_response_normal.erb

@@ -0,0 +1,17 @@
+<%- assert_locals method -%>
+
+uri, <%= method.rest.body_var_name %>, <%= method.rest.query_string_params_var_name %> = <%= method.rest.transcoding_helper_name %> request
+response = @client_stub.make_<%= method.rest.verb %>_request(
+  uri:     uri,
+<%- if method.rest.body? -%>
+  body:    body,
+<%- end -%>
+<%- if method.rest.query_string_params? -%>
+  params:  query_string_params,
+<%- end -%>
+  options: options
+)
+result = <%= method.return_type %>.decode_json response.body, ignore_unknown_fields: true
+
+yield result, response if block_given?
+result

data/templates/default/service/rest/client/method/docs/_error.erb

@@ -0,0 +1,2 @@
+<%- assert_locals method -%>
+# @raise [::Gapic::Rest::Error] if the REST call is aborted.