gapic-generator 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7438b616f56c0f6c150b04d5facd7b77dea1ad988f4892bf2143f455a236653d
-  data.tar.gz: d3d836af88d5bc7ebc433c1a5da15690bd62ba2aabee75b8a647f2aa6e729287
+  metadata.gz: 53e29f5e9a5cd2e6c4cf68d8e28fe095b5a0f5155f7c892f0b9b5429914b5dfb
+  data.tar.gz: 5ea2ad00f9c340675f2bd4f1b16d02dbb5d2e2b7444b450d326993de263a1cc0
 SHA512:
-  metadata.gz: b8a752648197f7b2065bdcde4d9d5462660e8f073adcdd8687b1d9d8c55de34d86dfa69f8e118d51fb8d9a21d3a5c65a95586f633ed33b6db17529443eb429a8
-  data.tar.gz: 68dda5a00441de0c2e8645f9c3c0862d68bf8d96b5e379990c076edde6ea607466bdf95aeb9178e4e45c7be4b0384a94438745abd7596e9a90cd56eea4a5d289
+  metadata.gz: 8f975242f0242375263e065351763fb67594ba65fc571f882bb54ce1877a5e14ad1419ecaf75e5c58ea0c29c81f5e8becdef635f1013111b624acd3e06248e92
+  data.tar.gz: 10abc98e678f667815d6e325cb27d582d4cbe27f4037edc66cde40ae8eb76b0d7b6fc884258d8ec5473612d327059baffbea94f3e9edf1ba83ae29f2d988e655

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History for gapic-generator
 
+### 0.1.1 / 2020-03-09
+
+* Relax rake dependency.
+
 ### 0.1.0 / 2020-03-07
 
 * Generate default timeout and retry configs based on GRPC service configs.

data/lib/gapic/generator/version.rb

@@ -16,6 +16,6 @@
 
 module Gapic
   module Generator
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/gapic/grpc_service_config/parser.rb

@@ -26,8 +26,8 @@ module Gapic
     # usable by the microgenerator templates
     #
     module Parser
-      METHOD_CONFIG_JSON_KEY = "method_config"
-      RETRY_POLICY_JSON_KEY = "retry_policy"
+      METHOD_CONFIG_JSON_KEY = "methodConfig"
+      RETRY_POLICY_JSON_KEY = "retryPolicy"
 
       NAMES_JSON_KEY = "name"
       SERVICE_NAME_JSON_KEY = "service"
@@ -35,10 +35,10 @@ module Gapic
 
       TIMEOUT_JSON_KEY = "timeout"
 
-      INITIAL_DELAY_JSON_KEY = "initial_backoff"
-      MAX_DELAY_JSON_KEY = "max_backoff"
-      MULTIPLIER_JSON_KEY = "backoff_multiplier"
-      STATUS_CODES_JSON_KEY = "retryable_status_codes"
+      INITIAL_DELAY_JSON_KEY = "initialBackoff"
+      MAX_DELAY_JSON_KEY = "maxBackoff"
+      MULTIPLIER_JSON_KEY = "backoffMultiplier"
+      STATUS_CODES_JSON_KEY = "retryableStatusCodes"
 
 
       ##
@@ -52,21 +52,21 @@ module Gapic
         service_level_result = {}
         service_method_level_result = {}
 
-        if !service_config_json.nil? && service_config_json.key?(METHOD_CONFIG_JSON_KEY)
-          method_configs_json = service_config_json[METHOD_CONFIG_JSON_KEY]
+        if !service_config_json.nil? && key?(service_config_json, METHOD_CONFIG_JSON_KEY)
+          method_configs_json = get service_config_json, METHOD_CONFIG_JSON_KEY
 
           method_configs_json.each do |method_config_json|
             method_config = parse_config method_config_json
-            service_names = parse_service_names method_config_json[NAMES_JSON_KEY]
-            service_method_names = filter_service_method_names method_config_json[NAMES_JSON_KEY]
+            service_names = parse_service_names get(method_config_json, NAMES_JSON_KEY)
+            service_method_names = filter_service_method_names get(method_config_json, NAMES_JSON_KEY)
 
             service_names.each do |service_name|
               service_level_result[service_name] = method_config
             end
 
             service_method_names.each do |service_method_name|
-              service_name = service_method_name[SERVICE_NAME_JSON_KEY]
-              method_name = service_method_name[METHOD_NAME_JSON_KEY]
+              service_name = get service_method_name, SERVICE_NAME_JSON_KEY
+              method_name = get service_method_name, METHOD_NAME_JSON_KEY
 
               service_method_level_result[service_name] ||= {}
               service_method_level_result[service_name][method_name] = method_config
@@ -92,10 +92,10 @@ module Gapic
       #
       def self.parse_service_names method_config_json_names
         service_names_jsons = method_config_json_names.select do |names_json|
-          names_json.size == 1 && names_json.key?(SERVICE_NAME_JSON_KEY)
+          names_json.size == 1 && key?(names_json, SERVICE_NAME_JSON_KEY)
         end
 
-        service_names_jsons.map { |names_json| names_json[SERVICE_NAME_JSON_KEY] }
+        service_names_jsons.map { |names_json| get names_json, SERVICE_NAME_JSON_KEY }
       end
 
       ##
@@ -113,7 +113,7 @@ module Gapic
       #
       def self.filter_service_method_names method_config_json_names
         method_config_json_names.select do |names_json|
-          names_json.size == 2 && names_json.key?(SERVICE_NAME_JSON_KEY) && names_json.key?(METHOD_NAME_JSON_KEY)
+          names_json.size == 2 && key?(names_json, SERVICE_NAME_JSON_KEY) && key?(names_json, METHOD_NAME_JSON_KEY)
         end
       end
 
@@ -126,8 +126,8 @@ module Gapic
       # @return [Gapic::GrpcServiceConfig::MethodConfig] parsed MethodConfig
       #
       def self.parse_config method_config_json
-        timeout_seconds = parse_interval_seconds method_config_json[TIMEOUT_JSON_KEY]
-        retry_policy = parse_retry_policy method_config_json[RETRY_POLICY_JSON_KEY]
+        timeout_seconds = parse_interval_seconds get(method_config_json, TIMEOUT_JSON_KEY)
+        retry_policy = parse_retry_policy get(method_config_json, RETRY_POLICY_JSON_KEY)
 
         MethodConfig.new timeout_seconds, retry_policy
       end
@@ -143,10 +143,10 @@ module Gapic
       def self.parse_retry_policy retry_policy_json
         return nil if retry_policy_json.nil? || retry_policy_json.empty?
 
-        initial_delay_seconds = parse_interval_seconds retry_policy_json[INITIAL_DELAY_JSON_KEY]
-        max_delay_seconds = parse_interval_seconds retry_policy_json[MAX_DELAY_JSON_KEY]
-        multiplier = retry_policy_json[MULTIPLIER_JSON_KEY]
-        status_codes = retry_policy_json[STATUS_CODES_JSON_KEY]
+        initial_delay_seconds = parse_interval_seconds get(retry_policy_json, INITIAL_DELAY_JSON_KEY)
+        max_delay_seconds = parse_interval_seconds get(retry_policy_json, MAX_DELAY_JSON_KEY)
+        multiplier = get retry_policy_json, MULTIPLIER_JSON_KEY
+        status_codes = get retry_policy_json, STATUS_CODES_JSON_KEY
 
         RetryPolicy.new initial_delay_seconds, max_delay_seconds, multiplier, status_codes
       end
@@ -175,6 +175,28 @@ module Gapic
         Float(timestring_nos)
       end
 
+      ##
+      # Determines if the key or its underscore form exists
+      #
+      # @param hash [Hash] hash structure
+      # @param key [String] lowerCamelCase string
+      # @return [Boolean]
+      #
+      def self.key? hash, key
+        hash.key?(key) || hash.key?(ActiveSupport::Inflector.underscore(key))
+      end
+
+      ##
+      # Look up a key including checking its underscore form
+      #
+      # @param hash [Hash] hash structure
+      # @param key [String] lowerCamelCase string
+      # @return [Object] the result, or `nil` if not found
+      #
+      def self.get hash, key
+        hash[key] || hash[ActiveSupport::Inflector.underscore(key)]
+      end
+
       ##
       # Determines if a given string can be converted to a float
       #

data/templates/default/gem/gemspec.erb

@@ -30,7 +30,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "google-style", "~> 1.24.0"
   gem.add_development_dependency "minitest", "~> 5.10"
-  gem.add_development_dependency "rake", "~> 12.0"
+  gem.add_development_dependency "rake", ">= 12.0"
   gem.add_development_dependency "redcarpet", "~> 3.0"
   gem.add_development_dependency "simplecov", "~> 0.18"
   gem.add_development_dependency "yard", "~> 0.9"

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

@@ -2,27 +2,7 @@
 <%- method_service ||= service -%>
 @configure ||= begin
   default_config = <%= service.client_name %>::Configuration.new
-  <%- if service.grpc_service_config && !service.grpc_service_config.empty? -%>
-
-    <%- if service.grpc_service_config.timeout_seconds -%>
-      default_config.timeout = <%= service.grpc_service_config.timeout_seconds %>
-    <%- end -%>
-    <%- if service.grpc_service_config.retry_policy -%>
-      default_config.retry_policy = <%= indent_tail render(partial: "service/client/self_configure_retry_policy", locals: { retry_policy: service.grpc_service_config.retry_policy }), 2 %>
-    <%- end -%>
-  <%- end -%>
-  <%- method_service.methods.each do |method| -%>
-    <%- if method.grpc_service_config && !method.grpc_service_config.empty? -%>
-
-      <%- if method.grpc_service_config.timeout_seconds -%>
-        default_config.rpcs.<%= method.name %>.timeout = <%= method.grpc_service_config.timeout_seconds %>
-      <%- end -%>
-      <%- if method.grpc_service_config.retry_policy -%>
-        default_config.rpcs.<%= method.name %>.retry_policy =<%= indent_tail render(partial: "service/client/self_configure_retry_policy", locals: { retry_policy: method.grpc_service_config.retry_policy }), 2 %>
-      <%- end -%>
-    <%- end -%>
-  <%- end -%>
-
+  <%= render partial: "service/client/self_configure_defaults", locals: {service: service} %>
   default_config
 end
 yield @configure if block_given?

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

@@ -0,0 +1,22 @@
+<%- assert_locals service -%>
+<%- method_service ||= service -%>
+<%- if service.grpc_service_config && !service.grpc_service_config.empty? -%>
+
+  <%- if service.grpc_service_config.timeout_seconds -%>
+    default_config.timeout = <%= service.grpc_service_config.timeout_seconds %>
+  <%- end -%>
+  <%- if service.grpc_service_config.retry_policy -%>
+    default_config.retry_policy = <%= indent_tail render(partial: "service/client/self_configure_retry_policy", locals: { retry_policy: service.grpc_service_config.retry_policy }), 2 %>
+  <%- end -%>
+<%- end -%>
+<%- method_service.methods.each do |method| -%>
+  <%- if method.grpc_service_config && !method.grpc_service_config.empty? -%>
+
+    <%- if method.grpc_service_config.timeout_seconds -%>
+      default_config.rpcs.<%= method.name %>.timeout = <%= method.grpc_service_config.timeout_seconds %>
+    <%- end -%>
+    <%- if method.grpc_service_config.retry_policy -%>
+      default_config.rpcs.<%= method.name %>.retry_policy =<%= indent_tail render(partial: "service/client/self_configure_retry_policy", locals: { retry_policy: method.grpc_service_config.retry_policy }), 2 %>
+    <%- end -%>
+  <%- end -%>
+<%- end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gapic-generator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ernest Landrito
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-08 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -128,14 +128,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
 - !ruby/object:Gem::Dependency
@@ -278,6 +278,7 @@ files:
 - templates/default/service/client/_requires.erb
 - templates/default/service/client/_resource.erb
 - templates/default/service/client/_self_configure.erb
+- templates/default/service/client/_self_configure_defaults.erb
 - templates/default/service/client/_self_configure_retry_policy.erb
 - templates/default/service/client/method/_def.erb
 - templates/default/service/client/method/def/_options_defaults.erb