gapic-generator 0.5.1 → 0.6.4

data/lib/gapic/uri_template/parser.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+# Copyright 2020 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 UriTemplate
+    # A URI template parser.
+    # see https://tools.ietf.org/html/rfc6570 URI Template
+    #
+    # @!attribute [r] path_pattern
+    #   @return [String] The path pattern to be parsed.
+    # @!attribute [r] segments
+    #   @return [Array<Segment|String>] The segments of the parsed path pattern.
+    module Parser
+      # @private
+      # /((?<positional>\*\*?)|{(?<name>[^\/]+?)(?:=(?<template>.+?))?})/
+      URI_TEMPLATE = %r{
+        (
+          (?<positional>\*\*?)
+          |
+          {(?<name>[^\/]+?)(?:=(?<template>.+?))?}
+        )
+      }x.freeze
+
+      def self.parse_arguments uri_template
+        arguments = []
+
+        while (match = URI_TEMPLATE.match uri_template)
+          # The String before the match needs to be added to the segments
+          arguments << match[:name] if match[:name]
+          uri_template = match.post_match
+        end
+
+        arguments
+      end
+    end
+  end
+end

data/lib/google/protobuf/compiler/plugin.pb.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
 
 ##
-# This file is auto-generated. DO NOT EDIT!
+# This file was auto-generated initially but now is hand-edited to add support 
+# for response features and proto3_optional
 #
 require 'protobuf'
 
@@ -54,6 +55,8 @@ module Google
       end
 
       class CodeGeneratorResponse
+        FEATURE_PROTO3_OPTIONAL = 1
+
         class File
           optional :string, :name, 1
           optional :string, :insertion_point, 2
@@ -61,6 +64,7 @@ module Google
         end
 
         optional :string, :error, 1
+        optional :int32, :supported_features, 2
         repeated ::Google::Protobuf::Compiler::CodeGeneratorResponse::File, :file, 15
       end
 

data/lib/google/protobuf/descriptor.pb.rb

@@ -190,6 +190,7 @@ module Google
       optional :int32, :oneof_index, 9
       optional :string, :json_name, 10
       optional ::Google::Protobuf::FieldOptions, :options, 8
+      optional :bool, :proto3_optional, 17
     end
 
     class OneofDescriptorProto

data/templates/default/gem/gemfile.erb

@@ -2,6 +2,3 @@
 source "https://rubygems.org"
 
 gemspec
-
-# google-protobuf 3.12.0 requires Ruby 2.5 or later, so pin to 3.11 on older Rubies
-gem "google-protobuf", (RUBY_VERSION < "2.5" ? "~> 3.11.4" : "~> 3.12")

data/templates/default/gem/gemspec.erb

@@ -12,20 +12,19 @@ Gem::Specification.new do |gem|
   gem.description   = <%= gem.description.inspect %>
   gem.summary       = <%= gem.summary.inspect %>
   gem.homepage      = <%= gem.homepage.inspect %>
-  gem.license       = "MIT"
+  gem.license       = <%= gem.license_name.inspect %>
 
   gem.platform      = Gem::Platform::RUBY
 
   gem.files         = `git ls-files -- lib/*`.split("\n") +
                       `git ls-files -- proto_docs/*`.split("\n") +
-                      ["README.md", "LICENSE.md", ".yardopts"]
+                      <%= gem.extra_files.inspect %>
   gem.require_paths = ["lib"]
 
   gem.required_ruby_version = ">= 2.4"
 
-  gem.add_dependency "gapic-common", "~> 0.2"
-  <%- if gem.iam_dependency? -%>
-  gem.add_dependency "grpc-google-iam-v1", ">= 0.6.10", "< 2.0"
+  <%- 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"

data/templates/default/lib/_service.erb

@@ -6,7 +6,9 @@ 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 -%>

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

@@ -96,10 +96,12 @@ class <%= service.client_name %>
 
     # 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 -%>
     @quota_project_id = @config.quota_project
     @quota_project_id ||= credentials.quota_project_id if credentials.respond_to? :quota_project_id
 

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 @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

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

@@ -13,7 +13,11 @@ def <%= resource.path_helper %> **args
 <%- last_pattern_index = resource.patterns.count - 1 -%>
 <%- resource.patterns.each_with_index do |pattern, index| -%>
 <%- comma = last_pattern_index == index ? "" : "," -%>
+<%- if pattern.formal_arguments.empty? -%>
+    <%= pattern.arguments_key.inspect %> => (proc do
+<%- else -%>
     <%= pattern.arguments_key.inspect %> => (proc do |<%= pattern.formal_arguments %>|
+<%- end -%>
 <%= indent render(partial: "service/client/resource/def", locals: { pattern: pattern }), 6 %>
     end)<%= comma %>
 <%- end -%>

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

@@ -1,7 +1,5 @@
 <%- assert_locals service -%>
-# frozen_string_literal: true
-
-<%= render partial: "shared/license" %>
+<%= render partial: "shared/header" %>
 require "helper"
 
 require "gapic/grpc/service_stub"

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

@@ -1,7 +1,5 @@
 <%- assert_locals service -%>
-# frozen_string_literal: true
-
-<%= render partial: "shared/license" %>
+<%= render partial: "shared/header" %>
 require "helper"
 
 require "gapic/grpc/service_stub"

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

@@ -1,7 +1,5 @@
 <%- assert_locals service -%>
-# frozen_string_literal: true
-
-<%= render partial: "shared/license" %>
+<%= render partial: "shared/header" %>
 require "helper"
 
 require "gapic/grpc/service_stub"

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

@@ -86,13 +86,21 @@ def test_<%= method.name %>
       request.to_a.each do |r|
         assert_kind_of <%= method.request_type %>, r
         <%- fields.each do |field| -%>
-        <%- if field.message? && field.repeated? -%>
-        assert_kind_of <%= field.type_name_full %>, request.<%= field.name %>.first
+        <%- if field.message? && field.repeated? && !field.map? -%>
+        assert_kind_of <%= field.type_name_full %>, r.<%= field.name %>.first
+        <%- elsif field.map? -%>
+        assert_equal(<%= field.default_value %>, r.<%= field.name %>.to_h)
         <%- elsif field.message? -%>
         assert_equal Gapic::Protobuf.coerce(<%= field.default_value %>, to: <%= field.type_name_full %>), r.<%= field.name %>
         <%- else -%>
         assert_equal <%= field.default_value %>, r.<%= field.name %>
         <%- end -%>
+        <%- if field.oneof? && !field.proto3_optional? -%>
+        assert_equal :<%= field.name %>, r.<%= field.oneof_name %>
+        <%- end -%>
+        <%- if field.proto3_optional? -%>
+        assert r.has_<%= field.name %>?
+        <%- end -%>
         <%- end -%>
       end
     end

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

@@ -70,13 +70,21 @@ def test_<%= method.name %>
       request.to_a.each do |r|
         assert_kind_of <%= method.request_type %>, r
         <%- fields.each do |field| -%>
-        <%- if field.message? && field.repeated? -%>
-        assert_kind_of <%= field.type_name_full %>, request.<%= field.name %>.first
+        <%- if field.message? && field.repeated? && !field.map? -%>
+        assert_kind_of <%= field.type_name_full %>, r.<%= field.name %>.first
+        <%- elsif field.map? -%>
+        assert_equal(<%= field.default_value %>, r.<%= field.name %>.to_h)
         <%- elsif field.message? -%>
         assert_equal Gapic::Protobuf.coerce(<%= field.default_value %>, to: <%= field.type_name_full %>), r.<%= field.name %>
         <%- else -%>
         assert_equal <%= field.default_value %>, r.<%= field.name %>
         <%- end -%>
+        <%- if field.oneof? && !field.proto3_optional? -%>
+        assert_equal :<%= field.name %>, r.<%= field.oneof_name %>
+        <%- end -%>
+        <%- if field.proto3_optional? -%>
+        assert r.has_<%= field.name %>?
+        <%- end -%>
         <%- end -%>
       end
     end

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

@@ -26,6 +26,12 @@ def test_<%= method.name %>
     <%- else -%>
     assert_equal <%= field.default_value %>, request.<%= field.name %>
     <%- end -%>
+    <%- if field.oneof? && !field.proto3_optional? -%>
+    assert_equal :<%= field.name %>, request.<%= field.oneof_name %>
+    <%- end -%>
+    <%- if field.proto3_optional? -%>
+    assert request.has_<%= field.name %>?
+    <%- end -%>
     <%- end -%>
     refute_nil options
   end

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

@@ -17,13 +17,21 @@ def test_<%= method.name %>
     assert_equal :<%= method.name %>, name
     assert_kind_of <%= method.request_type %>, request
     <%- fields.each do |field| -%>
-    <%- if field.message? && field.repeated? -%>
+    <%- if field.message? && field.repeated? && !field.map? -%>
     assert_kind_of <%= field.type_name_full %>, request.<%= field.name %>.first
+    <%- elsif field.map? -%>
+    assert_equal(<%= field.default_value %>, request.<%= field.name %>.to_h)
     <%- elsif field.message? -%>
     assert_equal Gapic::Protobuf.coerce(<%= field.default_value %>, to: <%= field.type_name_full %>), request.<%= field.name %>
     <%- else -%>
     assert_equal <%= field.default_value %>, request.<%= field.name %>
     <%- end -%>
+    <%- if field.oneof? && !field.proto3_optional? -%>
+    assert_equal :<%= field.name %>, request.<%= field.oneof_name %>
+    <%- end -%>
+    <%- if field.proto3_optional? -%>
+    assert request.has_<%= field.name %>?
+    <%- end -%>
     <%- end -%>
     refute_nil options
   end

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

@@ -9,10 +9,10 @@ class ClientStub
     @requests = []
   end
 
-  def call_rpc *args
+  def call_rpc *args, **kwargs
     @call_rpc_count += 1
 
-    @requests << @block&.call(*args)
+    @requests << @block&.call(*args, **kwargs)
 
     yield @response, @operation if block_given?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gapic-generator
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.4
 platform: ruby
 authors:
 - Ernest Landrito
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-25 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -40,20 +40,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.8'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: google-style
   requirement: !ruby/object:Gem::Requirement
@@ -74,14 +60,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: 1.30.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: 1.30.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -217,9 +203,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 +226,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

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