gapic-generator 0.4.0 → 0.6.1

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

@@ -64,8 +64,10 @@ class <%= service.operations_name %>
     if credentials.is_a?(String) || credentials.is_a?(Hash)
       credentials = Credentials.new credentials, scope: @config.scope
     end
+    @quota_project_id = @config.quota_project
+    @quota_project_id ||= credentials.quota_project_id if credentials.respond_to? :quota_project_id
 
-    @<%= service.lro_service.stub_name %> = Gapic::ServiceStub.new(
+    @<%= service.lro_service.stub_name %> = ::Gapic::ServiceStub.new(
       <%= service.lro_service.proto_service_stub_name_full %>,
       credentials:  credentials,
       endpoint:     @config.endpoint,

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

@@ -3,10 +3,10 @@
 #   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]
+#   @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]
+#   @param options [::Gapic::CallOptions, ::Hash]
 #     Overrides the default settings for this call, e.g, timeout, retries, etc. Optional.
 <%-if method.arguments.any?-%>
 #

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/_doc.erb

@@ -1,7 +1,7 @@
 <%- assert_locals pattern -%>
 The resource will be in the following format:
 
-`<%= pattern.template %>`
+`<%= pattern.pattern %>`
 
 <%- pattern.arguments.each do |arg| -%>
 @param <%= arg %> [String]

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

@@ -3,26 +3,23 @@
 # Create a fully-qualified <%= resource.name %> resource string.
 #
 <%- resource.patterns.each do |pattern| -%>
-<%- args_doc_sig = pattern.arguments.map { |arg| "#{arg}:" }.join ", " -%>
-# @overload <%= resource.path_helper %>(<%= args_doc_sig %>)
+# @overload <%= resource.path_helper %>(<%= pattern.formal_arguments %>)
 <%= 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 -%>
 <%- resource.patterns.each_with_index do |pattern, index| -%>
 <%- comma = last_pattern_index == index ? "" : "," -%>
-<%- args_key = pattern.arguments.sort.join(":").inspect -%>
-<%- args_sig = pattern.arguments.map { |arg| "#{arg}:" }.join ", " -%>
-    <%= args_key %> => (proc do |<%= args_sig %>|
+    <%= pattern.arguments_key.inspect %> => (proc do |<%= pattern.formal_arguments %>|
 <%= indent render(partial: "service/client/resource/def", locals: { pattern: pattern }), 6 %>
     end)<%= comma %>
 <%- end -%>
   }
 
   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,8 +4,7 @@
 #
 <%= indent render(partial: "service/client/resource/doc", locals: { pattern: resource.patterns.first }), "# " %>
 #
-# @return [String]
-<%- args = resource.patterns.first.arguments.map { |arg| "#{arg}:" }.join ", " -%>
-def <%= resource.path_helper %> <%= args %>
+# @return [::String]
+def <%= resource.path_helper %> <%= resource.patterns.first.formal_arguments %>
 <%= indent render(partial: "service/client/resource/def", locals: { pattern: resource.patterns.first }), 2 %>
 end

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

@@ -0,0 +1,16 @@
+<%- assert_locals resource -%>
+<%- assert_locals service -%>
+<%- full_client_name = defined?(client_name_full) ? client_name_full : service.client_name_full -%>
+def test_<%= resource.path_helper%>
+  grpc_channel = ::GRPC::Core::Channel.new "localhost:8888", nil, :this_channel_is_insecure
+  ::Gapic::ServiceStub.stub :new, nil do
+    client = <%= full_client_name %>.new do |config|
+      config.credentials = grpc_channel
+    end
+<%- resource.patterns.each do |pattern| -%>
+
+    path = client.<%= resource.path_helper%> <%= pattern.arguments_with_dummy_values %>
+    assert_equal <%= pattern.expected_path_for_dummy_values.inspect %>, path
+<%- end -%>
+  end
+end

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

@@ -1,9 +1,6 @@
 <%- assert_locals service -%>
-# frozen_string_literal: true
-
-<%= render partial: "shared/license" %>
-require "simplecov"
-require "minitest/autorun"
+<%= render partial: "shared/header" %>
+require "helper"
 
 require "gapic/grpc/service_stub"
 

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

@@ -1,9 +1,6 @@
 <%- assert_locals service -%>
-# frozen_string_literal: true
-
-<%= render partial: "shared/license" %>
-require "simplecov"
-require "minitest/autorun"
+<%= render partial: "shared/header" %>
+require "helper"
 
 require "gapic/grpc/service_stub"
 

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

@@ -0,0 +1,15 @@
+<%- assert_locals service -%>
+<%= render partial: "shared/header" %>
+require "helper"
+
+require "gapic/grpc/service_stub"
+
+require "<%= service.service_require %>"
+
+class <%= service.client_name_full %>PathsTest < Minitest::Test
+<%- service.references.each do |resource| -%>
+<%= indent render(partial: "service/test/resource",
+                  locals: { resource: resource, service: service }), 2 %>
+
+<%- end %>
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gapic-generator
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Ernest Landrito
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -217,9 +217,10 @@ files:
 - lib/gapic/grpc_service_config/service_config.rb
 - lib/gapic/helpers/filepath_helper.rb
 - lib/gapic/helpers/namespace_helper.rb
-- lib/gapic/path_template.rb
-- lib/gapic/path_template/parser.rb
-- lib/gapic/path_template/segment.rb
+- lib/gapic/path_pattern.rb
+- lib/gapic/path_pattern/parser.rb
+- lib/gapic/path_pattern/pattern.rb
+- lib/gapic/path_pattern/segment.rb
 - lib/gapic/presenters.rb
 - lib/gapic/presenters/enum_presenter.rb
 - lib/gapic/presenters/enum_value_presenter.rb
@@ -239,6 +240,8 @@ files:
 - lib/gapic/schema/api.rb
 - lib/gapic/schema/loader.rb
 - lib/gapic/schema/wrappers.rb
+- lib/gapic/uri_template.rb
+- lib/gapic/uri_template/parser.rb
 - lib/google/api/annotations.pb.rb
 - lib/google/api/client.pb.rb
 - lib/google/api/field_behavior.pb.rb
@@ -260,6 +263,7 @@ files:
 - templates/default/gem/rakefile.erb
 - templates/default/gem/readme.erb
 - templates/default/gem/rubocop.erb
+- templates/default/gem/test_helper.erb
 - templates/default/gem/version.erb
 - templates/default/gem/yardopts.erb
 - templates/default/helpers/default_helper.rb
@@ -319,8 +323,10 @@ files:
 - templates/default/service/credentials.erb
 - templates/default/service/operations.erb
 - templates/default/service/paths.erb
+- templates/default/service/test/_resource.erb
 - templates/default/service/test/client.erb
 - templates/default/service/test/client_operations.erb
+- templates/default/service/test/client_paths.erb
 - templates/default/service/test/method/_assert_response.erb
 - templates/default/service/test/method/_bidi.erb
 - templates/default/service/test/method/_client.erb
@@ -351,7 +357,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/lib/gapic/path_template/parser.rb

@@ -1,83 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright 2019 Google LLC
-#
-# 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
-#
-#     https://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.
-
-require "gapic/path_template/segment"
-
-module Gapic
-  module PathTemplate
-    # A URI path template parser.
-    #
-    # @see https://tools.ietf.org/html/rfc6570 URI Template
-    #
-    # @!attribute [r] path_template
-    #   @return [String] The URI path template to be parsed.
-    # @!attribute [r] segments
-    #   @return [Array<Segment|String>] The segments of the parsed URI path
-    #     template.
-    class Parser
-      # @private
-      # /((?<positional>\*\*?)|{(?<name>[^\/]+?)(?:=(?<template>.+?))?})/
-      PATH_TEMPLATE = %r{
-        (
-          (?<positional>\*\*?)
-          |
-          {(?<name>[^\/]+?)(?:=(?<template>.+?))?}
-        )
-      }x.freeze
-
-      attr_reader :path_template, :segments
-
-      # Create a new URI path template parser.
-      #
-      # @param path_template [String] The URI path template to be parsed.
-      def initialize path_template
-        @path_template = path_template
-        @segments = parse! path_template
-      end
-
-      protected
-
-      def parse! path_template
-        # segments contain either Strings or segment objects
-        segments = []
-        segment_pos = 0
-
-        while (match = PATH_TEMPLATE.match path_template)
-          # The String before the match needs to be added to the segments
-          segments << match.pre_match unless match.pre_match.empty?
-
-          segment, segment_pos = segment_and_pos_from_match match, segment_pos
-          segments << segment
-
-          path_template = match.post_match
-        end
-
-        # Whatever String is unmatched needs to be added to the segments
-        segments << path_template unless path_template.empty?
-
-        segments
-      end
-
-      def segment_and_pos_from_match match, pos
-        if match[:positional]
-          [Segment.new(pos, match[:positional]), pos + 1]
-        else
-          [Segment.new(match[:name], match[:template]), pos]
-        end
-      end
-    end
-  end
-end

data/lib/gapic/path_template/segment.rb

@@ -1,67 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright 2019 Google LLC
-#
-# 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
-#
-#     https://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 Gapic
-  module PathTemplate
-    # A segment in a URI path template.
-    #
-    # @see https://tools.ietf.org/html/rfc6570 URI Template
-    #
-    # @!attribute [r] name
-    #   @return [String, Integer] The name of a named segment, or the position
-    #     of a positional segment.
-    # @!attribute [r] pattern
-    #   @return [String, nil] The pattern of the segment, nil if not set.
-    class Segment
-      attr_reader :name, :pattern
-
-      def initialize name, pattern
-        @name    = name
-        @pattern = pattern
-      end
-
-      # Determines if the segment is positional (has a number for a name).
-      #
-      # @return [Boolean]
-      def positional?
-        name.is_a? Integer
-      end
-
-      # Determines if the segment is named (has a string for a name).
-      #
-      # @return [Boolean]
-      def named?
-        !positional?
-      end
-
-      # Determines if the segment has a pattern. Positional segments always
-      # have a pattern. Named segments may have a pattern if provided in the
-      # URI path template.
-      #
-      # @return [Boolean]
-      def pattern?
-        !@pattern.nil?
-      end
-
-      # @private
-      def == other
-        return false unless other.is_a? self.class
-
-        (name == other.name) && (pattern == other.pattern)
-      end
-    end
-  end
-end