gapic-generator 0.6.0 → 0.6.5

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

@@ -16,7 +16,7 @@ $ gem install <%= gem.name %>
 
 ```ruby
 require "<%= gem.entrypoint_require %>"
-<%- service = gem.packages.first&.services.first -%>
+<%- service = gem.first_non_common_service -%>
 <%- method = service&.methods.first -%>
 <%- if service && method -%>
 

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.6.0
+  version: 0.6.5
 platform: ruby
 authors:
 - Ernest Landrito
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2020-07-20 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

data/lib/gapic/path_template/segment.rb

@@ -1,74 +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
-
-      # Determines if the segment has a nontrivial pattern (i.e. not `*` or `**`).
-      #
-      # @return [Boolean]
-      def nontrivial_pattern?
-        @pattern && @pattern != "*" && @pattern != "**"
-      end
-
-      # @private
-      def == other
-        return false unless other.is_a? self.class
-
-        (name == other.name) && (pattern == other.pattern)
-      end
-    end
-  end
-end