gapic-generator 0.11.0 → 0.45.1

data/templates/default/service/rest/test/{client.erb → client.text.erb}

@@ -3,13 +3,13 @@
 require "helper"
 require "gapic/rest"
 require "<%= service.proto_service_require %>"
-require "<%= service.service_require %>"
+require "<%= service.rest.service_require %>"
 
 
-class <%= service.client_name_full %>Test < Minitest::Test
+class <%= service.rest.client_name_full %>Test < Minitest::Test
 <%= indent render(partial: "service/rest/test/method/setup"), 2 %>
 
-<% service.methods.each do |method| %>
+<% service.rest.methods.each do |method| %>
 <%= indent render(partial: "service/rest/test/method/#{method.kind}",
                   locals: { method: method }), 2 %>
 

data/templates/default/service/rest/test/method/_assert_response.text.erb

@@ -0,0 +1,2 @@
+<%- assert_locals method -%>
+assert_equal http_response, response.underlying_op

data/templates/default/service/rest/test/method/{_configure.erb → _configure.text.erb}

@@ -4,8 +4,9 @@ def test_configure
   credentials_token = :dummy_value
 
   client = block_config = config = nil
-  Gapic::Rest::ClientStub.stub :new, nil do
-    client = <%= full_client_name =%>.new do |config|
+  dummy_stub = ClientStub.new nil
+  Gapic::Rest::ClientStub.stub :new, dummy_stub do
+    client = <%= full_client_name %>.new do |config|
       config.credentials = credentials_token
     end
   end

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

@@ -0,0 +1,60 @@
+<%- assert_locals method -%>
+<%- full_client_name = defined?(client_name_full) ? client_name_full : method.service.rest.client_name_full -%>
+<%- fields = method.fields_with_first_oneof -%>
+def test_<%= method.name %>
+  # Create test objects.
+  client_result = <%= method.return_type %>.new
+  http_response = OpenStruct.new body: client_result.to_json
+
+  call_options = {}
+
+  # Create request parameters for a unary method.
+  <%- fields.each do |field| -%>
+  <%= field.value_name %> = <%= field.default_value %>
+  <%- end -%>
+
+  <%= method.name %>_client_stub = ClientStub.new http_response do |_verb, uri:, body:, params:, options:, method_name:|
+    assert options.metadata.key? :"x-goog-api-client"
+    assert options.metadata[:"x-goog-api-client"].include? "rest"
+    refute options.metadata[:"x-goog-api-client"].include? "grpc"
+  end
+
+  <%= method.service.rest.service_name_full %>::<%= method.service.rest.service_stub_name %>.stub :<%= method.rest.transcoding_helper_name %>, ["", "", {}] do
+    Gapic::Rest::ClientStub.stub :new, <%= method.name %>_client_stub do
+      # Create client
+      client = <%= full_client_name %>.new do |config|
+        config.credentials = :dummy_value
+      end
+
+      # Use hash object
+      client.<%= method.name %>({ <%= fields.map(&:as_kwarg).join ", " %> }) do |_result, response|
+        <%= indent_tail render(partial: "service/rest/test/method/assert_response", locals: { method: method }), 6 %>
+      end
+
+      <%- if fields.any? -%>
+      # Use named arguments
+      client.<%= method.name %> <%= fields.map(&:as_kwarg).join ", " %> do |_result, response|
+        <%= indent_tail render(partial: "service/rest/test/method/assert_response", locals: { method: method }), 6 %>
+      end
+
+      <%- end -%>
+      # Use protobuf object
+      client.<%= method.name %> <%= method.request_type %>.new(<%= fields.map(&:as_kwarg).join ", " %>) do |_result, response|
+        <%= indent_tail render(partial: "service/rest/test/method/assert_response", locals: { method: method }), 6 %>
+      end
+
+      # Use hash object with options
+      client.<%= method.name %>({ <%= fields.map(&:as_kwarg).join ", " %> }, call_options) do |_result, response|
+        <%= indent_tail render(partial: "service/rest/test/method/assert_response", locals: { method: method }), 6 %>
+      end
+
+      # Use protobuf object with options
+      client.<%= method.name %>(<%= method.request_type %>.new(<%= fields.map(&:as_kwarg).join ", " %>), call_options) do |_result, response|
+        <%= indent_tail render(partial: "service/rest/test/method/assert_response", locals: { method: method }), 6 %>
+      end
+
+      # Verify method calls
+      assert_equal <%= fields.any? ? 5 : 4 %>, <%= method.name %>_client_stub.call_count
+    end
+  end
+end

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

@@ -0,0 +1,60 @@
+<%- assert_locals method -%>
+<%- full_client_name = defined?(client_name_full) ? client_name_full : method.service.rest.client_name_full -%>
+<%- fields = method.fields_with_first_oneof -%>
+def test_<%= method.name %>
+  # Create test objects.
+  client_result = <%= method.return_type %>.new
+  http_response = OpenStruct.new body: client_result.to_json
+
+  call_options = {}
+
+  # Create request parameters for a unary method.
+  <%- fields.each do |field| -%>
+  <%= field.value_name %> = <%= field.default_value %>
+  <%- end -%>
+
+  <%= method.name %>_client_stub = ClientStub.new http_response do |_verb, uri:, body:, params:, options:, is_server_streaming:, method_name:|
+    assert options.metadata.key? :"x-goog-api-client"
+    assert options.metadata[:"x-goog-api-client"].include? "rest"
+    refute options.metadata[:"x-goog-api-client"].include? "grpc"
+  end
+
+  <%= method.service.rest.service_name_full %>::<%= method.service.rest.service_stub_name %>.stub :<%= method.rest.transcoding_helper_name %>, ["", "", {}] do
+    Gapic::Rest::ClientStub.stub :new, <%= method.name %>_client_stub do
+      # Create client
+      client = <%= full_client_name %>.new do |config|
+        config.credentials = :dummy_value
+      end
+
+      # Use hash object
+      client.<%= method.name %>({ <%= fields.map(&:as_kwarg).join ", " %> }) do |_result, response|
+        <%= indent_tail render(partial: "service/rest/test/method/assert_response", locals: { method: method }), 6 %>
+      end.first
+
+      <%- if fields.any? -%>
+      # Use named arguments
+      client.<%= method.name %> <%= fields.map(&:as_kwarg).join ", " %> do |_result, response|
+        <%= indent_tail render(partial: "service/rest/test/method/assert_response", locals: { method: method }), 6 %>
+      end.first
+
+      <%- end -%>
+      # Use protobuf object
+      client.<%= method.name %> <%= method.request_type %>.new(<%= fields.map(&:as_kwarg).join ", " %>) do |_result, response|
+        <%= indent_tail render(partial: "service/rest/test/method/assert_response", locals: { method: method }), 6 %>
+      end.first
+
+      # Use hash object with options
+      client.<%= method.name %>({ <%= fields.map(&:as_kwarg).join ", " %> }, call_options) do |_result, response|
+        <%= indent_tail render(partial: "service/rest/test/method/assert_response", locals: { method: method }), 6 %>
+      end.first
+
+      # Use protobuf object with options
+      client.<%= method.name %>(<%= method.request_type %>.new(<%= fields.map(&:as_kwarg).join ", " %>), call_options) do |_result, response|
+        <%= indent_tail render(partial: "service/rest/test/method/assert_response", locals: { method: method }), 6 %>
+      end.first
+
+      # Verify method calls
+      assert_equal <%= fields.any? ? 5 : 4 %>, <%= method.name %>_client_stub.call_count
+    end
+  end
+end

data/templates/default/service/rest/test/method/{_setup.erb → _setup.text.erb}

@@ -8,24 +8,24 @@ class ClientStub
     @requests = []
   end
 
-  def make_get_request uri:, params: {}, options: {}
-    make_http_request :get, uri: uri, body: nil, params: params, options: options
+  def make_get_request uri:, params: {}, options: {}, method_name: nil
+    make_http_request :get, uri: uri, body: nil, params: params, options: options, method_name: method_name
   end
 
-  def make_delete_request uri:, params: {}, options: {}
-    make_http_request :delete, uri: uri, body: nil, params: params, options: options
+  def make_delete_request uri:, params: {}, options: {}, method_name: nil
+    make_http_request :delete, uri: uri, body: nil, params: params, options: options, method_name: method_name
   end
 
-  def make_post_request uri:, body: nil, params: {}, options: {}
-    make_http_request :post, uri: uri, body: body, params: params, options: options
+  def make_post_request uri:, body: nil, params: {}, options: {}, method_name: nil
+    make_http_request :post, uri: uri, body: body, params: params, options: options, method_name: method_name
   end
 
-  def make_patch_request uri:, body:, params: {}, options: {}
-    make_http_request :patch, uri: uri, body: body, params: params, options: options
+  def make_patch_request uri:, body:, params: {}, options: {}, method_name: nil
+    make_http_request :patch, uri: uri, body: body, params: params, options: options, method_name: method_name
   end
 
-  def make_put_request uri:, body:, params: {}, options: {}
-    make_http_request :put, uri: uri, body: body, params: params, options: options
+  def make_put_request uri:, body:, params: {}, options: {}, method_name: nil
+    make_http_request :put, uri: uri, body: body, params: params, options: options, method_name: method_name
   end
 
   def make_http_request *args, **kwargs
@@ -35,4 +35,20 @@ class ClientStub
 
     @response
   end
+
+  def endpoint
+    "endpoint.example.com"
+  end
+
+  def universe_domain
+    "example.com"
+  end
+
+  def stub_logger
+    nil
+  end
+
+  def logger
+    nil
+  end
 end

data/templates/default/service/test/{_resource.erb → _resource.text.erb}

@@ -3,7 +3,7 @@
 <%- 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
+  ::Gapic::ServiceStub.stub :new, DummyStub.new do
     client = <%= full_client_name %>.new do |config|
       config.credentials = grpc_channel
     end

data/templates/default/service/test/{client.erb → client.text.erb}

@@ -15,7 +15,7 @@ class <%= service.client_name_full %>Test < Minitest::Test
 <%= indent render(partial: "service/test/method/#{method.kind}",
                   locals: { method: method }), 2 %>
 
-<% end %>
+<%- end -%>
 <%= indent render(partial: "service/test/method/configure", locals: { service: service }), 2 %>
 <%- if service.lro? -%>
 
@@ -23,7 +23,8 @@ class <%= service.client_name_full %>Test < Minitest::Test
     grpc_channel = GRPC::Core::Channel.new "localhost:8888", nil, :this_channel_is_insecure
 
     client = nil
-    Gapic::ServiceStub.stub :new, nil do
+    dummy_stub = ClientStub.new nil, nil
+    Gapic::ServiceStub.stub :new, dummy_stub do
       client = <%= service.client_name_full =%>.new do |config|
         config.credentials = grpc_channel
       end

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

@@ -0,0 +1,33 @@
+<%- 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
+  class DummyStub
+    def endpoint
+      "endpoint.example.com"
+    end
+  
+    def universe_domain
+      "example.com"
+    end
+
+    def stub_logger
+      nil
+    end
+
+    def logger
+      nil
+    end
+  end
+
+<%- start_line_spacer -%>
+<%- service.deduped_references.each do |resource| -%>
+<%- locals = { resource: resource, service: service } -%>
+<%= line_spacer %><%= indent render(partial: "service/test/resource", locals: locals), 2 %>
+<%- end -%>
+end

data/templates/default/service/test/method/{_bidi.erb → _bidi.text.erb}

@@ -10,7 +10,7 @@ def test_<%= method.name %>
 
   # Create request parameters for a bidi streaming method.
   <%- fields.each do |field| -%>
-  <%= field.name %> = <%= field.default_value %>
+  <%= field.value_name %> = <%= field.default_value %>
   <%- end -%>
 
   <%= method.name %>_client_stub = ClientStub.new [grpc_response].to_enum, grpc_operation do |name, request, options:|

data/templates/default/service/test/method/{_client.erb → _client.text.erb}

@@ -10,7 +10,7 @@ def test_<%= method.name %>
 
   # Create request parameters for a client streaming method.
   <%- fields.each do |field| -%>
-  <%= field.name %> = <%= field.default_value %>
+  <%= field.value_name %> = <%= field.default_value %>
   <%- end -%>
 
   <%= method.name %>_client_stub = ClientStub.new grpc_response, grpc_operation do |name, request, options:|

data/templates/default/service/test/method/{_configure.erb → _configure.text.erb}

@@ -4,7 +4,8 @@ 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
+  dummy_stub = ClientStub.new nil, nil
+  Gapic::ServiceStub.stub :new, dummy_stub do
     client = <%= full_client_name =%>.new do |config|
       config.credentials = grpc_channel
     end

data/templates/default/service/test/method/{_normal.erb → _normal.text.erb}

@@ -10,7 +10,7 @@ def test_<%= method.name %>
 
   # Create request parameters for a unary method.
   <%- fields.each do |field| -%>
-  <%= field.name %> = <%= field.default_value %>
+  <%= field.value_name %> = <%= field.default_value %>
   <%- end -%>
 
   <%= method.name %>_client_stub = ClientStub.new grpc_response, grpc_operation do |name, request, options:|

data/templates/default/service/test/method/{_server.erb → _server.text.erb}

@@ -10,7 +10,7 @@ def test_<%= method.name %>
 
   # Create request parameters for a server streaming method.
   <%- fields.each do |field| -%>
-  <%= field.name %> = <%= field.default_value %>
+  <%= field.value_name %> = <%= field.default_value %>
   <%- end -%>
 
   <%= method.name %>_client_stub = ClientStub.new [grpc_response].to_enum, grpc_operation do |name, request, options:|

data/templates/default/service/test/method/{_setup.erb → _setup.text.erb}

@@ -14,8 +14,25 @@ class ClientStub
 
     @requests << @block&.call(*args, **kwargs)
 
-    yield @response, @operation if block_given?
+    catch :response do
+      yield @response, @operation if block_given?
+      @response
+    end
+  end
+
+  def endpoint
+    "endpoint.example.com"
+  end
+
+  def universe_domain
+    "example.com"
+  end
+
+  def stub_logger
+    nil
+  end
 
-    @response
+  def logger
+    nil
   end
 end

data/templates/default/snippets/{gemfile.erb → gemfile.text.erb}

@@ -10,8 +10,8 @@ else
 end
 
 group :test do
-  gem "google-style", "~> 1.25.1"
-  gem "minitest", "~> 5.14"
+  gem "google-style", "~> 1.26.1"
+  gem "minitest", "~> 5.16"
   gem "minitest-focus", "~> 1.1"
   gem "minitest-hooks", "~> 1.5"
 end

data/templates/default/snippets/snippet/_body.text.erb

@@ -0,0 +1,24 @@
+<%- assert_locals snippet -%>
+<%- unless snippet.client_initialization.render.empty? -%>
+<%= snippet.client_initialization.render %>
+
+<%- end -%>
+<%- unless snippet.request_initialization.render_precall.empty? -%>
+<%= snippet.request_initialization.render_precall %>
+
+<%- end -%>
+<%= snippet.client_call.render %>
+<%- unless snippet.request_initialization.render_postcall.empty? -%>
+
+<%= snippet.request_initialization.render_postcall %>
+<%- end -%>
+<%- unless snippet.response_handling.render.empty? -%>
+
+<%= snippet.response_handling.render %>
+<%- end -%>
+<%- unless snippet.final_statements.empty? -%>
+
+<%- snippet.final_statements.each do |statement| -%>
+<%= statement.render %>
+<%- end -%>
+<%- end -%>

data/templates/default/snippets/snippet/_inline.text.erb

@@ -0,0 +1,11 @@
+<%- assert_locals snippet -%>
+require "<%= snippet.require_path %>"
+<%- snippet.snippet_method_parameters.each do |param| -%>
+
+<%- if param.description -%>
+<%= indent wrap(param.description, 78), "# " %>
+<%- end -%>
+# <%= param.name %> = <%= param.example.exist? ? param.example.render : "..." %>
+<%- end -%>
+
+<%= render partial: "snippets/snippet/body", locals: { snippet: snippet} -%>

data/templates/default/snippets/snippet/_standalone.text.erb

@@ -0,0 +1,25 @@
+<%- assert_locals snippet -%>
+require "<%= snippet.require_path %>"
+
+##
+# <%= snippet.snippet_name %>
+#
+<%= indent wrap(snippet.disclaimer, 78), "# " %>
+#
+<%= indent wrap(snippet.description, 78), "# " %>
+<%- unless snippet.snippet_method_parameters.empty? -%>
+#
+<%- end -%>
+<%- snippet.snippet_method_parameters.each do |param| -%>
+# @param <%= param.name %> [<%= param.type.render %>]
+<%- if param.description -%>
+<%= indent wrap(param.description, 74), "#     " %>
+<%- end -%>
+<%- if param.example.exist? -%>
+#     (Example: `<%= param.example.render %>`)
+<%- end -%>
+<%- end -%>
+#
+def <%= snippet.snippet_method_name %><%= snippet.snippet_method_parameters_render %>
+<%= indent render(partial: "snippets/snippet/body", locals: { snippet: snippet }), "  " %>
+end

data/templates/default/snippets/{standalone.erb → standalone.text.erb}

@@ -2,5 +2,5 @@
 <%= render partial: "shared/header" -%>
 
 # [START <%= snippet.region_tag %>]
-<%= render partial: "snippets/snippet/structure", locals: { snippet: snippet} -%>
+<%= render partial: "snippets/snippet/standalone", locals: { snippet: snippet} -%>
 # [END <%= snippet.region_tag %>]