google-ads-googleads 2.2.0 → 2.2.1

data/lib/google/ads/google_ads/google_ads_client.rb

@@ -48,6 +48,7 @@ require 'google/ads/google_ads/wrapper_util'
 require 'google/ads/google_ads/logging_interceptor'
 require 'google/ads/google_ads/factories'
 require 'google/ads/google_ads/errors'
+require 'google/ads/google_ads/patch_lro_headers'
 
 require 'google/gax'
 
@@ -140,13 +141,33 @@ module Google
           end
 
           if name.nil?
-            Factories.at_version(version).services.new(
+            services = Factories.at_version(version).services.new(
               service_path: service_path,
               logging_interceptor: logging_interceptor,
               credentials: get_updater_proc,
               metadata: headers,
               exception_transformer: ERROR_TRANSFORMER
             )
+
+            patch_delegator = Class.new do
+              def initialize(services, headers, patch_callable)
+                @services = services
+                @headers = headers
+                @patch_callable = patch_callable
+              end
+
+              def respond_to_missing?(sym, include_private=false)
+                @services.respond_to?(sym, include_private)
+              end
+
+              def method_missing(name, *args)
+                @services.public_send(name, *args) do |cls|
+                  @patch_callable.call(cls, @headers)
+                  cls
+                end
+              end
+            end
+            patch_delegator.new(services, headers, method(:patch_lro_headers))
           else
             class_to_return = lookup_util.raw_service(name, version)
             class_to_return = Class.new(class_to_return) do
@@ -154,10 +175,11 @@ module Google
                 const_set('SERVICE_ADDRESS', service_path.freeze)
               end
 
-
               const_set('GRPC_INTERCEPTORS', [logging_interceptor].compact)
             end
 
+            patch_lro_headers(class_to_return, headers)
+
             class_to_return.new(
               credentials: get_updater_proc,
               metadata: headers,
@@ -166,6 +188,10 @@ module Google
           end
         end
 
+        def patch_lro_headers(class_to_return, headers)
+          PatchLROHeaders.new(class_to_return, headers).call
+        end
+
         # Return a resource or common entity for the provided entity type. For
         # example, passing :Campaign will return an instantiated Campaign.
         #

data/lib/google/ads/google_ads/patch_lro_headers.rb

@@ -0,0 +1,92 @@
+require 'google/gax'
+
+module Google
+  module Ads
+    module GoogleAds
+      class PatchLROHeaders
+        def initialize(class_to_return, headers)
+          @class_to_return = class_to_return
+          @headers = headers
+        end
+
+        def call
+          class_to_return = @class_to_return
+          headers = @headers
+          return unless defined?(class_to_return::OperationsClient)
+          opclient = class_to_return::OperationsClient
+
+          # This instance evaluates in OperationsClient class object
+          opclient.instance_eval do
+            h = headers
+            # This defines an instance variable on class_to_return::OperationsClient
+            # itself, not instances of that class
+            break if instance_variable_defined?(:@_patched_initialize)
+            @_patched_initialize = true
+
+            # This grabs the original instance method object that initializes
+            # this class (e.g. the autogenerated method in gax-ruby)
+            orig_initialize = instance_method(:initialize)
+
+            # Redefine that method to take anything (because our callers are
+            # autogenerated, and so we don't need to worry about these args
+            # being correct)
+            define_method(:initialize) do |*args, &blk|
+              h2 = h
+              # What we do in this next stanza is redefine construct_settings
+              # to merge headers in to the appopriate place, during the constructor
+              # execution, then invoke it, then put the implementation back.
+              orig_construct_settings = Google::Gax.method(:construct_settings)
+              begin
+                # Instance evaling in Google::Gax class object, not in instances
+                # of that object
+                Google::Gax.instance_eval do
+                  # start definition
+                  define_singleton_method(:construct_settings) do |
+                    service_names,
+                    client_config,
+                    config_overrides,
+                    retry_names,
+                    timeout,
+                    bundle_descriptors: {},
+                    page_descriptors: {},
+                    metadata: {},
+                    kwargs: {},
+                    errors: []|
+
+                  kwargs = kwargs.merge(h2)
+
+                  orig_construct_settings.call(
+                    service_names,
+                    client_config,
+                    config_overrides,
+                    retry_names,
+                    timeout,
+                    bundle_descriptors: bundle_descriptors,
+                    page_descriptors: page_descriptors,
+                    metadata: metadata,
+                    kwargs: kwargs,
+                    errors: errors
+                  )
+                  end
+                end
+
+                # orig_initialize was grabbed on the OperationsClient class,
+                # not on an OperationsClient instance, so we have to call
+                # bind here to scope that instance_method object to a method
+                # object on the instance
+                orig_initialize.bind(self).call(*args, &blk)
+              ensure
+                # undefine our hacked method, and put a delegator back
+                Google::Gax.instance_eval do
+                  undef construct_settings
+
+                  define_singleton_method(:construct_settings, &orig_construct_settings)
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/google/ads/google_ads/version.rb

@@ -19,7 +19,7 @@
 module Google
   module Ads
     module GoogleAds
-      CLIENT_LIB_VERSION = '2.2.0'.freeze
+      CLIENT_LIB_VERSION = '2.2.1'.freeze
     end
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: google-ads-googleads
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Google Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2019-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-gax
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +97,7 @@ files:
 - lib/google/ads/google_ads/logging_interceptor.rb
 - lib/google/ads/google_ads/lookup_util.rb
 - lib/google/ads/google_ads/partial_failure_error_decoder.rb
+- lib/google/ads/google_ads/patch_lro_headers.rb
 - lib/google/ads/google_ads/patches.rb
 - lib/google/ads/google_ads/utils/v1/path_lookup_util.rb
 - lib/google/ads/google_ads/utils/v1/proto_lookup_util.rb