google-ads-common 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aca8bb491bb1979f93711715859c97790db6fdf9
-  data.tar.gz: 78ffbb5fa2fbda4985340f38a8ad9632756e5ce9
+  metadata.gz: 10caed5a26897a25b34a734be2e882529abc2441
+  data.tar.gz: f6e2f2cc9495b2998e84a4a1e47e3934a354f161
 SHA512:
-  metadata.gz: 2a2daef0667e200028665475490329dfe8cba0b90d737d9b07ef77819e42922d0f2a30fb5243192ae259137fefb53f8c3e40f95906db823740bd766a14bf7f39
-  data.tar.gz: 96ec439dbabb8ad81b4085460f2329e8d6ecebb8635fe0103471dc892423277d32dd3a5086aea4e3f724cb46a443fe373609f19cf94e54669dc294d397aaf909
+  metadata.gz: 31cafd81ea5bb9e67fef47cc9f407d86b1a6e14affc28e1afadf51ca172dd9ffd353d7082bee6ddbd1992332a12d9116957fdf939b784a38cb50b162a66c9ecf
+  data.tar.gz: 3aa55e15e0253bcf914a231bedb054171bc1f99148ab45b6f21bad8ec6b89df94a66b6ba21bbe89f3d9628d3f2d987f87fe0d73bc941c369075ab57e5e34f94f

data/ChangeLog

@@ -1,3 +1,8 @@
+0.11.2:
+  - Updated required version of ads_savon to 1.0.1 to fix issue #74.
+  - Updated default adapter for httpi to httpclient, to fix various errors
+    with parsing responses.
+
 0.11.1:
   - Added streaming get and post options to AdsCommon::Http.
   - Added ability to support put requests to AdsCommon::Http.

data/README.md

@@ -21,6 +21,7 @@ The following gem libraries are required:
 
  - google-ads-savon
  - httpi
+ - httpclient
  - signet
 
 

data/lib/ads_common/api.rb

@@ -263,6 +263,10 @@ module AdsCommon
       self.logger = (provided_logger.nil?) ?
           create_default_logger() : provided_logger
 
+      # Set up default HTTPI adapter.
+      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)

data/lib/ads_common/api_config.rb

@@ -209,13 +209,14 @@ module AdsCommon
     def get_wsdls(version)
       res = {}
       wsdl_base = get_wsdl_base(default_environment(), version)
+      postfix = wsdl_base.start_with?('http') ? '?wsdl' : '.wsdl'
       services(version).each do |service|
         path = wsdl_base
         if (!subdir_config().nil?)
           subdir_name = subdir(version, service);
           path = path + subdir_name if subdir_name and !subdir_name.empty?
         end
-        path = path + version.to_s + '/' + service.to_s + '?wsdl'
+        path = path + version.to_s + '/' + service.to_s + postfix
         res[service.to_s] = path
       end
       return res

data/lib/ads_common/build/savon_generator.rb

@@ -68,7 +68,10 @@ module AdsCommon
       # Returns:
       # - none
       def process_wsdl()
-        client = GoogleAdsSavon::Client.new(@wsdl_url)
+        proxy_path = get_proxy_path()
+        client = GoogleAdsSavon::Client.new(@wsdl_url) do |_, httpi|
+          httpi.proxy = proxy_path unless proxy_path.nil? || proxy_path.empty?
+        end
         begin
           @generator_args[:namespace] = client.wsdl.namespace
           do_process_wsdl_client(client)
@@ -137,6 +140,10 @@ module AdsCommon
         dir_name = File.dirname(path)
         Dir.mkdir(dir_name) if !File.directory?(dir_name)
       end
+
+      def get_proxy_path()
+        return ENV['ADSAPI_PROXY']
+      end
     end
   end
 end

data/lib/ads_common/build/savon_registry_generator.rb

@@ -29,7 +29,7 @@ module AdsCommon
       #
       # This is auto-generated code, changes will be overwritten.
       #
-      # Copyright:: Copyright 2015, Google Inc. All Rights Reserved.
+      # Copyright:: Copyright 2016, Google Inc. All Rights Reserved.
       # License:: Licensed under the Apache License, Version 2.0.
       #
       # <%= @generator_stamp %>

data/lib/ads_common/build/savon_service_generator.rb

@@ -29,7 +29,7 @@ module AdsCommon
       #
       # This is auto-generated code, changes will be overwritten.
       #
-      # Copyright:: Copyright 2015, Google Inc. All Rights Reserved.
+      # Copyright:: Copyright 2016, Google Inc. All Rights Reserved.
       # License:: Licensed under the Apache License, Version 2.0.
       #
       # <%= @generator_stamp %>

data/lib/ads_common/version.rb

@@ -19,6 +19,6 @@
 
 module AdsCommon
   module ApiConfig
-    CLIENT_LIB_VERSION = '0.11.1'
+    CLIENT_LIB_VERSION = '0.11.2'
   end
 end

data/test/test_env.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+# Encoding: utf-8
+#
+# Copyright:: Copyright 2016, Google Inc. All Rights Reserved.
+#
+# License:: Licensed under the Apache License, Version 2.0 (the "License");
+#           you may not use this file except in compliance with the License.
+#           You may obtain a copy of the License at
+#
+#           http://www.apache.org/licenses/LICENSE-2.0
+#
+#           Unless required by applicable law or agreed to in writing, software
+#           distributed under the License is distributed on an "AS IS" BASIS,
+#           WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+#           implied.
+#           See the License for the specific language governing permissions and
+#           limitations under the License.
+#
+# Tests environment is correct.
+
+require 'openssl'
+require 'test/unit'
+
+class TestEnv < Test::Unit::TestCase
+
+  # Output ruby interpreter version to the tests log.
+  def test_ruby_version
+    puts "\nRunning tests with %s-%s-%s.\n" %
+        [RUBY_ENGINE, RUBY_VERSION, RUBY_PATCHLEVEL]
+  end
+
+  # Output SSL version to the tests log. There is a known issue with this
+  # required property not defined in some JRuby implementations.
+  def test_openssl_version
+    puts "\nUsing OpenSSL %s with %d methods.\n" %
+        [OpenSSL::OPENSSL_VERSION, OpenSSL::SSL::SSLContext::METHODS.count]
+  end
+end

data/test/test_oauth2_handler.rb

@@ -21,11 +21,14 @@
 require 'time'
 
 require 'ads_common/auth/oauth2_handler'
+require 'ads_common/config'
 require 'webmock/test_unit'
 
 module AdsCommon
   module Auth
     class OAuth2Handler
+      attr_reader :scopes
+
       def client()
         @client
       end
@@ -56,7 +59,7 @@ class TestOAuth < Test::Unit::TestCase
   end
 
   def test_string_issued_at()
-    handler = AdsCommon::Auth::OAuth2Handler.new('', {})
+    handler = AdsCommon::Auth::OAuth2Handler.new(AdsCommon::Config.new(), nil)
 
     # Modify @client in the handler to get around a full setup.
     handler.setup_client()
@@ -69,4 +72,13 @@ class TestOAuth < Test::Unit::TestCase
       token = handler.refresh_token!();
     end
   end
+
+  def test_additional_scopes()
+    config = AdsCommon::Config.new()
+    config.set('authentication.oauth2_extra_scopes', ['extra-scope'])
+    handler = AdsCommon::Auth::OAuth2Handler.new(config, 'base-scope')
+    scopes = handler.scopes
+    assert(scopes.include?('base-scope'), 'Missing base scope.')
+    assert(scopes.include?('extra-scope'), 'Missing extra scope.')
+  end
 end

data/test/test_savon_service.rb

@@ -20,6 +20,10 @@
 
 require 'test/unit'
 
+# Work around jruby <= 1.7.8 issue with OpenSSL definition.
+require 'openssl'
+OpenSSL::SSL::SSLContext::METHODS = []
+
 require 'ads_common/config'
 require 'ads_common/savon_service'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-ads-common
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Sergio Gomes
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-ads-savon
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: httpi
   requirement: !ruby/object:Gem::Requirement
@@ -40,6 +40,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: signet
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +118,7 @@ files:
 - test/test_config.rb
 - test/test_config.yml
 - test/test_credential_handler.rb
+- test/test_env.rb
 - test/test_oauth2_handler.rb
 - test/test_parameters_validator.rb
 - test/test_results_extractor.rb
@@ -140,4 +155,5 @@ test_files:
 - test/test_utils.rb
 - test/test_parameters_validator.rb
 - test/test_oauth2_handler.rb
+- test/test_env.rb
 - test/test_results_extractor.rb