google-ads-common 0.12.4 → 0.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f6a5db7dfd14b7bf4d37bdbc437877bc0c62e00
-  data.tar.gz: 4f6a32a4c035bc75da84395ebf93f074eb262b34
+  metadata.gz: 2db986ad1bd370703b2924e95f491c684118272d
+  data.tar.gz: 9a7073d4830e50f02fb50f72858ba37947d609b0
 SHA512:
-  metadata.gz: af9f3aed5785a4c41c5608b286b7e9eb949085866815357f90d59cdb8319c9ccba0748c7ca44888f37342cb4919197b8cf417f5b7a40d15d41f60cab52e2377e
-  data.tar.gz: 412ac052f5c5730a06bbe08b63f8ba3837df2059312f2625a3a3d5e03592223d43bc928ba679c36deacb69e8539cef9e7efbc1e9b6a65498cade2110a5a05ac8
+  metadata.gz: 761e14fe7e3534f325fee15aac89063fc3679b2be21715e7419e9ec124cfac2440080a0ef8d8744860ae80b16159aab5c226ebe2a9336495261cd5631782615d
+  data.tar.gz: 9f71f9c5d76eb075788f295edd25b549f1d0afc9eb45fc3483d9f4e10efc2e3410c847fb2aa233405451bb64944e379b8a2122130d7df70a280a9e6c1049234c

data/ChangeLog

@@ -1,3 +1,6 @@
+0.12.5:
+  - Fixed issue #75.
+
 0.12.4:
   - Started enforcing minumum Ruby runtime version via gemspec.
 

data/lib/ads_common/parameters_validator.rb

@@ -88,6 +88,19 @@ module AdsCommon
     def validate_choice_argument(item, parent, key, item_type)
       result = false
       if item_type.kind_of?(Hash) && item_type.include?(:choices)
+        # If we have an array of choices, we need to go over them individually.
+        # We drop original array and replace it with the generated one that's
+        # nested one level more.
+        if item.kind_of?(Array)
+          parent[key] = []
+          item.each do |sub_item|
+            unless validate_choice_argument(sub_item, parent, key, item_type)
+              validate_arg(sub_item, parent, key, item_type)
+            end
+          end
+          return true
+        end
+        # New root needed for extra nesting we have (choice field).
         new_root = {}
         choice_items = arrayize(item)
         choice_items.each do |choice_item|
@@ -98,22 +111,44 @@ module AdsCommon
             raise AdsCommon::Errors::TypeMismatchError.new(
               'choice subtype', choice_type, choice_item.to_s())
           end
-          new_root[choice_type] ||= []
-          new_root[choice_type] << choice_item
+          choice_item[:xsi_type] = choice_type
+          # Note we use original name that produces a string like
+          # "BasicUserList". That's needed as the name is generated out of
+          # standard naming ("basicUserList") which would otherwise be produced.
+          choice_key = choice_item_type[:original_name]
+          new_root[choice_key] = choice_item
           type_signature = get_full_type_signature(choice_type)
-          validate_arg(choice_item, new_root, choice_type, type_signature)
+          validate_arg(choice_item, new_root, choice_key, type_signature)
+        end
+        if parent[key].kind_of?(Array)
+          parent[key] << new_root
+        else
+          parent[key] = new_root
         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 nil if xsi_type.nil?
+      # Method may allow this class name or any of its ancestors.
+      possible_names = collect_parent_types(xsi_type)
+      index = item_def.index do |item|
+        possible_names.include?(item[:original_name])
+      end
       return index.nil? ? nil : item_def[index]
     end
 
+    def collect_parent_types(xsi_type)
+      result = [xsi_type]
+      type_signature = @registry.get_type_signature(xsi_type)
+      if !type_signature.nil? && !type_signature[:base].nil?
+        result += collect_parent_types(type_signature[:base])
+      end
+      return result
+    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

@@ -19,6 +19,6 @@
 
 module AdsCommon
   module ApiConfig
-    CLIENT_LIB_VERSION = '0.12.4'
+    CLIENT_LIB_VERSION = '0.12.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-ads-common
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.12.5
 platform: ruby
 authors:
 - Sergio Gomes
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-ads-savon