adwords4r 0.2 → 0.3

data/lib/adwords4r/v2/InfoServiceDriver.rb

@@ -1,10 +1,9 @@
 require 'adwords4r/v2/InfoService'
 
 require 'soap/rpc/driver'
-module AdWordsV2
 
 class InfoServiceInterface < ::SOAP::RPC::Driver
-  DefaultEndpointUrl = "https://adwords.google.com:443/api/adwords/v2/InfoService"
+  DefaultEndpointUrl = "https://adwords.google.com/api/adwords/v2/InfoService"
   MappingRegistry = ::SOAP::Mapping::Registry.new
 
   Methods = [
@@ -87,4 +86,3 @@ private
   end
 end
 
-end

data/lib/adwords4r/v2/KeywordService.rb

@@ -350,7 +350,7 @@ class Criterion
     ["exemptionRequest", "SOAP::SOAPString"],
     ["criterionType", "SOAP::SOAPString"],
     ["language", "SOAP::SOAPString"],
-    ["status", "CriterionStatus"],
+    ["status", "SOAP::SOAPString"],
     ["negative", "SOAP::SOAPBoolean"],
     ["destinationUrl", "SOAP::SOAPString"]
   ]
@@ -386,10 +386,10 @@ class Keyword
     ["exemptionRequest", "SOAP::SOAPString"],
     ["criterionType", "SOAP::SOAPString"],
     ["language", "SOAP::SOAPString"],
-    ["status", "CriterionStatus"],
+    ["status", "SOAP::SOAPString"],
     ["negative", "SOAP::SOAPBoolean"],
     ["destinationUrl", "SOAP::SOAPString"],
-    ["type", "KeywordType"],
+    ["type", "SOAP::SOAPString"],
     ["minCpc", "SOAP::SOAPLong"],
     ["maxCpc", "SOAP::SOAPLong"],
     ["text", "SOAP::SOAPString"]

data/lib/adwords4r/v2/KeywordServiceDriver.rb

@@ -1,10 +1,9 @@
 require 'adwords4r/v2/KeywordService'
 
 require 'soap/rpc/driver'
-module AdWordsV2
 
 class KeywordService < ::SOAP::RPC::Driver
-  DefaultEndpointUrl = "https://adwords.google.com:443/api/adwords/v2/KeywordService"
+  DefaultEndpointUrl = "https://adwords.google.com/api/adwords/v2/KeywordService"
   MappingRegistry = ::SOAP::Mapping::Registry.new
 
   Methods = [
@@ -122,4 +121,3 @@ private
   end
 end
 
-end

data/lib/adwords4r/v2/ReportService.rb

@@ -22,7 +22,7 @@ class ScheduleReportJobResponse
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_qualified = "true"
   @@schema_element = [
-    ["scheduleReportJobReturn", "Long"]
+    ["scheduleReportJobReturn", "SOAP::SOAPLong"]
   ]
 
   attr_accessor :scheduleReportJobReturn
@@ -38,7 +38,7 @@ class GetReportJobStatus
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_qualified = "true"
   @@schema_element = [
-    ["reportJobId", "Long"]
+    ["reportJobId", "SOAP::SOAPLong"]
   ]
 
   attr_accessor :reportJobId
@@ -54,7 +54,7 @@ class GetReportJobStatusResponse
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_qualified = "true"
   @@schema_element = [
-    ["getReportJobStatusReturn", "ReportJobStatus"]
+    ["getReportJobStatusReturn", "SOAP::SOAPString"]
   ]
 
   attr_accessor :getReportJobStatusReturn
@@ -70,7 +70,7 @@ class GetReportDownloadUrl
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_qualified = "true"
   @@schema_element = [
-    ["reportJobId", "Long"]
+    ["reportJobId", "SOAP::SOAPLong"]
   ]
 
   attr_accessor :reportJobId
@@ -86,7 +86,7 @@ class GetReportDownloadUrlResponse
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_qualified = "true"
   @@schema_element = [
-    ["getReportDownloadUrlReturn", "String"]
+    ["getReportDownloadUrlReturn", "SOAP::SOAPString"]
   ]
 
   attr_accessor :getReportDownloadUrlReturn
@@ -102,7 +102,7 @@ class GetGzipReportDownloadUrl
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_qualified = "true"
   @@schema_element = [
-    ["reportJobId", "Long"]
+    ["reportJobId", "SOAP::SOAPLong"]
   ]
 
   attr_accessor :reportJobId
@@ -118,7 +118,7 @@ class GetGzipReportDownloadUrlResponse
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_qualified = "true"
   @@schema_element = [
-    ["getGzipReportDownloadUrlReturn", "String"]
+    ["getGzipReportDownloadUrlReturn", "SOAP::SOAPString"]
   ]
 
   attr_accessor :getGzipReportDownloadUrlReturn
@@ -152,7 +152,7 @@ class DeleteReport
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_qualified = "true"
   @@schema_element = [
-    ["reportJobId", "Long"]
+    ["reportJobId", "SOAP::SOAPLong"]
   ]
 
   attr_accessor :reportJobId
@@ -178,11 +178,11 @@ class ApiException
   @@schema_type = "ApiException"
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_element = [
-    ["code", "Int"],
-    ["internal", "Boolean"],
-    ["message", "String"],
-    ["trigger", "String"],
-    ["violations", "String"]
+    ["code", "SOAP::SOAPInt"],
+    ["internal", "SOAP::SOAPBoolean"],
+    ["message", "SOAP::SOAPString"],
+    ["trigger", "SOAP::SOAPString"],
+    ["violations", "SOAP::SOAPString"]
   ]
 
   attr_accessor :code
@@ -205,14 +205,14 @@ class ReportJob
   @@schema_type = "ReportJob"
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_element = [
-    ["id", "Long"],
-    ["name", "String"],
-    ["aggregationType", "AggregationType"],
+    ["id", "SOAP::SOAPLong"],
+    ["name", "SOAP::SOAPString"],
+    ["aggregationType", "SOAP::SOAPString"],
     ["startDate", "DateTime"],
     ["endDate", "DateTime"],
-    ["status", "ReportJobStatus"],
-    ["crossClient", "Boolean"],
-    ["clientAccounts", "Int[]"]
+    ["status", "SOAP::SOAPString"],
+    ["crossClient", "SOAP::SOAPBoolean"],
+    ["clientAccounts", "SOAP::SOAPInt[]"]
   ]
 
   attr_accessor :id
@@ -241,18 +241,18 @@ class KeywordReportJob
   @@schema_type = "KeywordReportJob"
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_element = [
-    ["id", "Long"],
-    ["name", "String"],
-    ["aggregationType", "AggregationType"],
+    ["id", "SOAP::SOAPLong"],
+    ["name", "SOAP::SOAPString"],
+    ["aggregationType", "SOAP::SOAPString"],
     ["startDate", "DateTime"],
     ["endDate", "DateTime"],
-    ["status", "ReportJobStatus"],
-    ["crossClient", "Boolean"],
-    ["clientAccounts", "Int[]"],
-    ["adWordsType", "AdWordsType"],
-    ["keywordStatuses", "KeywordStatus[]"],
-    ["keywordType", "KeywordType"],
-    ["campaigns", "Int[]"]
+    ["status", "SOAP::SOAPString"],
+    ["crossClient", "SOAP::SOAPBoolean"],
+    ["clientAccounts", "SOAP::SOAPInt[]"],
+    ["adWordsType", "SOAP::SOAPString"],
+    ["keywordStatuses", "SOAP::SOAPString[]"],
+    ["keywordType", "SOAP::SOAPString"],
+    ["campaigns", "SOAP::SOAPInt[]"]
   ]
 
   attr_accessor :id
@@ -289,16 +289,16 @@ class AdTextReportJob
   @@schema_type = "AdTextReportJob"
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_element = [
-    ["id", "Long"],
-    ["name", "String"],
-    ["aggregationType", "AggregationType"],
+    ["id", "SOAP::SOAPLong"],
+    ["name", "SOAP::SOAPString"],
+    ["aggregationType", "SOAP::SOAPString"],
     ["startDate", "DateTime"],
     ["endDate", "DateTime"],
-    ["status", "ReportJobStatus"],
-    ["crossClient", "Boolean"],
-    ["clientAccounts", "Int[]"],
-    ["adWordsType", "AdWordsType"],
-    ["campaigns", "Int[]"]
+    ["status", "SOAP::SOAPString"],
+    ["crossClient", "SOAP::SOAPBoolean"],
+    ["clientAccounts", "SOAP::SOAPInt[]"],
+    ["adWordsType", "SOAP::SOAPString"],
+    ["campaigns", "SOAP::SOAPInt[]"]
   ]
 
   attr_accessor :id
@@ -331,16 +331,16 @@ class UrlReportJob
   @@schema_type = "UrlReportJob"
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_element = [
-    ["id", "Long"],
-    ["name", "String"],
-    ["aggregationType", "AggregationType"],
+    ["id", "SOAP::SOAPLong"],
+    ["name", "SOAP::SOAPString"],
+    ["aggregationType", "SOAP::SOAPString"],
     ["startDate", "DateTime"],
     ["endDate", "DateTime"],
-    ["status", "ReportJobStatus"],
-    ["crossClient", "Boolean"],
-    ["clientAccounts", "Int[]"],
-    ["adWordsType", "AdWordsType"],
-    ["campaigns", "Int[]"]
+    ["status", "SOAP::SOAPString"],
+    ["crossClient", "SOAP::SOAPBoolean"],
+    ["clientAccounts", "SOAP::SOAPInt[]"],
+    ["adWordsType", "SOAP::SOAPString"],
+    ["campaigns", "SOAP::SOAPInt[]"]
   ]
 
   attr_accessor :id
@@ -373,23 +373,23 @@ class CustomReportJob
   @@schema_type = "CustomReportJob"
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_element = [
-    ["id", "Long"],
-    ["name", "String"],
-    ["aggregationType", "AggregationType"],
+    ["id", "SOAP::SOAPLong"],
+    ["name", "SOAP::SOAPString"],
+    ["aggregationType", "SOAP::SOAPString"],
     ["startDate", "DateTime"],
     ["endDate", "DateTime"],
-    ["status", "ReportJobStatus"],
-    ["crossClient", "Boolean"],
-    ["clientAccounts", "Int[]"],
-    ["keywords", "String[]"],
-    ["keywordStatuses", "KeywordStatus[]"],
-    ["keywordType", "KeywordType"],
-    ["campaignStatuses", "CampaignStatus[]"],
-    ["campaigns", "Int[]"],
-    ["adGroupStatuses", "AdGroupStatus[]"],
-    ["adGroups", "Int[]"],
-    ["adWordsType", "AdWordsType"],
-    ["customOptions", "CustomReportOption[]"]
+    ["status", "SOAP::SOAPString"],
+    ["crossClient", "SOAP::SOAPBoolean"],
+    ["clientAccounts", "SOAP::SOAPInt[]"],
+    ["keywords", "SOAP::SOAPString[]"],
+    ["keywordStatuses", "SOAP::SOAPString[]"],
+    ["keywordType", "SOAP::SOAPString"],
+    ["campaignStatuses", "SOAP::SOAPString[]"],
+    ["campaigns", "SOAP::SOAPInt[]"],
+    ["adGroupStatuses", "SOAP::SOAPString[]"],
+    ["adGroups", "SOAP::SOAPInt[]"],
+    ["adWordsType", "SOAP::SOAPString"],
+    ["customOptions", "SOAP::SOAPString[]"]
   ]
 
   attr_accessor :id

data/lib/adwords4r/v2/ReportServiceDriver.rb

@@ -1,10 +1,9 @@
 require 'adwords4r/v2/ReportService'
 
 require 'soap/rpc/driver'
-module AdWordsV2
 
 class ReportServiceInterface < ::SOAP::RPC::Driver
-  DefaultEndpointUrl = "https://adwords.google.com:443/api/adwords/v2/ReportService"
+  DefaultEndpointUrl = "https://adwords.google.com/api/adwords/v2/ReportService"
   MappingRegistry = ::SOAP::Mapping::Registry.new
 
   Methods = [
@@ -80,4 +79,3 @@ private
   end
 end
 
-end

data/lib/adwords4r/v2/TrafficEstimatorService.rb

@@ -47,11 +47,11 @@ class ApiException
   @@schema_type = "ApiException"
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_element = [
-    ["code", "Int"],
-    ["internal", "Boolean"],
-    ["message", "String"],
-    ["trigger", "String"],
-    ["violations", "String"]
+    ["code", "SOAP::SOAPInt"],
+    ["internal", "SOAP::SOAPBoolean"],
+    ["message", "SOAP::SOAPString"],
+    ["trigger", "SOAP::SOAPString"],
+    ["violations", "SOAP::SOAPString"]
   ]
 
   attr_accessor :code
@@ -74,9 +74,9 @@ class CampaignRequest
   @@schema_type = "CampaignRequest"
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_element = [
-    ["id", "Int"],
-    ["optInSearchNetwork", "Boolean"],
-    ["optInContentNetwork", "Boolean"],
+    ["id", "SOAP::SOAPInt"],
+    ["optInSearchNetwork", "SOAP::SOAPBoolean"],
+    ["optInContentNetwork", "SOAP::SOAPBoolean"],
     ["geoTargeting", "GeoTarget"],
     ["languageTargeting", "LanguageTarget"],
     ["adGroupRequests", "AdGroupRequest[]"]
@@ -104,8 +104,8 @@ class AdGroupRequest
   @@schema_type = "AdGroupRequest"
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_element = [
-    ["id", "Int"],
-    ["maxCpc", "Long"],
+    ["id", "SOAP::SOAPInt"],
+    ["maxCpc", "SOAP::SOAPLong"],
     ["keywordRequests", "KeywordRequest[]"]
   ]
 
@@ -125,11 +125,11 @@ class KeywordRequest
   @@schema_type = "KeywordRequest"
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_element = [
-    ["id", "Long"],
-    ["type", "KeywordType"],
-    ["text", "String"],
-    ["maxCpc", "Long"],
-    ["negative", "Boolean"]
+    ["id", "SOAP::SOAPLong"],
+    ["type", "SOAP::SOAPString"],
+    ["text", "SOAP::SOAPString"],
+    ["maxCpc", "SOAP::SOAPLong"],
+    ["negative", "SOAP::SOAPBoolean"]
   ]
 
   attr_accessor :id
@@ -152,10 +152,10 @@ class GeoTarget
   @@schema_type = "GeoTarget"
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_element = [
-    ["countries", "String[]"],
-    ["regions", "String[]"],
-    ["metros", "String[]"],
-    ["cities", "String[]"]
+    ["countries", "SOAP::SOAPString[]"],
+    ["regions", "SOAP::SOAPString[]"],
+    ["metros", "SOAP::SOAPString[]"],
+    ["cities", "SOAP::SOAPString[]"]
   ]
 
   attr_accessor :countries
@@ -174,7 +174,7 @@ end
 # {https://adwords.google.com/api/adwords/v2}LanguageTarget
 class LanguageTarget < ::Array
   @@schema_element = [
-    ["languages", ["String[]", XSD::QName.new("https://adwords.google.com/api/adwords/v2", "languages")]]
+    ["languages", ["SOAP::SOAPString[]", XSD::QName.new("https://adwords.google.com/api/adwords/v2", "languages")]]
   ]
 end
 
@@ -183,7 +183,7 @@ class CampaignEstimate
   @@schema_type = "CampaignEstimate"
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_element = [
-    ["id", "Int"],
+    ["id", "SOAP::SOAPInt"],
     ["adGroupEstimates", "AdGroupEstimate[]"]
   ]
 
@@ -201,7 +201,7 @@ class AdGroupEstimate
   @@schema_type = "AdGroupEstimate"
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_element = [
-    ["id", "Int"],
+    ["id", "SOAP::SOAPInt"],
     ["keywordEstimates", "KeywordEstimate[]"]
   ]
 
@@ -219,9 +219,9 @@ class KeywordEstimate
   @@schema_type = "KeywordEstimate"
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_element = [
-    ["id", "Long"],
+    ["id", "SOAP::SOAPLong"],
     ["clicksPerDay", "Float"],
-    ["cpc", "Long"],
+    ["cpc", "SOAP::SOAPLong"],
     ["avgPosition", "Float"]
   ]
 

data/lib/adwords4r/v2/TrafficEstimatorServiceDriver.rb

@@ -1,10 +1,9 @@
 require 'adwords4r/v2/TrafficEstimatorService'
 
 require 'soap/rpc/driver'
-module AdWordsV2
 
 class TrafficEstimatorInterface < ::SOAP::RPC::Driver
-  DefaultEndpointUrl = "https://adwords.google.com:443/api/adwords/v2/TrafficEstimatorService"
+  DefaultEndpointUrl = "https://adwords.google.com/api/adwords/v2/TrafficEstimatorService"
   MappingRegistry = ::SOAP::Mapping::Registry.new
 
   Methods = [
@@ -59,4 +58,3 @@ private
   end
 end
 
-end

data/lib/adwords4r/v3/AccountService.rb

@@ -477,14 +477,14 @@ class CreditCard
   @@schema_ns = "https://adwords.google.com/api/adwords/v3"
   @@schema_element = [
     ["cardNumber", "SOAP::SOAPString"],
-    ["cardType", "CreditCardType"],
+    ["cardType", "SOAP::SOAPString"],
     ["cardVerificationNumber", "SOAP::SOAPString"],
     ["expirationMonth", "SOAP::SOAPInt"],
     ["expirationYear", "SOAP::SOAPInt"],
     ["issueNumber", "SOAP::SOAPString"],
     ["startMonth", "SOAP::SOAPInt"],
     ["startYear", "SOAP::SOAPInt"],
-    ["status", "TaxStatus"],
+    ["status", "SOAP::SOAPString"],
     ["taxNumber", "SOAP::SOAPString"]
   ]
 

data/lib/adwords4r/v3/AccountServiceDriver.rb

@@ -1,10 +1,9 @@
 require 'adwords4r/v3/AccountService'
 
 require 'soap/rpc/driver'
-module AdWordsV3
 
 class AccountService < ::SOAP::RPC::Driver
-  DefaultEndpointUrl = "https://adwords.google.com:443/api/adwords/v3/AccountService"
+  DefaultEndpointUrl = "https://adwords.google.com/api/adwords/v3/AccountService"
   MappingRegistry = ::SOAP::Mapping::Registry.new
 
   Methods = [
@@ -150,4 +149,3 @@ private
   end
 end
 
-end