gapic-generator 0.2.3 → 0.4.2

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

@@ -1,6 +1,6 @@
 <%- assert_locals resource -%>
 <%- if resource.patterns.count == 1 -%>
 <%= render partial: "service/client/resource/single", locals: { resource: resource } %>
-<%- else -%>
+<%- elsif !resource.patterns.empty? -%>
 <%= render partial: "service/client/resource/multi", locals: { resource: resource } %>
 <%- end -%>

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

@@ -1,12 +1,12 @@
 <%- assert_locals method -%>
 # Converts hash and nil to an options object
-options = Gapic::CallOptions.new(**options.to_h) if options.respond_to? :to_h
+options = ::Gapic::CallOptions.new(**options.to_h) if options.respond_to? :to_h
 
 # Customize the options with defaults
 metadata = @config.rpcs.<%= method.name %>.metadata.to_h
 
 # Set x-goog-api-client and x-goog-user-project headers
-metadata[:"x-goog-api-client"] ||= Gapic::Headers.x_goog_api_client \
+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 %>
 metadata[:"x-goog-user-project"] = @quota_project_id if @quota_project_id

data/templates/default/service/client/method/def/_request_normal.erb

@@ -1,4 +1,4 @@
 <%- assert_locals method -%>
-raise ArgumentError, "request must be provided" if request.nil?
+raise ::ArgumentError, "request must be provided" if request.nil?
 
-request = Gapic::Protobuf.coerce request, to: <%= method.request_type %>
+request = ::Gapic::Protobuf.coerce request, to: <%= method.request_type %>

data/templates/default/service/client/method/def/_request_streaming.erb

@@ -1,9 +1,9 @@
 <%- assert_locals method -%>
-unless request.is_a? Enumerable
-  raise ArgumentError, "request must be an Enumerable" unless request.respond_to? :to_enum
+unless request.is_a? ::Enumerable
+  raise ::ArgumentError, "request must be an Enumerable" unless request.respond_to? :to_enum
   request = request.to_enum
 end
 
 request = request.lazy.map do |req|
-  Gapic::Protobuf.coerce req, to: <%= method.request_type %>
+  ::Gapic::Protobuf.coerce req, to: <%= method.request_type %>
 end

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

@@ -1,7 +1,7 @@
 <%- assert_locals method -%>
 @<%= method.service.stub_name %>.call_rpc :<%= method.name %>, request, options: options do |response, operation|
   <%- if method.lro? -%>
-  response = Gapic::Operation.new response, <%= method.service.lro_client_ivar %>, options: options
+  response = ::Gapic::Operation.new response, <%= method.service.lro_client_ivar %>, options: options
   <%- end -%>
   yield response, operation if block_given?
   return response

data/templates/default/service/client/method/def/_response_paged.erb

@@ -1,9 +1,9 @@
 <%- assert_locals method -%>
 @<%= method.service.stub_name %>.call_rpc :<%= method.name %>, request, options: options do |response, operation|
   <%- if method.lro? -%>
-  wrap_lro_operation = ->(op_response) { Gapic::Operation.new op_response, <%= method.service.lro_client_ivar %> }
+  wrap_lro_operation = ->(op_response) { ::Gapic::Operation.new op_response, <%= method.service.lro_client_ivar %> }
   <%- end -%>
-  response = Gapic::PagedEnumerable.new @<%= method.service.stub_name %>, :<%= method.name %>, request, response, operation, options<%- if method.lro? -%>, format_resource: wrap_lro_operation<%- end -%>
+  response = ::Gapic::PagedEnumerable.new @<%= method.service.stub_name %>, :<%= method.name %>, request, response, operation, options<%- if method.lro? -%>, format_resource: wrap_lro_operation<%- end -%>
   yield response, operation if block_given?
   return response
 end

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

@@ -1,2 +1,2 @@
 <%- assert_locals method -%>
-# @raise [GRPC::BadStatus] if the RPC is aborted.
+# @raise [::GRPC::BadStatus] if the RPC is aborted.

data/templates/default/service/client/method/docs/_request_normal.erb

@@ -1,15 +1,21 @@
 <%- assert_locals method -%>
 # @overload <%= method.name %>(request, options = nil)
-#   @param request [<%= method.request_type %> | Hash]
-<%- if method.doc_description -%>
-<%= indent method.doc_description, "#     " %>
-<%- end -%>
-#   @param options [Gapic::CallOptions, Hash]
+#   Pass arguments to `<%= method.name %>` via a request object, either of type
+#   {<%= method.request_type %>} or an equivalent Hash.
+#
+#   @param request [<%= method.request_type %>, ::Hash]
+#     A request object representing the call parameters. Required. To specify no
+#     parameters, or to keep all the default parameter values, pass an empty Hash.
+#   @param options [::Gapic::CallOptions, ::Hash]
 #     Overrides the default settings for this call, e.g, timeout, retries, etc. Optional.
 <%-if method.arguments.any?-%>
 #
 <%- arg_list = method.arguments.map { |arg| "#{arg.name}: nil"}.join ", " -%>
 # @overload <%= method.name %>(<%= arg_list %>)
+#   Pass arguments to `<%= method.name %>` via keyword arguments. Note that at
+#   least one keyword argument is required. To specify no parameters, or to keep all
+#   the default parameter values, pass an empty Hash as a request object (see above).
+#
 <%- method.arguments.each do |arg| -%>
 #   @param <%= arg.name %> [<%= arg.doc_types %>]
 <%- if arg.doc_description -%>
@@ -17,4 +23,3 @@
 <%- end -%>
 <%- end -%>
 <%- end -%>
-#

data/templates/default/service/client/method/docs/_request_streaming.erb

@@ -1,5 +1,5 @@
 <%- assert_locals method -%>
-# @param request [Gapic::StreamInput, Enumerable<<%= method.request_type %> | Hash>]
+# @param request [::Gapic::StreamInput, ::Enumerable<<%= method.request_type %>, ::Hash>]
 #   An enumerable of {<%= method.request_type %>} instances.
-# @param options [Gapic::CallOptions, Hash]
+# @param options [::Gapic::CallOptions, ::Hash]
 #   Overrides the default settings for this call, e.g, timeout, retries, etc. Optional.

data/templates/default/service/client/method/docs/_response.erb

@@ -1,6 +1,6 @@
 <%- assert_locals method -%>
 # @yield [response, operation] Access the result along with the RPC operation
 # @yieldparam response [<%= method.doc_response_type %>]
-# @yieldparam operation [GRPC::ActiveCall::Operation]
+# @yieldparam operation [::GRPC::ActiveCall::Operation]
 #
 # @return [<%= method.doc_response_type %>]

data/templates/default/service/client/resource/_def.erb

@@ -1,6 +1,6 @@
 <%- assert_locals pattern -%>
 <%- pattern.arguments[0...-1].each do |arg| -%>
-raise ArgumentError, "<%= arg %> cannot contain /" if <%= arg %>.to_s.include? "/"
+raise ::ArgumentError, "<%= arg %> cannot contain /" if <%= arg %>.to_s.include? "/"
 <%- end -%>
 
 "<%= pattern.path_string %>"

data/templates/default/service/client/resource/_multi.erb

@@ -8,7 +8,7 @@
 <%= indent render(partial: "service/client/resource/doc", locals: { pattern: pattern }), "#   " %>
 #
 <%- end -%>
-# @return [String]
+# @return [::String]
 def <%= resource.path_helper %> **args
   resources = {
 <%- last_pattern_index = resource.patterns.count - 1 -%>
@@ -23,6 +23,6 @@ def <%= resource.path_helper %> **args
   }
 
   resource = resources[args.keys.sort.join(":")]
-  raise ArgumentError, "no resource found for values #{args.keys}" if resource.nil?
+  raise ::ArgumentError, "no resource found for values #{args.keys}" if resource.nil?
   resource.call(**args)
 end

data/templates/default/service/client/resource/_single.erb

@@ -4,7 +4,7 @@
 #
 <%= indent render(partial: "service/client/resource/doc", locals: { pattern: resource.patterns.first }), "# " %>
 #
-# @return [String]
+# @return [::String]
 <%- args = resource.patterns.first.arguments.map { |arg| "#{arg}:" }.join ", " -%>
 def <%= resource.path_helper %> <%= args %>
 <%= indent render(partial: "service/client/resource/def", locals: { pattern: resource.patterns.first }), 2 %>

data/templates/default/service/credentials.erb

@@ -2,5 +2,5 @@
 <%= render partial: "service/client/credentials",
            layout: "layouts/ruby",
            locals: { service: service,
-                     namespace: service.proto_service_name_full }
+                     namespace: service.service_name_full }
 %>

data/templates/default/service/operations.erb

@@ -2,5 +2,5 @@
 <%= render partial: "service/client/operations",
            layout: "layouts/ruby",
            locals: { service: service,
-                     namespace: service.proto_service_name_full }
+                     namespace: service.service_name_full }
 %>

data/templates/default/service/paths.erb

@@ -2,5 +2,5 @@
 <%= render partial: "service/client/paths",
            layout: "layouts/ruby",
            locals: { service: service,
-                     namespace: service.proto_service_name_full }
+                     namespace: service.service_name_full }
 %>

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

@@ -17,8 +17,22 @@ class <%= service.client_name_full %>Test < Minitest::Test
 <% service.methods.each do |method| %>
 <%= indent render(partial: "service/test/method/#{method.kind}",
                   locals: { method: method }), 2 %>
-<% if method != service.methods.last %>
 
 <% end %>
-<% end %>
+<%= indent render(partial: "service/test/method/configure", locals: { service: service }), 2 %>
+<%- if service.lro? -%>
+
+  def test_<%= service.lro_client_var %>
+    grpc_channel = GRPC::Core::Channel.new "localhost:8888", nil, :this_channel_is_insecure
+
+    client = nil
+    Gapic::ServiceStub.stub :new, nil do
+      client = <%= service.client_name_full =%>.new do |config|
+        config.credentials = grpc_channel
+      end
+    end
+
+    assert_kind_of <%= service.operations_name_full %>, client.<%= service.lro_client_var %>
+  end
+<%- end -%>
 end

data/templates/default/service/test/client_operations.erb

@@ -17,8 +17,8 @@ class <%= service.operations_name_full %>Test < Minitest::Test
 <% service.lro_service.methods.each do |method| %>
 <%= indent render(partial: "service/test/method/#{method.kind}",
                   locals: { client_name_full: service.operations_name_full, method: method }), 2 %>
-<% if method != service.lro_service.methods.last %>
 
 <% end %>
-<% end %>
+<%= indent render(partial: "service/test/method/configure",
+                  locals: { service: service, client_name_full: service.operations_name_full }), 2 %>
 end

data/templates/default/service/test/method/_configure.erb

@@ -0,0 +1,19 @@
+<%- assert_locals service -%>
+<%- full_client_name = defined?(client_name_full) ? client_name_full : service.client_name_full -%>
+def test_configure
+  grpc_channel = GRPC::Core::Channel.new "localhost:8888", nil, :this_channel_is_insecure
+
+  client = block_config = config = nil
+  Gapic::ServiceStub.stub :new, nil do
+    client = <%= full_client_name =%>.new do |config|
+      config.credentials = grpc_channel
+    end
+  end
+
+  config = client.configure do |c|
+    block_config = c
+  end
+
+  assert_same block_config, config
+  assert_kind_of <%= full_client_name %>::Configuration, config
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gapic-generator
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.4.2
 platform: ruby
 authors:
 - Ernest Landrito
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
+date: 2020-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -233,6 +233,7 @@ files:
 - lib/gapic/presenters/sample_presenter.rb
 - lib/gapic/presenters/service_presenter.rb
 - lib/gapic/resource_lookup.rb
+- lib/gapic/ruby_info.rb
 - lib/gapic/runner.rb
 - lib/gapic/schema.rb
 - lib/gapic/schema/api.rb
@@ -251,6 +252,7 @@ files:
 - lib/google/rpc/status.pb.rb
 - templates/default/gem/_version.erb
 - templates/default/gem/changelog.erb
+- templates/default/gem/entrypoint.erb
 - templates/default/gem/gemfile.erb
 - templates/default/gem/gemspec.erb
 - templates/default/gem/gitignore.erb
@@ -264,6 +266,8 @@ files:
 - templates/default/helpers/filepath_helper.rb
 - templates/default/helpers/namespace_helper.rb
 - templates/default/layouts/_ruby.erb
+- templates/default/lib/_package.erb
+- templates/default/lib/_service.erb
 - templates/default/package.erb
 - templates/default/proto_docs/_enum.erb
 - templates/default/proto_docs/_message.erb
@@ -271,11 +275,11 @@ files:
 - templates/default/proto_docs/proto_file.erb
 - templates/default/proto_docs/readme.erb
 - templates/default/service.erb
+- templates/default/service/_helpers.erb
 - templates/default/service/client.erb
 - templates/default/service/client/_client.erb
 - templates/default/service/client/_config.erb
 - templates/default/service/client/_credentials.erb
-- templates/default/service/client/_helpers.erb
 - templates/default/service/client/_operations.erb
 - templates/default/service/client/_paths.erb
 - templates/default/service/client/_requires.erb
@@ -320,6 +324,7 @@ files:
 - templates/default/service/test/method/_assert_response.erb
 - templates/default/service/test/method/_bidi.erb
 - templates/default/service/test/method/_client.erb
+- templates/default/service/test/method/_configure.erb
 - templates/default/service/test/method/_normal.erb
 - templates/default/service/test/method/_server.erb
 - templates/default/service/test/method/_setup.erb
@@ -346,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: An API Client Generator for Ruby in Ruby!

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

@@ -1,9 +0,0 @@
-# rubocop:disable Lint/HandleExceptions
-
-# Once client is loaded, load helpers.rb if it exists.
-begin
-  require "<%= service.helpers_require %>"
-rescue LoadError
-end
-
-# rubocop:enable Lint/HandleExceptions