gapic-generator 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6eb09d3958e2bf3212a940df300ab29228dabdb7dabc31b1d9755eddee129c5b
-  data.tar.gz: e9431a7bc6f8680553e0bd682d68cdf6ec5fc61a6c564fec5c074f4884d362c9
+  metadata.gz: bd638c7b5855aa89dfd03c87f3f5d8d936d78005b51dd04a409ac7552e3eea05
+  data.tar.gz: 6372183134b8556a0a5ac7a4a6bf1250820c5b167b576454fae5f0228194078c
 SHA512:
-  metadata.gz: 554bdbb8d1b6ca6dbfb646656cb91dc5f1080d60e8e7103771ca8e3352f09e33a0b9ef3edd86547c173cfc98e18d45da1be8b9648aef40525b1bfb13c5579d62
-  data.tar.gz: c998693373a980357d17d540fdbaa891959666bfb2b2dd12b2843eb9b8df0bca1808259305c25614a3951f695b004fa28b862888e1e9e4fa706ce6cfcd2b4f5f
+  metadata.gz: 67b82518fe047ac185a3b596af6b3da223c774c96dbc6cb01761998920ca164e546bd72fc2222c6a945636c49e39a5b80ded892b821d493d79f40133fa973fa3
+  data.tar.gz: c316dd8c291a1204e73f18d7df06800734bf7e3690db5d5967e586cbaf0c215b02496a090a44eb5baee9b501fd418717312b8bb33d096fda5f5c6ef84e11d1fa

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Release History for gapic-generator
 
+### 0.4.2 / 2020-04-28
+
+* Prepend double-colon to absolute/global namespaces to prevent conflicts.
+* Fix documentation/examples of timeouts to clarify they are in seconds.
+
 ### 0.4.0 / 2020-04-20
 
 * Support generating clients of "common" interfaces by delegating to another service config.

data/lib/gapic/formatting_utils.rb

@@ -137,15 +137,15 @@ module Gapic
 
         case entity
         when Gapic::Schema::Service
-          "{#{convert_address_to_ruby entity}::Client #{text}}"
+          "{::#{convert_address_to_ruby entity}::Client #{text}}"
         when Gapic::Schema::Method
-          "{#{convert_address_to_ruby entity.parent}::Client##{entity.name.underscore} #{text}}"
+          "{::#{convert_address_to_ruby entity.parent}::Client##{entity.name.underscore} #{text}}"
         when Gapic::Schema::Message, Gapic::Schema::Enum
-          "{#{convert_address_to_ruby entity} #{text}}"
+          "{::#{convert_address_to_ruby entity} #{text}}"
         when Gapic::Schema::EnumValue
-          "{#{convert_address_to_ruby entity.parent}::#{entity.name} #{text}}"
+          "{::#{convert_address_to_ruby entity.parent}::#{entity.name} #{text}}"
         when Gapic::Schema::Field
-          "{#{convert_address_to_ruby entity.parent}##{entity.name} #{text}}"
+          "{::#{convert_address_to_ruby entity.parent}##{entity.name} #{text}}"
         end
       end
 
@@ -155,7 +155,7 @@ module Gapic
         address = entity.address
         address = address.join "." if address.is_a? Array
         address = address.sub file.package, file.ruby_package if file.ruby_package&.present?
-        address.split(".").reject(&:empty?).map(&:camelize).map { |node| api.fix_namespace node }.join("::")
+        address.split(/\.|::/).reject(&:empty?).map(&:camelize).map { |node| api.fix_namespace node }.join("::")
       end
     end
   end

data/lib/gapic/generator/version.rb

@@ -16,6 +16,6 @@
 
 module Gapic
   module Generator
-    VERSION = "0.4.0"
+    VERSION = "0.4.2"
   end
 end

data/lib/gapic/helpers/filepath_helper.rb

@@ -25,6 +25,7 @@ module Gapic
       ##
       # Converts a ruby namespace string to a file path string.
       def ruby_file_path api, namespace
+        namespace = namespace.sub(/^::/, "")
         file_path = ruby_file_path_for_namespace namespace
         fix_file_path api, file_path
       end

data/lib/gapic/helpers/namespace_helper.rb

@@ -38,7 +38,14 @@ module Gapic
       # Ruby double-semicolon separators.
       def ruby_namespace_for_address address
         address = address.split "." if address.is_a? String
-        address.reject(&:empty?).map(&:camelize).join "::"
+        ensure_absolute_namespace address.reject(&:empty?).map(&:camelize).join("::")
+      end
+
+      ##
+      # Returns the given namespace, ensuring double colons are prepended
+      #
+      def ensure_absolute_namespace namespace
+        namespace.start_with?("::") ? namespace : "::#{namespace}"
       end
 
       ##

data/lib/gapic/presenters/field_presenter.rb

@@ -95,21 +95,21 @@ module Gapic
         base_type =
           if field.message?
             type = message_ruby_type field.message
-            output ? type : "#{type}, Hash"
+            output ? type : "#{type}, ::Hash"
           elsif field.enum?
             # TODO: handle when arg message is nil and enum is the type
             message_ruby_type field.enum
           else
             case field.type
-            when 1, 2                              then "Float"
-            when 3, 4, 5, 6, 7, 13, 15, 16, 17, 18 then "Integer"
-            when 9, 12                             then "String"
-            when 8                                 then "Boolean"
+            when 1, 2                              then "::Float"
+            when 3, 4, 5, 6, 7, 13, 15, 16, 17, 18 then "::Integer"
+            when 9, 12                             then "::String"
+            when 8                                 then "::Boolean"
             else
-              "Object"
+              "::Object"
             end
           end
-        field.repeated? ? "Array<#{base_type}>" : base_type
+        field.repeated? ? "::Array<#{base_type}>" : base_type
       end
 
       def field_map_type entry_message, output
@@ -118,7 +118,7 @@ module Gapic
           key_field = field if field.name == "key"
           value_field = field if field.name == "value"
         end
-        class_name = output ? "Google::Protobuf::Map" : "Hash"
+        class_name = output ? "::Google::Protobuf::Map" : "::Hash"
         if key_field && value_field
           key_type = field_doc_types key_field, output
           value_type = field_doc_types value_field, output
@@ -141,7 +141,7 @@ module Gapic
           when 9, 12                             then "\"hello world\""
           when 8                                 then "true"
           else
-            "Object"
+            "::Object"
           end
         end
       end

data/lib/gapic/presenters/file_presenter.rb

@@ -39,7 +39,7 @@ module Gapic
       end
 
       def namespace
-        return @file.ruby_package if @file.ruby_package.present?
+        return ensure_absolute_namespace @file.ruby_package if @file.ruby_package.present?
         ruby_namespace_for_address address
       end
 

data/lib/gapic/presenters/method_presenter.rb

@@ -64,13 +64,13 @@ module Gapic
 
       def doc_response_type
         ret = return_type
-        ret = "Gapic::Operation" if lro?
+        ret = "::Gapic::Operation" if lro?
         if server_streaming?
-          ret = "Enumerable<#{ret}>"
+          ret = "::Enumerable<#{ret}>"
         elsif paged?
           paged_type = paged_response_type
-          paged_type = "Gapic::Operation" if paged_type == "Google::Longrunning::Operation"
-          ret = "Gapic::PagedEnumerable<#{paged_type}>"
+          paged_type = "::Gapic::Operation" if paged_type == "::Google::Longrunning::Operation"
+          ret = "::Gapic::PagedEnumerable<#{paged_type}>"
         end
         ret
       end
@@ -123,7 +123,7 @@ module Gapic
           return [
             OpenStruct.new(
               name:      "operation",
-              doc_types: "Gapic::Operation"
+              doc_types: "::Gapic::Operation"
             )
           ]
         end
@@ -134,7 +134,7 @@ module Gapic
           ),
           OpenStruct.new(
             name:      "operation",
-            doc_types: "GRPC::ActiveCall::Operation"
+            doc_types: "::GRPC::ActiveCall::Operation"
           )
         ]
       end
@@ -150,9 +150,9 @@ module Gapic
       end
 
       def lro?
-        return paged_response_type == "Google::Longrunning::Operation" if paged?
+        return paged_response_type == "::Google::Longrunning::Operation" if paged?
 
-        message_ruby_type(@method.output) == "Google::Longrunning::Operation"
+        message_ruby_type(@method.output) == "::Google::Longrunning::Operation"
       end
 
       def client_streaming?
@@ -226,12 +226,12 @@ module Gapic
           message_ruby_type arg.enum
         else
           case arg.type
-          when 1, 2                              then "Float"
-          when 3, 4, 5, 6, 7, 13, 15, 16, 17, 18 then "Integer"
-          when 9, 12                             then "String"
-          when 8                                 then "Boolean"
+          when 1, 2                              then "::Float"
+          when 3, 4, 5, 6, 7, 13, 15, 16, 17, 18 then "::Integer"
+          when 9, 12                             then "::String"
+          when 8                                 then "::Boolean"
           else
-            "Object"
+            "::Object"
           end
         end
       end
@@ -256,7 +256,7 @@ module Gapic
           when 9, 12                             then "\"hello world\""
           when 8                                 then "true"
           else
-            "Object"
+            "::Object"
           end
         end
       end

data/lib/gapic/presenters/service_presenter.rb

@@ -74,7 +74,7 @@ module Gapic
         # into the KMS namespace.
         return common_service_delegate.namespace if common_service_delegate
 
-        return @service.ruby_package if @service.ruby_package.present?
+        return ensure_absolute_namespace @service.ruby_package if @service.ruby_package.present?
 
         namespace = ruby_namespace_for_address @service.address[0...-1]
         fix_namespace @api, namespace
@@ -95,7 +95,7 @@ module Gapic
       # The namespace of the protos. This may be different from the client
       # namespace for a common service.
       def proto_namespace
-        return @service.ruby_package if @service.ruby_package.present?
+        return ensure_absolute_namespace @service.ruby_package if @service.ruby_package.present?
 
         namespace = ruby_namespace_for_address @service.address[0...-1]
         @api.override_proto_namespaces? ? fix_namespace(@api, namespace) : namespace

data/templates/default/layouts/_ruby.erb

@@ -5,12 +5,13 @@
 <%= @requires -%>
 <%- end -%>
 
-<%- namespace.split("::").each_with_index do |ns, i| -%>
+<%- namespace_components = namespace.split("::").reject(&:empty?) -%>
+<%- namespace_components.each_with_index do |ns, i| -%>
 <%= indent "module #{ns}", i*2 %>
 <%- end -%>
-<%= indent yield, namespace.split("::").count*2 %>
-<%- namespace.split("::").count.times do |i| -%>
-<%= indent "end", (namespace.split("::").count-1-i)*2 %>
+<%= indent yield, namespace_components.count*2 %>
+<%- namespace_components.count.times do |i| -%>
+<%= indent "end", (namespace_components.count-1-i)*2 %>
 <%- end -%>
 <%- if instance_variable_defined? :@footer -%>
 

data/templates/default/proto_docs/_message.erb

@@ -10,8 +10,8 @@
 <%- end -%>
 <%- end -%>
 class <%= message.name %>
-  include Google::Protobuf::MessageExts
-  extend Google::Protobuf::MessageExts::ClassMethods
+  include ::Google::Protobuf::MessageExts
+  extend ::Google::Protobuf::MessageExts::ClassMethods
   <%- message.nested_messages.each do |submsg| -%>
 
   <%= indent_tail render(partial: "proto_docs/message", locals: { message: submsg }), 2 %>

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

@@ -29,7 +29,7 @@ class <%= service.client_name %>
   # To modify the configuration for all <%= service.name %> clients:
   #
   #     <%= service.client_name_full %>.configure do |config|
-  #       config.timeout = 10_000
+  #       config.timeout = 10.0
   #     end
   #
   # @yield [config] Configure the <%= service.client_name %> client.
@@ -75,7 +75,7 @@ class <%= service.client_name %>
   # configuration:
   #
   #     client = <%= service.client_name_full %>.new do |config|
-  #       config.timeout = 10_000
+  #       config.timeout = 10.0
   #     end
   #
   # @yield [config] Configure the <%= service.name %> client.
@@ -109,7 +109,7 @@ class <%= service.client_name %>
     end
 
     <%- end -%>
-    @<%= service.stub_name %> = Gapic::ServiceStub.new(
+    @<%= service.stub_name %> = ::Gapic::ServiceStub.new(
       <%= service.proto_service_stub_name_full %>,
       credentials:  credentials,
       endpoint:     @config.endpoint,

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

@@ -20,22 +20,22 @@
 # to 20 seconds, and all remaining timeouts to 10 seconds:
 #
 #     <%= service.client_name_full %>.configure do |config|
-#       config.timeout = 10_000
-#       config.rpcs.<%= method_service.methods.first.name %>.timeout = 20_000
+#       config.timeout = 10.0
+#       config.rpcs.<%= method_service.methods.first.name %>.timeout = 20.0
 #     end
 #
 # To apply the above configuration only to a new client:
 #
 #     client = <%= service.client_name_full %>.new do |config|
-#       config.timeout = 10_000
-#       config.rpcs.<%= method_service.methods.first.name %>.timeout = 20_000
+#       config.timeout = 10.0
+#       config.rpcs.<%= method_service.methods.first.name %>.timeout = 20.0
 #     end
 #
 <%- end -%>
 # @!attribute [rw] endpoint
 #   The hostname or hostname:port of the service endpoint.
 #   Defaults to `<%= service.client_endpoint.inspect %>`.
-#   @return [String]
+#   @return [::String]
 # @!attribute [rw] credentials
 #   Credentials to send with calls. You may provide any of the following types:
 #    *  (`String`) The path to a service account key file in JSON format
@@ -47,29 +47,29 @@
 #    *  (`GRPC::Core::Channel`) a gRPC channel with included credentials
 #    *  (`GRPC::Core::ChannelCredentials`) a gRPC credentails object
 #    *  (`nil`) indicating no credentials
-#   @return [Object]
+#   @return [::Object]
 # @!attribute [rw] scope
 #   The OAuth scopes
-#   @return [Array<String>]
+#   @return [::Array<::String>]
 # @!attribute [rw] lib_name
 #   The library name as recorded in instrumentation and logging
-#   @return [String]
+#   @return [::String]
 # @!attribute [rw] lib_version
 #   The library version as recorded in instrumentation and logging
-#   @return [String]
+#   @return [::String]
 # @!attribute [rw] channel_args
 #   Extra parameters passed to the gRPC channel. Note: this is ignored if a
 #   `GRPC::Core::Channel` object is provided as the credential.
-#   @return [Hash]
+#   @return [::Hash]
 # @!attribute [rw] interceptors
 #   An array of interceptors that are run before calls are executed.
-#   @return [Array<GRPC::ClientInterceptor>]
+#   @return [::Array<::GRPC::ClientInterceptor>]
 # @!attribute [rw] timeout
-#   The call timeout in milliseconds.
-#   @return [Numeric]
+#   The call timeout in seconds.
+#   @return [::Numeric]
 # @!attribute [rw] metadata
 #   Additional gRPC headers to be sent with the call.
-#   @return [Hash{Symbol=>String}]
+#   @return [::Hash{::Symbol=>::String}]
 # @!attribute [rw] retry_policy
 #   The retry policy. The value is a hash with the following keys:
 #    *  `:initial_delay` (*type:* `Numeric`) - The initial delay in seconds.
@@ -77,10 +77,10 @@
 #    *  `:multiplier` (*type:* `Numeric`) - The incremental backoff multiplier.
 #    *  `:retry_codes` (*type:* `Array<String>`) - The error codes that should
 #       trigger a retry.
-#   @return [Hash]
+#   @return [::Hash]
 #
 class Configuration
-  extend Gapic::Config
+  extend ::Gapic::Config
 
   config_attr :endpoint,     <%= service.client_endpoint.inspect %>, String
   config_attr :credentials,  nil do |value|
@@ -88,14 +88,14 @@ class Configuration
     allowed += [::GRPC::Core::Channel, ::GRPC::Core::ChannelCredentials] if defined? ::GRPC
     allowed.any? { |klass| klass === value }
   end
-  config_attr :scope,        nil, String, Array, nil
-  config_attr :lib_name,     nil, String, nil
-  config_attr :lib_version,  nil, String, nil
-  config_attr(:channel_args, <%= service.config_channel_args.inspect %>, Hash, nil)
-  config_attr :interceptors, nil, Array, nil
-  config_attr :timeout,      nil, Numeric, nil
-  config_attr :metadata,     nil, Hash, nil
-  config_attr :retry_policy, nil, Hash, Proc, nil
+  config_attr :scope,        nil, ::String, ::Array, nil
+  config_attr :lib_name,     nil, ::String, nil
+  config_attr :lib_version,  nil, ::String, nil
+  config_attr(:channel_args, <%= service.config_channel_args.inspect %>, ::Hash, nil)
+  config_attr :interceptors, nil, ::Array, nil
+  config_attr :timeout,      nil, ::Numeric, nil
+  config_attr :metadata,     nil, ::Hash, nil
+  config_attr :retry_policy, nil, ::Hash, Proc, nil
 
   # @private
   def initialize parent_config = nil
@@ -137,7 +137,7 @@ class Configuration
   <%- method_service.methods.each do |method| -%>
     ##
     # RPC-specific configuration for `<%= method.name %>`
-    # @return [Gapic::Config::Method]
+    # @return [::Gapic::Config::Method]
     #
     attr_reader :<%= method.name %>
   <%- end -%>
@@ -146,7 +146,7 @@ class Configuration
     def initialize parent_rpcs = nil
       <%- method_service.methods.each do |method| -%>
       <%= method.name %>_config = parent_rpcs&.<%= method.name %> if parent_rpcs&.respond_to? :<%= method.name %>
-      @<%= method.name %> = Gapic::Config::Method.new <%= method.name %>_config
+      @<%= method.name %> = ::Gapic::Config::Method.new <%= method.name %>_config
       <%- end -%>
 
       yield self if block_given?

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

@@ -3,7 +3,7 @@
 require "googleauth"
 <% end %>
 # Credentials for the <%= service.name %> API.
-class <%= service.credentials_name %> < Google::Auth::Credentials
+class <%= service.credentials_name %> < ::Google::Auth::Credentials
   <%- if service.client_scopes.any? -%>
   self.scope = [
   <%- service.client_scopes.each_with_index do |client_scope, index| -%>

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

@@ -65,7 +65,7 @@ class <%= service.operations_name %>
       credentials = Credentials.new credentials, scope: @config.scope
     end
 
-    @<%= 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/_multi.erb

@@ -8,7 +8,7 @@
 <%= 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 -%>
@@ -23,6 +23,6 @@ def <%= resource.path_helper %> **args
   }
 
   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,7 +4,7 @@
 #
 <%= indent render(partial: "service/client/resource/doc", locals: { pattern: resource.patterns.first }), "# " %>
 #
-# @return [String]
+# @return [::String]
 <%- args = resource.patterns.first.arguments.map { |arg| "#{arg}:" }.join ", " -%>
 def <%= resource.path_helper %> <%= args %>
 <%= indent render(partial: "service/client/resource/def", locals: { pattern: resource.patterns.first }), 2 %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gapic-generator
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 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-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -351,7 +351,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!