google-ads-common 0.9.5 → 0.9.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTIxOTRkZDQzYjY0YTM4OGU3MDczNGY1NjBlYzkyYTE2ZDkyNGFmNQ==
+    Y2VjOTE1ODA4OGQzOGY2NmU4MDczOWE4OTYwMzUwMDgzNTg3YzU0OQ==
   data.tar.gz: !binary |-
-    NTVhYTM0YTkyNGI1MWNiOWVmZWEyOTY1OGNlMjNkY2E1ZWZmMjNiNA==
-!binary "U0hBNTEy":
+    MzFiODExZTFhOTQ3OGI5NzU3NWFmYzRiYzZmOWRkOGFjYjhkM2U0NQ==
+SHA512:
   metadata.gz: !binary |-
-    M2RkZDk2MTM4N2U5MjI1ZDk3MzUxNzM5YWM3MjkwOWEyNjUxNGZmYmM1MjA2
-    NDkwN2FmOTEwMmEwMGFjN2M4YTJjMTc2Y2FjODVkMTVkMTlhZmIwMjI4NWJk
-    YmM2MWUyNGZjY2VkYWFmN2JkNTkyMTFkMmY4ZmQxN2RiNWE2Njg=
+    ZWE4MDc2MTQzNjEyMDRhNzE2ZjhkZTI0ODhjM2Y3ZDIzMDAyMjIyZmYyNThi
+    Y2JjODZjNjQ3ZmNkZGZjZDA0Mjk1YWUzMTZlNTVjMDBhZDNjNTAwOWQwZWY3
+    M2EwOTRiMzdhYzk5MDQ1M2JlOWFmOGMxODgwOWJhY2EyZDUzYTc=
   data.tar.gz: !binary |-
-    YTAxZWMyN2I2OGNkNDRkY2Y3ZWIzMmE3MmE1NzcwZWM5NDVlNzI4ZjMzMGI0
-    Yzc3NTE0MmI2NjY5ZTAyMmMwMmM2YjFkOWVjMDc4NmM3OTU4ZDQzYzczMjU5
-    ZjhkYjRlMWIyMzBjOTM1MzcyYWY0NTU5ZWZkYzAxMDhkZDRhMTM=
+    ZWM4MmQxYTE0ODNjNTIzNDdjOTRjZTkzYTNhOGFiOWQ1N2ViNTdjNjkzOTQx
+    NDU0ZDIzNDJiZjcxM2FjZjg4ODI3OTFlY2I2MDFhMGRjZmM3MTIxNWRlZDQ4
+    NTUzMThkYWU1MmU1N2U5YWFkZDQxNTc2MWI4NzRlNDMxYzkxNTA=

data/ChangeLog

@@ -1,3 +1,6 @@
+0.9.6:
+  - Support for 'choice' types in API requests.
+
 0.9.5:
   - Updated user-agent generation for default string.
 

data/README.md

@@ -0,0 +1,88 @@
+# Google AdsCommon Library
+
+This gem is a dependency for the new generation of Ruby Google Ads client
+libraries. It contains common code shared among all of these libraries, such as
+authentication, SOAP stub generation, error handling, logging, etc.
+
+
+# Docs for Users
+
+## 1 - Installation:
+
+`google-ads-common` is a Ruby gem. See
+
+> [http://docs.rubygems.org/read/book/1]()
+
+Install it using the gem install command.
+
+    $ gem install google-ads-common
+
+The following gem libraries are required:
+
+ - savon
+ - httpi
+ - signet
+
+
+# Docs for Developers
+
+## 1 - Directory Structure
+
+- `lib/ads_common/`: Contains the bulk of the library.
+  - `auth/`: Contains classes that can handle different authentication methods.
+    Currently only supports ClientLogin.
+  - `build/`: Contains classes that handle code generation, packaging and other
+    build-time tasks for client libraries (not for google-ads-common).
+  - `savon_headers/`: Contains classes that handle header injection into savon
+    requests.
+- `test/`: Contains the unit tests for the library.
+
+
+## 2 - Commands
+
+To build the gem:
+
+    $ gem build google-ads-common.gemspec
+
+To run unit tests on the library:
+
+    $ rake test
+
+
+## 3 - Resources
+
+Ruby client libraries code page:
+
+> [https://github.com/googleads/google-api-ads-ruby]()
+
+Google Ads Developers Plus page:
+
+> [https://plus.google.com/+GoogleAdsDevelopers]()
+
+
+# Copyright/License Info
+
+Copyright 2010-2014, 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.
+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.
+
+
+## Authors
+
+ - Sérgio Gomes (api.sgomes@gmail.com)
+ - Danial Klimkin (api.dklimkin@gmail.com)
+ - Michael Cloonan (api.mcloonan@gmail.com)
+
+## Maintainer
+
+ - Michael Cloonan (api.mcloonan@gmail.com)

data/lib/ads_common/build/savon_registry_generator.rb

@@ -31,7 +31,7 @@ module AdsCommon
       #
       # This is auto-generated code, changes will be overwritten.
       #
-      # Copyright:: Copyright 2013, Google Inc. All Rights Reserved.
+      # Copyright:: Copyright 2014, 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

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

data/lib/ads_common/parameters_validator.rb

@@ -19,6 +19,8 @@
 #
 # This class validates input parameters before passing them to Savon.
 
+require 'ads_common/utils'
+
 module AdsCommon
   class ParametersValidator
     # Savon special keys.
@@ -71,12 +73,49 @@ module AdsCommon
           item_type = get_full_type_signature(field[:type])
           item_ns = field[:ns] || type_ns
           key = handle_namespace_override(args_hash, key, item_ns) if item_ns
-          validate_arg(item, args_hash, key, item_type)
+
+          # Separate validation for choice types as we need to inject nodes into
+          # the tree. Validate as usual if not a choice type.
+          unless validate_choice_argument(item, args_hash, key, item_type)
+            validate_arg(item, args_hash, key, item_type)
+          end
         end
       end
       return args_hash
     end
 
+    # Special handling for choice types. Goes over each item, checks xsi_type
+    # is set and correct and injects new node for it into the tree. After that,
+    # recurces with the correct item type.
+    def validate_choice_argument(item, parent, key, item_type)
+      result = false
+      if item_type.kind_of?(Hash) && item_type.include?(:choices)
+        new_root = {}
+        choice_items = arrayize(item)
+        choice_items.each do |choice_item|
+          choice_type = choice_item.delete(:xsi_type)
+          choice_item_type =
+              find_choice_by_xsi_type(choice_type, item_type[:choices])
+          if choice_type.nil? || choice_item_type.nil?
+            raise AdsCommon::Errors::TypeMismatchError.new(
+              'choice subtype', choice_type, choice_item.to_s())
+          end
+          new_root[choice_type] ||= []
+          new_root[choice_type] << choice_item
+          type_signature = get_full_type_signature(choice_type)
+          validate_arg(choice_item, new_root, choice_type, type_signature)
+        end
+        parent[key] = new_root
+        result = true
+      end
+      return result
+    end
+
+    def find_choice_by_xsi_type(xsi_type, item_def)
+      index = item_def.index {|item| xsi_type.eql?(item[:original_name])}
+      return index.nil? ? nil : item_def[index]
+    end
+
     # Checks if no extra fields provided outside of known ones.
     def check_extra_fields(args_hash, known_fields)
       extra_fields = args_hash.keys - known_fields - IGNORED_HASH_KEYS

data/lib/ads_common/version.rb

@@ -21,6 +21,6 @@
 
 module AdsCommon
   module ApiConfig
-    CLIENT_LIB_VERSION = '0.9.5'
+    CLIENT_LIB_VERSION = '0.9.6'
   end
 end

data/test/test_credential_handler.rb

@@ -80,22 +80,22 @@ class TestCredentialHandler < Test::Unit::TestCase
     credentials[:foo] = 'bar'
     credentials[:baz] = 42
     mock1 = MiniTest::Mock.new()
-    mock1.expect(:property_changed,  nil, [:foo, 'bar'])
-    mock1.expect(:property_changed,  nil, [:baz, 42])
+    mock1.expect(:property_changed, nil, [:baz, 42])
     @handler.set_auth_handler(mock1)
     @handler.credentials = credentials
     assert(mock1.verify)
 
     credentials.delete(:baz)
     mock2 = MiniTest::Mock.new()
-    mock2.expect(:property_changed,  nil, [:baz, nil])
+    mock2.expect(:property_changed, nil, [:baz, nil])
     @handler.set_auth_handler(mock2)
     @handler.credentials = credentials
     assert(mock2.verify)
 
     credentials[:foo] = nil
     mock3 = MiniTest::Mock.new()
-    mock3.expect(:property_changed,  nil, [:foo, nil])
+    mock3.expect(:property_changed, nil, [:foo, nil])
+    mock3.expect(:property_changed, nil, [:baz, nil])
     @handler.set_auth_handler(mock3)
     @handler.credentials = credentials
     assert(mock3.verify)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-ads-common
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Sergio Gomes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -60,42 +60,41 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- COPYING
+- ChangeLog
+- README.md
 - lib/ads_common/api.rb
-- lib/ads_common/credential_handler.rb
-- lib/ads_common/parameters_validator.rb
-- lib/ads_common/utils.rb
+- lib/ads_common/api_config.rb
 - lib/ads_common/auth/base_handler.rb
-- lib/ads_common/auth/oauth2_jwt_handler.rb
-- lib/ads_common/auth/oauth2_handler.rb
 - lib/ads_common/auth/client_login_handler.rb
-- lib/ads_common/http.rb
+- lib/ads_common/auth/oauth2_handler.rb
+- lib/ads_common/auth/oauth2_jwt_handler.rb
+- lib/ads_common/build/savon_abstract_generator.rb
+- lib/ads_common/build/savon_generator.rb
+- lib/ads_common/build/savon_registry.rb
+- lib/ads_common/build/savon_registry_generator.rb
+- lib/ads_common/build/savon_service_generator.rb
 - lib/ads_common/config.rb
-- lib/ads_common/savon_service.rb
-- lib/ads_common/savon_headers/oauth_header_handler.rb
-- lib/ads_common/savon_headers/base_header_handler.rb
+- lib/ads_common/credential_handler.rb
 - lib/ads_common/errors.rb
+- lib/ads_common/http.rb
+- lib/ads_common/parameters_validator.rb
 - lib/ads_common/results_extractor.rb
+- lib/ads_common/savon_headers/base_header_handler.rb
+- lib/ads_common/savon_headers/oauth_header_handler.rb
+- lib/ads_common/savon_service.rb
+- lib/ads_common/utils.rb
 - lib/ads_common/version.rb
-- lib/ads_common/build/savon_registry.rb
-- lib/ads_common/build/savon_service_generator.rb
-- lib/ads_common/build/savon_abstract_generator.rb
-- lib/ads_common/build/savon_registry_generator.rb
-- lib/ads_common/build/savon_generator.rb
-- lib/ads_common/api_config.rb
-- test/test_credential_handler.rb
+- test/coverage.rb
 - test/suite_unittests.rb
-- test/test_utils.rb
-- test/ads_devrel_ruby_ads_common.blueprint
 - test/test_client_login_handler.rb
-- test/coverage.rb
-- test/test_savon_service.rb
 - test/test_config.rb
-- test/test_results_extractor.rb
 - test/test_config.yml
+- test/test_credential_handler.rb
 - test/test_parameters_validator.rb
-- COPYING
-- README
-- ChangeLog
+- test/test_results_extractor.rb
+- test/test_savon_service.rb
+- test/test_utils.rb
 homepage: http://code.google.com/p/google-api-ads-ruby/
 licenses:
 - Apache-2.0
@@ -116,15 +115,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: google-ads-common
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Common code for Google Ads APIs
 test_files:
-- test/test_credential_handler.rb
 - test/test_utils.rb
+- test/test_credential_handler.rb
+- test/test_parameters_validator.rb
 - test/test_client_login_handler.rb
+- test/test_results_extractor.rb
 - test/test_savon_service.rb
 - test/test_config.rb
-- test/test_results_extractor.rb
-- test/test_parameters_validator.rb

data/README

@@ -1,77 +0,0 @@
-= Google AdsCommon Library
-
-This gem is a dependency for the new generation of Ruby Google Ads client
-libraries. It contains common code shared among all of these libraries, such as
-authentication, SOAP stub generation, error handling, logging, etc.
-
-
-= Docs for Users
-
-== 1 - Installation:
-
-google-ads-common is a Ruby gem.  See http://docs.rubygems.org/read/book/1
-
-Install it using the gem install command.
-   $ gem install google-ads-common
-
-The following gem libraries are required:
- - savon
- - httpi
- - signet
-
-
-= Docs for Developers
-
-== 1 - Directory Structure
-
-- +lib/ads_common/+: Contains the bulk of the library.
-  - +auth/+: Contains classes that can handle different authentication methods.
-    Currently only supports ClientLogin.
-  - +build/+: Contains classes that handle code generation, packaging and other
-    build-time tasks for client libraries (not for google-ads-common).
-  - +savon_headers/+: Contains classes that handle header injection into savon
-    requests.
-- +test/+: Contains the unit tests for the library.
-
-
-== 2 - Commands
-
- $ gem build google-ads-common.gemspec
-to build the gem
-
- $ rake test
-to run unit tests on the library
-
-
-== 3 - Resources
-
-Ruby client libraries code page:
-
-  http://code.google.com/p/google-api-ads-ruby/
-
-Google Ads Developers Plus page:
-
-  https://plus.google.com/+GoogleAdsDevelopers
-
-
-= Copyright/License Info
-
-Copyright 2010-2013, 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.
-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.
-
-
-== Authors
-
-Sérgio Gomes (api.sgomes@gmail.com)
-Danial Klimkin (api.dklimkin@gmail.com)

data/test/ads_devrel_ruby_ads_common.blueprint

@@ -1,36 +0,0 @@
-include "devtools/blueprint/ncl/blueprint_file.ncl";
-
-blueprint_file = ::blueprint::BlueprintFile(
-  buildable_units = [
-    ::blueprint::BuildableUnit(
-      build_patterns = [
-        "//third_party/ruby/ads_api/ads_common/...",
-      ],
-      test_patterns = [
-        "//third_party/ruby/ads_api/ads_common:rake-test",
-      ],
-      build_flags = ["--cpu=k8",
-                     "--java_cpu=k8"],
-      test_flags = [],
-      name = "ads_devrel.ruby.ads_api_clients",
-      coverage_instrumentation_filters = [
-        "third_party/ruby/ads_api/ads_common/",
-        "-third_party/ruby/ads_api/ads_common/test",
-        "-test_.*$",
-      ],
-      continuous_build_email = ::blueprint::ContinuousBuildEmailInfo(
-        build_cop_email_addrs = ["ads-client-libs+tap-ruby@google.com"],
-        summary_email_addrs = []),
-      enable_release = false,
-      enable_continuous_build = true,
-      tap_settings = tap::TapBuildableUnitSettings()
-    )
-  ],
-  owned_code_depotpaths = [
-    "//depot/google3/third_party/ruby/ads_api/ads_common/...",
-  ],
-  mpm_packages = [
-  ],
-  project_name = "ads_devrel.ruby.ads_api_clients",
-  mdb_groups = ["ads-api-devrel"]
-);