gapic-generator 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cb3044a15ef0354c0aa76903f7bf51e1218b96b0ba7b5923c1b996119dcc5c5
-  data.tar.gz: 4a6b8fa141b8474ed05188f097febfe550901d00b832b153b9fcd3710f01c7a1
+  metadata.gz: d1b218438104bc5239538c96e90d05a84591a7517c7f8e3e01009b0a7c47bb76
+  data.tar.gz: dcfea920e8b059e62df55e305ee956182101e0531ea7c207d9a6d45589982d00
 SHA512:
-  metadata.gz: d8680d28265909b97ca6071a0a28165368d68f861ec4d13615abdf9931b063dfa336e5e8c382a12be24daa4f34b247e1b3da3c28a8550ff27366493ae4a9d113
-  data.tar.gz: 95057a02f066f096c326020e4fbd83bf9ca24f279722812072eefd34df8e2184fe6b72c8d785c37596f0a626279d73fea810fd5c793e96b49c8cbfeb0148ac2e
+  metadata.gz: ef95a59c0f4bfabaa7a479ddaf9eab02739c18e345fc03d33b8e4f50c9676c5aafb9facedfdb4cc2202e269c7724bf497297c72c67b48763fea251330315547f
+  data.tar.gz: cecd8d4c13b61a1be2578cee67b7f5601a83b6d4795228fce3c5d89f572351a773830a6fca6af07defcf3274633fecddbf23cb02a45503be64082d0296fd317d

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release History for gapic-generator
 
+### 0.6.9 / 2020-12-07
+
+* Load package-level handwritten helpers.
+* Disable Names/PredicateName rubocop rule.
+* Fix generated client tests when a request field name collides with a Ruby superclass method.
+
 ### 0.6.8 / 2020-09-16
 
 * Add samples tasks to generated gapic rakefiles.

data/lib/gapic/generator/version.rb

@@ -16,6 +16,6 @@
 
 module Gapic
   module Generator
-    VERSION = "0.6.8"
+    VERSION = "0.6.9"
   end
 end

data/lib/gapic/presenters/package_presenter.rb

@@ -80,9 +80,25 @@ module Gapic
         package_require + ".rb"
       end
 
+      def package_directory_name
+        package_require.split("/").last
+      end
+
       def empty?
         services.empty?
       end
+
+      def helpers_file_path
+        helpers_require + ".rb"
+      end
+
+      def helpers_file_name
+        "_helpers.rb"
+      end
+
+      def helpers_require
+        package_require + "/_helpers"
+      end
     end
   end
 end

data/templates/default/gem/rubocop.erb

@@ -25,6 +25,8 @@ Metrics/PerceivedComplexity:
 Naming/FileName:
   Exclude:
     - "lib/<%= gem.name %>.rb"
+Naming/PredicateName:
+  Enabled: false
 Style/AsciiComments:
   Enabled: false
 Style/CaseEquality:

data/templates/default/lib/_package.erb

@@ -15,3 +15,7 @@ require "<%= package.gem.version_require %>"
 <%- end -%>
 module <%= package.module_name %>
 end
+<% @footer = capture do %>
+helper_path = ::File.join __dir__, "<%= package.package_directory_name %>", "<%= package.helpers_file_name %>"
+require "<%= package.helpers_require %>" if ::File.file? helper_path
+<% end %>

data/templates/default/service/_helpers.erb

@@ -1,3 +1,3 @@
 <%- assert_locals service -%>
-helper_path = ::File.join __dir__, "<%= service.service_directory_name%>", "helpers.rb"
+helper_path = ::File.join __dir__, "<%= service.service_directory_name %>", "<%= service.helpers_file_name %>"
 require "<%= service.helpers_require %>" if ::File.file? helper_path

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

@@ -87,13 +87,13 @@ def test_<%= method.name %>
         assert_kind_of <%= method.request_type %>, r
         <%- fields.each do |field| -%>
         <%- if field.message? && field.repeated? && !field.map? -%>
-        assert_kind_of <%= field.type_name_full %>, r.<%= field.name %>.first
+        assert_kind_of <%= field.type_name_full %>, r["<%= field.name %>"].first
         <%- elsif field.map? -%>
-        assert_equal(<%= field.default_value %>, r.<%= field.name %>.to_h)
+        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 %>
+        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 %>
+        assert_equal <%= field.default_value %>, r["<%= field.name %>"]
         <%- end -%>
         <%- if field.oneof? && !field.proto3_optional? -%>
         assert_equal :<%= field.name %>, r.<%= field.oneof_name %>

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

@@ -71,13 +71,13 @@ def test_<%= method.name %>
         assert_kind_of <%= method.request_type %>, r
         <%- fields.each do |field| -%>
         <%- if field.message? && field.repeated? && !field.map? -%>
-        assert_kind_of <%= field.type_name_full %>, r.<%= field.name %>.first
+        assert_kind_of <%= field.type_name_full %>, r["<%= field.name %>"].first
         <%- elsif field.map? -%>
-        assert_equal(<%= field.default_value %>, r.<%= field.name %>.to_h)
+        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 %>
+        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 %>
+        assert_equal <%= field.default_value %>, r["<%= field.name %>"]
         <%- end -%>
         <%- if field.oneof? && !field.proto3_optional? -%>
         assert_equal :<%= field.name %>, r.<%= field.oneof_name %>

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

@@ -18,13 +18,13 @@ def test_<%= method.name %>
     assert_kind_of <%= method.request_type %>, request
     <%- fields.each do |field| -%>
     <%- if field.message? && field.repeated? && !field.map? -%>
-    assert_kind_of <%= field.type_name_full %>, request.<%= field.name %>.first
+    assert_kind_of <%= field.type_name_full %>, request["<%= field.name %>"].first
     <%- elsif field.map? -%>
-    assert_equal(<%= field.default_value %>, request.<%= field.name %>.to_h)
+    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 %>
+    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 %>
+    assert_equal <%= field.default_value %>, request["<%= field.name %>"]
     <%- end -%>
     <%- if field.oneof? && !field.proto3_optional? -%>
     assert_equal :<%= field.name %>, request.<%= field.oneof_name %>

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

@@ -18,13 +18,13 @@ def test_<%= method.name %>
     assert_kind_of <%= method.request_type %>, request
     <%- fields.each do |field| -%>
     <%- if field.message? && field.repeated? && !field.map? -%>
-    assert_kind_of <%= field.type_name_full %>, request.<%= field.name %>.first
+    assert_kind_of <%= field.type_name_full %>, request["<%= field.name %>"].first
     <%- elsif field.map? -%>
-    assert_equal(<%= field.default_value %>, request.<%= field.name %>.to_h)
+    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 %>
+    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 %>
+    assert_equal <%= field.default_value %>, request["<%= field.name %>"]
     <%- end -%>
     <%- if field.oneof? && !field.proto3_optional? -%>
     assert_equal :<%= field.name %>, request.<%= field.oneof_name %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gapic-generator
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Ernest Landrito
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack