google-ads-googleads 2.0.0 → 2.1.1

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

@@ -0,0 +1,32 @@
+require "google/ads/google_ads/factories/v1/resources"
+require "google/ads/google_ads/factories/v1/services"
+require "google/ads/google_ads/factories/v1/enums"
+require "google/ads/google_ads/factories/v1/operations"
+
+module Google
+  module Ads
+    module GoogleAds
+      module Factories
+        Factory = Struct.new(:resources, :services, :enums, :operations)
+
+        FACTORY_V1 = Factory.new(
+          V1::Resources,
+          V1::Services,
+          V1::Enums,
+          V1::Operations,
+        ).freeze
+
+        def self.at_version(version)
+          case version
+
+          when :V1
+            FACTORY_V1
+
+          else
+            raise ArgumentError.new("Got unkown version: #{version}")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -47,7 +47,7 @@ module Google
         def self.with(obj)
           raise 'nil cannot be compared' if obj.nil?
           original = obj.class.decode(obj.class.encode(obj))
-          yield
+          yield obj
           compare original, obj
         end
 

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

@@ -46,7 +46,7 @@ require 'google/ads/google_ads/field_mask_util'
 require 'google/ads/google_ads/lookup_util'
 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/gax'
@@ -108,26 +108,13 @@ module Google
         # :Campaign will return an instantiated CampaignServiceClient.
         #
         # Raises ArgumentError if no service can be found for the provided type.
-        def service(name, version = default_api_version)
+        def service(name=nil, version = default_api_version)
           service_path = ENV['GOOGLEADS_SERVICE_PATH']
 
           # We need a local reference to refer to from within the class block
           # below.
           logger = @logger
 
-          class_to_return = lookup_util.raw_service(name, version)
-          class_to_return = Class.new(class_to_return) do
-            unless service_path.nil? || service_path.empty?
-              const_set('SERVICE_ADDRESS', service_path.freeze)
-            end
-
-            if logger
-              logging_interceptor =
-                  Google::Ads::GoogleAds::LoggingInterceptor.new(logger)
-              const_set('GRPC_INTERCEPTORS', [logging_interceptor])
-            end
-          end
-
           headers = {
             :"developer-token" => @config.developer_token
           }
@@ -140,27 +127,60 @@ module Google
             end
             headers[:"login-customer-id"] = login_customer_id.to_s  # header values must be strings
           end
-          return class_to_return.new(
-            credentials: get_updater_proc(),
-            metadata: headers,
-            exception_transformer: ERROR_TRANSFORMER
-          )
+
+          if logger
+            logging_interceptor = Google::Ads::GoogleAds::LoggingInterceptor.new(logger)
+          end
+
+          if name.nil?
+            Factories.at_version(version).services.new(
+              service_path: service_path,
+              logging_interceptor: logging_interceptor,
+              credentials: get_updater_proc,
+              metadata: headers,
+              exception_transformer: ERROR_TRANSFORMER
+            )
+          else
+            class_to_return = lookup_util.raw_service(name, version)
+            class_to_return = Class.new(class_to_return) do
+              unless service_path.nil? || service_path.empty?
+                const_set('SERVICE_ADDRESS', service_path.freeze)
+              end
+
+
+              const_set('GRPC_INTERCEPTORS', [logging_interceptor].compact)
+            end
+
+            class_to_return.new(
+              credentials: get_updater_proc,
+              metadata: headers,
+              exception_transformer: ERROR_TRANSFORMER
+            )
+          end
         end
 
         # Return a resource or common entity for the provided entity type. For
         # example, passing :Campaign will return an instantiated Campaign.
         #
         # Raises ArgumentError if no entity can be found for the provided type.
-        def resource(name, version = default_api_version)
-          lookup_util.resource(name, version)
+        def resource(name=nil, version=default_api_version)
+          if name.nil?
+            Factories.at_version(version).resources
+          else
+            lookup_util.resource(name, version)
+          end
         end
 
         # Return an operation for the provided entity type. For example, passing
         # :Campaign will return an instantiated CampaignOperation.
         #
         # Raises ArgumentError if no entity can be found for the provided type.
-        def operation(name, version = default_api_version)
-          lookup_util.operation(name, version)
+        def operation(name=nil, version = default_api_version)
+          if name.nil?
+            Factories.at_version(version).operations
+          else
+            lookup_util.operation(name, version)
+          end
         end
 
         # Return a reference to the enum class for the provided enum type. For
@@ -168,8 +188,12 @@ module Google
         # CampaignStatusEnum.
         #
         # Raises ArgumentError if no enum can be found for the provided type.
-        def enum(name, version = default_api_version)
-          lookup_util.enum(name, version)
+        def enum(name=nil, version = default_api_version)
+          if name.nil?
+            Factories.at_version(version).enums
+          else
+            lookup_util.enum(name, version)
+          end
         end
 
         # Returns a reference to the FieldMaskUtil class for ease of access.
@@ -231,6 +255,14 @@ module Google
           raise gax_error
         end
 
+        def get_credentials()
+          if @config.authentication
+            @config.authentication
+          else
+            get_updater_proc
+          end
+        end
+
         # Provides the service a method by which to obtain an access token to
         # authenticate API requests.
         def get_updater_proc()

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-ads-googleads
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Google Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-01 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-gax
@@ -87,6 +87,11 @@ files:
 - lib/google/ads/google_ads/api_versions.rb
 - lib/google/ads/google_ads/config.rb
 - lib/google/ads/google_ads/errors.rb
+- lib/google/ads/google_ads/factories.rb
+- lib/google/ads/google_ads/factories/v1/enums.rb
+- lib/google/ads/google_ads/factories/v1/operations.rb
+- lib/google/ads/google_ads/factories/v1/resources.rb
+- lib/google/ads/google_ads/factories/v1/services.rb
 - lib/google/ads/google_ads/field_mask_util.rb
 - lib/google/ads/google_ads/google_ads_client.rb
 - lib/google/ads/google_ads/logging_interceptor.rb