google-ads-common 0.14.0 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3267da5cdfdc5eef0f5653e99c6bd8329addb03f
-  data.tar.gz: 06334b9e716c913d333d49089f30fd2fc2158823
+SHA256:
+  metadata.gz: 105410f3e4bdea53a3e819141c4334d2331adcd9246699bad442788b6a7ac3bf
+  data.tar.gz: 72f5eb5edd223e0543a2eeee3f7917558026e938ddf0ea339e451bc8a8b2c488
 SHA512:
-  metadata.gz: c1a6a5e280a2897d4443224111473de8f75a7db7550c9372364038418321c475473b50149e4d4f829e7be5f8b32445ed719fbdf39db8fa2b73df8ee57f4a9758
-  data.tar.gz: 9b1612f9cc4b39666296a48be14960801773d401763dceaaee115193b21531bb6462d3a788c43dad93b724cd4c4ca0c57929e3dc0154583309fc10d3a3b1c93a
+  metadata.gz: 6dcafb8db218d85af94fed06884a3c034c4b6880e8e96adb19fd1b0e952e4a8676768f292ca4e0a953006a1cdc78fd5d496db6aeb1e181bc397ae689dd18beea
+  data.tar.gz: 1fef047b46c77af316eafcfb2b8db1bcfee5588672823fd1e2c7f36e5b9f46902fe82c8f872f361264e13913b81429c58ea9db90778a5ad8b448ffdfbf1d8620

data/ChangeLog

@@ -1,3 +1,25 @@
+1.0.3:
+  - Updated rake dependency requirements.
+
+1.0.2:
+  - Added enumeration values to SOAP service registry objects (pull
+    request #153).
+
+1.0.1:
+  - Fixed issue #139. Library now gives a more appropriate warning when it
+    can't get an access token.
+
+1.0.0:
+  - Major version bump. The library has been stable and feature complete for
+    some time, and this is more accurately reflected by this version number.
+  - Throw explicit warning for disabled SSL peer verification.
+  - Small performance improvements for large requests.
+  - No longer include test files in the built gem.
+  - Removing support for multiple environments.
+
+0.14.1:
+  - Scrubbing an additional sensitive field present in some AdWords requests.
+
 0.14.0:
   - Standardizing logging format for requests, response, and summary.
 

data/README.md

@@ -68,7 +68,7 @@ Google Ads Developers Plus page:
 
 # Copyright/License Info
 
-Copyright 2010-2015, Google Inc. All Rights Reserved.
+Copyright 2010-2017, Google Inc. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/lib/ads_common/api.rb

@@ -70,10 +70,9 @@ module AdsCommon
     def service(name, version = nil)
       name = name.to_sym
       version = (version.nil?) ? api_config.default_version : version.to_sym
-      environment = @config.read('service.environment')
 
       # Check if the combination is available.
-      validate_service_request(environment, version, name)
+      validate_service_request(version, name)
 
       # Try to re-use the service for this version if it was requested before.
       wrapper = if @wrappers.include?(version) && @wrappers[version][name]
@@ -150,12 +149,11 @@ module AdsCommon
     private
 
     # Auxiliary method to test parameters correctness for the service request.
-    def validate_service_request(environment, version, service)
-      # Check if the current environment supports the requested version.
-      unless api_config.environment_has_version(environment, version)
+    def validate_service_request(version, service)
+      # Check if the current config supports the requested version.
+      unless api_config.has_version(version)
         raise AdsCommon::Errors::Error,
-            "Environment '%s' does not support version '%s'" %
-            [environment.to_s, version.to_s]
+            "Version '%s' not recognized" % version.to_s
       end
 
       # Check if the specified version has the requested service.
@@ -196,18 +194,14 @@ module AdsCommon
           raise AdsCommon::Errors::Error,
               'OAuth authorization method is deprecated, use OAuth2 instead.'
         when :OAUTH2
-          environment = @config.read('service.environment',
-              api_config.default_environment())
           AdsCommon::Auth::OAuth2Handler.new(
               @config,
-              api_config.environment_config(environment, :oauth_scope)
+              api_config.config(:oauth_scope)
           )
         when :OAUTH2_SERVICE_ACCOUNT
-          environment = @config.read('service.environment',
-              api_config.default_environment())
           AdsCommon::Auth::OAuth2ServiceAccountHandler.new(
               @config,
-              api_config.environment_config(environment, :oauth_scope)
+              api_config.config(:oauth_scope)
           )
         else
           raise AdsCommon::Errors::Error,
@@ -226,15 +220,13 @@ module AdsCommon
     # - a simplified wrapper generated for the service
     #
     def prepare_wrapper(version, service)
-      environment = config.read('service.environment')
       api_config.do_require(version, service)
-      endpoint = api_config.endpoint(environment, version, service)
+      endpoint = api_config.endpoint(version, service)
       interface_class_name = api_config.interface_name(version, service)
 
       wrapper = class_for_path(interface_class_name).new(@config, endpoint)
       auth_handler = get_auth_handler()
-      header_ns =
-          api_config.environment_config(environment, :header_ns) + version.to_s
+      header_ns = api_config.config(:header_ns) + version.to_s
       soap_handler = soap_header_handler(auth_handler, version, header_ns,
                                          wrapper.namespace)
       wrapper.header_handler = soap_handler
@@ -270,10 +262,8 @@ module AdsCommon
       provided_adapter = @config.read('connection.adapter')
       @config.set('connection.adapter', :httpclient) if provided_adapter.nil?
 
-      # Validating most important parameters.
-      ['service.environment', 'authentication.method'].each do |parameter|
-        symbolize_config_value(parameter)
-      end
+      # Make sure Auth param is a symbol.
+      symbolize_config_value('authentication.method')
     end
 
     # Converts value of a config key to uppercase symbol.

data/lib/ads_common/api_config.rb

@@ -42,14 +42,13 @@ module AdsCommon
       service_config.keys.select { |service| service.is_a? Integer }.max
     end
 
-    # Does the given environment exist and contain the given version?
+    # Does the current config contain the given version?
     #
     # Returns:
-    # Boolean indicating whether the given environment exists and contains the
-    # given version
+    # Boolean indicating whether the current config contains the given version
     #
-    def environment_has_version(environment, version)
-      return !environment_config(environment, version).nil?
+    def has_version(version)
+      return !config(version).nil?
     end
 
     # Does the given version exist and contain the given service?
@@ -94,33 +93,22 @@ module AdsCommon
       return api_name.to_s.snakecase
     end
 
-    # Get the default environment.
-    #
-    # Returns:
-    # Default environment
-    #
-    def default_environment
-      raise NotImplementedError, 'default_environment not overriden.'
-    end
-
     # Get the default filename for the config file.
     def default_config_filename
       raise NotImplementedError, 'default_config_filename not overriden.'
     end
 
-    # Get the endpoint for a service on a given environment and API version.
+    # Get the endpoint for a service on a given API version.
     #
     # Args:
-    # - environment: the service environment to be used
     # - version: the API version
     # - service: the name of the API service
     #
     # Returns:
     # The endpoint URL
     #
-    def endpoint(environment, version, service)
-      base = get_wsdl_base(environment, version)
-      # TODO(dklimkin): Unflatten subdir constants. Cross-API refactor 0.9.0.
+    def endpoint(version, service)
+      base = get_wsdl_base(version)
       if !subdir_config().nil?
         base = base.to_s + subdir_config()[[version, service]].to_s
       end
@@ -138,23 +126,9 @@ module AdsCommon
     #
     def subdir(version, service)
       return nil if subdir_config().nil?
-      # TODO(dklimkin): Unflatten subdir constants. Cross-API refactor 0.9.0.
       subdir_config()[[version, service]]
     end
 
-    # Get the authentication server details for an environment. Allows to
-    # override the auth URL via environmental variable.
-    #
-    # Args:
-    # - environment: the service environment to be used
-    #
-    # Returns:
-    # The full URL for the auth server
-    #
-    def auth_server(environment)
-      return ENV['ADSAPI_AUTH_URL'] || auth_server_config[environment]
-    end
-
     # Perform the loading of the necessary source files for a version.
     #
     # Args:
@@ -208,7 +182,7 @@ module AdsCommon
     #
     def get_wsdls(version)
       res = {}
-      wsdl_base = get_wsdl_base(default_environment(), version)
+      wsdl_base = get_wsdl_base(version)
       postfix = wsdl_base.start_with?('http') ? '?wsdl' : '.wsdl'
       services(version).each do |service|
         path = wsdl_base
@@ -226,15 +200,13 @@ module AdsCommon
     # the base URL via environmental variable.
     #
     # Args:
-    #   - environment: environment to use like :SANDBOX or :PRODUCTION
     #   - version: the API version
     #
     # Returns:
     #   String containing base URL
     #
-    def get_wsdl_base(environment, version)
-      return ENV['ADSAPI_BASE_URL'] ||
-          environment_config(environment, version)
+    def get_wsdl_base(version)
+      return ENV['ADSAPI_BASE_URL'] || config(version)
     end
   end
 end

data/lib/ads_common/auth/oauth2_handler.rb

@@ -77,6 +77,10 @@ module AdsCommon
       #
       def auth_string(credentials)
         token = get_token(credentials)
+        if token.nil?
+          raise AdsCommon::Errors::AuthError.new(
+            'Could not get auth token. Are you missing a refresh token?')
+        end
         return ::Signet::OAuth2.generate_bearer_authorization_header(
             token[:access_token])
       end

data/lib/ads_common/build/savon_registry.rb

@@ -145,6 +145,9 @@ module AdsCommon
             'sequence | complexContent/extension/sequence') do |seq_node|
           type[:fields] += get_element_fields(seq_node)
         end
+
+        extract_enumerations(type_element, type)
+
         REXML::XPath.each(type_element, 'choice') do |seq_node|
           type[:choices] ||= []
           type[:choices] += get_element_fields(seq_node)
@@ -152,6 +155,22 @@ module AdsCommon
         return type
       end
 
+      # Extracts all possible enumerations for a type and adds them as an
+      # `enumerations` key on the type.
+      def extract_enumerations(type_element, type)
+        REXML::XPath.each(type_element,
+            "restriction[@base='xsd:string']") do |enum_node|
+          type.delete(:fields)
+          type[:type] = enum_node.attribute('base').to_s.gsub(/^.+:/, '')
+        end
+        REXML::XPath.each(type_element,
+            "restriction[@base='xsd:string']/enumeration") do |enum_node|
+          type[:enumerations] ||= []
+          type[:enumerations] << enum_node.attribute('value').to_s
+        end
+        return type
+      end
+
       # Extracts input parameters of given method as an array.
       def extract_input_parameters(op_node, doc)
         op_name = get_element_name(op_node)

data/lib/ads_common/http.rb

@@ -120,6 +120,10 @@ module AdsCommon
       strict_ssl =
           config.read('connection.strict_ssl_verification', true)
       httpi.auth.ssl.verify_mode = strict_ssl ? :peer : :none
+      if logger && !strict_ssl
+        logger.warn('HTTPS peer validation is disabled. This is NOT ' +
+            'secure and NOT recommended.')
+      end
     end
   end
 end

data/lib/ads_common/savon_service.rb

@@ -33,6 +33,7 @@ module AdsCommon
 
     FALLBACK_API_ERROR_EXCEPTION = "ApiException"
     MAX_FAULT_LOG_LENGTH = 16000
+    REDACTED_STR = 'REDACTED'
 
     # Creates a new service.
     def initialize(config, endpoint, namespace, version)
@@ -201,35 +202,35 @@ module AdsCommon
         summary_message += ', Fault message: %s' % format_fault(
             response_hash[:envelope][:body][:fault][:faultstring])
         logger.warn(summary_message)
-        logger.info(request_message) if request_message
-        logger.info(response_message) if response_message
+        logger.info(request_message) unless request_message.nil?
+        logger.info(response_message) unless response_message.nil?
       else
         logger.info(summary_message)
-        logger.debug(request_message) if request_message
-        logger.debug(response_message) if response_message
+        logger.debug(request_message) unless request_message.nil?
+        logger.debug(response_message) unless response_message.nil?
       end
     end
 
     # Format headers, redacting sensitive information.
     def format_headers(headers)
       return headers.map do |k, v|
-        v = 'REDACTED' if k == 'Authorization'
+        v = REDACTED_STR if k == 'Authorization'
         [k, v].join(': ')
       end.join(', ')
     end
 
     # Sanitize the request body, redacting sensitive information.
     def sanitize_request(body)
-      body.gsub(/developerToken>[a-zA-Z0-9_\-]+<\//,
-          'developerToken>REDACTED</')
+      return body.gsub(/(developerToken>|httpAuthorizationHeader>)[^<]+(<\/)/,
+          '\1' + REDACTED_STR + '\2')
     end
 
     # Format the fault message by capping length and removing newlines.
     def format_fault(message)
-      message = message[0...MAX_FAULT_LOG_LENGTH] if
-          message.length > MAX_FAULT_LOG_LENGTH
-      message = message.gsub("\n", " ")
-      return message
+      if message.length > MAX_FAULT_LOG_LENGTH
+        message = message[0, MAX_FAULT_LOG_LENGTH]
+      end
+      return message.gsub("\n", ' ')
     end
 
     # Check whether or not to log request summaries based on log level.

data/lib/ads_common/utils.rb

@@ -23,8 +23,7 @@ module AdsCommon
 
       # Returns the String in lowerCamelCase.
       def lower_camelcase()
-        result = dup()
-        result.gsub!(/^([A-Z])/) {$1.downcase()}
+        result = gsub(/^([A-Z])/) {$1.downcase()}
         result.gsub!(/(?:_)([a-zA-Z\d])/) {$1.upcase()}
         return result
       end

data/lib/ads_common/version.rb

@@ -19,6 +19,6 @@
 
 module AdsCommon
   module ApiConfig
-    CLIENT_LIB_VERSION = '0.14.0'
+    CLIENT_LIB_VERSION = '1.0.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-ads-common
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 1.0.3
 platform: ruby
 authors:
 - Sergio Gomes
@@ -10,13 +10,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2020-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-ads-savon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
@@ -24,6 +27,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !ruby/object:Gem::Dependency
@@ -60,28 +66,90 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 12.3.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 12.3.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.10'
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 description: Essential utilities shared by all Ads Ruby client libraries
 email:
 - adwordsapiadvisor+michael@google.com
@@ -114,18 +182,6 @@ files:
 - lib/ads_common/savon_service.rb
 - lib/ads_common/utils.rb
 - lib/ads_common/version.rb
-- test/coverage.rb
-- test/suite_unittests.rb
-- test/test_config.rb
-- test/test_config.yml
-- test/test_credential_handler.rb
-- test/test_env.rb
-- test/test_oauth2_handler.rb
-- test/test_oauth2_service_account_handler.rb
-- test/test_parameters_validator.rb
-- test/test_results_extractor.rb
-- test/test_savon_service.rb
-- test/test_utils.rb
 homepage: https://github.com/googleads/google-api-ads-ruby
 licenses:
 - Apache-2.0
@@ -146,17 +202,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: google-ads-common
-rubygems_version: 2.4.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Common code for Google Ads APIs
-test_files:
-- test/test_savon_service.rb
-- test/test_config.rb
-- test/test_oauth2_service_account_handler.rb
-- test/test_credential_handler.rb
-- test/test_utils.rb
-- test/test_parameters_validator.rb
-- test/test_oauth2_handler.rb
-- test/test_env.rb
-- test/test_results_extractor.rb
+test_files: []