google-gax 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7271bd48161698b84de9f66e337c3742e44b765f75fa1344c2e59b3608359e65
-  data.tar.gz: d2483f6d0f41e82f6655a1d5893712785721b73b7c675772752f457c9de0986e
+  metadata.gz: 20b3e2d26842efe097aa2dcbfd5690fa3b577a4f40293344e6a126688ca6d6f7
+  data.tar.gz: afaad7f7b6779fae1d74ee7326cd2cfc1036cf39b850b016898d4d1bc7f52d84
 SHA512:
-  metadata.gz: 8b92de0ba1398fd9d71a7cdd66aa000975677996fefcfdcf4828d12c6fff7194c0b93da9178eaf26d51d924f77dc3b493ad3bffba5011d1e8ea7bfb670d92311
-  data.tar.gz: cf0103edeab0f7e8244b2e008d72974bb7562236281d6eed0ce2466740f48a56a433d934286d9205d89d84382003ace8f55527250cba09b4868b6b57b80b74e1
+  metadata.gz: b00b903385705b8dd29be713957384a73c034cd0f2becf7e6865bdfba4ce5f621842851610340e9db080d86691a39fc95a90bbcf824a5ce2c602498388fc2d70
+  data.tar.gz: 86ef7fc8840b8c16ed45fbba83a6f97a8eebe39549ef6dec78314c61402e8c5a8929ad7979a4819c2a305f76ff5b166e74b5083f14ce13fbe6cdcb1f4792e4a1

data/README.md

@@ -21,7 +21,12 @@ provide a more convenient and idiomatic API surface to callers.
 Ruby Versions
 ---------------
 
-gax-ruby is currently tested with Ruby 2.2.4.
+This library requires Ruby 2.4 or later.
+
+In general, this library supports Ruby versions that are considered current and
+supported by Ruby Core (that is, Ruby versions that are either in normal
+maintenance or in security maintenance).
+See https://www.ruby-lang.org/en/downloads/branches/ for further details.
 
 
 Contributing

data/lib/google/gax/settings.rb

@@ -511,7 +511,9 @@ module Google
         bundle_descriptor = bundle_descriptors[snake_name]
 
         defaults[snake_name] = CallSettings.new(
-          timeout: timeout,
+          timeout: calc_method_timeout(
+            timeout, method_config, overriding_method
+          ),
           retry_options: merge_retry_options(
             construct_retry(method_config,
                             service_config['retry_codes'],
@@ -533,11 +535,20 @@ module Google
       defaults
     end
 
+    # @private Determine timeout in seconds for the current method.
+    def calc_method_timeout(timeout, method_config, overriding_method)
+      timeout_override = method_config['timeout_millis']
+      if overriding_method && overriding_method.key?('timeout_millis')
+        timeout_override = overriding_method['timeout_millis']
+      end
+      timeout_override ? timeout_override / 1000 : timeout
+    end
+
     module_function :construct_settings, :construct_bundling,
                     :construct_retry, :upper_camel_to_lower_underscore,
-                    :merge_retry_options
+                    :merge_retry_options, :calc_method_timeout
     private_class_method :construct_bundling, :construct_retry,
                          :upper_camel_to_lower_underscore,
-                         :merge_retry_options
+                         :merge_retry_options, :calc_method_timeout
   end
 end

data/lib/google/gax/version.rb

@@ -29,6 +29,6 @@
 
 module Google
   module Gax
-    VERSION = '1.7.0'.freeze
+    VERSION = '1.8.0'.freeze
   end
 end

data/spec/google/gax/settings_spec.rb

@@ -63,6 +63,9 @@ A_CONFIG = {
         'SomeHTTPSPageStreamingMethod' => {
           'retry_codes_name' => 'bar_retry',
           'retry_params_name' => 'default'
+        },
+        'TimeoutMethod' => {
+          'timeout_millis' => 10_000
         }
       }
     }
@@ -119,6 +122,9 @@ describe Google::Gax do
     )
     expect(settings.metadata).to match('key' => 'value')
     expect(settings.errors).to match_array([StandardError])
+
+    settings = defaults['timeout_method']
+    expect(settings.timeout).to be(10)
   end
 
   it 'overrides settings' do
@@ -129,6 +135,9 @@ describe Google::Gax do
             'SomeHTTPSPageStreamingMethod' => nil,
             'BundlingMethod' => {
               'bundling' => nil
+            },
+            'TimeoutMethod' => {
+              'timeout_millis' => nil
             }
           }
         }
@@ -149,6 +158,9 @@ describe Google::Gax do
     expect(settings.timeout).to be(30)
     expect(settings.page_descriptor).to be_a(Google::Gax::PageDescriptor)
     expect(settings.retry_options).to be_nil
+
+    settings = defaults['timeout_method']
+    expect(settings.timeout).to be(30)
   end
 
   it 'overrides settings more precisely' do
@@ -174,6 +186,9 @@ describe Google::Gax do
             'BundlingMethod' => {
               'retry_params_name' => 'default',
               'retry_codes_name' => 'baz_retry'
+            },
+            'TimeoutMethod' => {
+              'timeout_millis' => 20_000
             }
           }
         }
@@ -205,5 +220,8 @@ describe Google::Gax do
     expect(settings.retry_options.retry_codes).to match_array(
       [RETRY_DICT['code_c']]
     )
+
+    settings = defaults['timeout_method']
+    expect(settings.timeout).to be(20)
   end
 end

metadata

@@ -1,62 +1,50 @@
 --- !ruby/object:Gem::Specification
 name: google-gax
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Google API Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: googleauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: grpc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.24'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.24'
 - !ruby/object:Gem::Dependency
   name: googleapis-common-protos
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.3.9
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -66,7 +54,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.3.9
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -76,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rly
   requirement: !ruby/object:Gem::Requirement
@@ -215,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="