adwords4r 0.2 → 0.3

data/ChangeLog.txt

@@ -1,4 +1,4 @@
-0.2 added packaging and made it a gem, for easy installation.
+0.2 added packaging, made it a gem, and added a setup program, for easy installation in all configurations (gem and non gem).
 0.1 -first version, not fully tested
 works for Campaigns
 

data/Rakefile

@@ -20,7 +20,7 @@ end
 
 CLOBBER.include('pkg')
 
-CURRENT_VERSION = '0.2'
+CURRENT_VERSION = '0.3'
 PKG_VERSION = ENV['REL'] ? ENV['REL'] : CURRENT_VERSION
 
 SRC_RB = FileList['lib/**/*.rb']
@@ -62,6 +62,7 @@ task :generate do
             worker.opt.update(getWsdlOpt(name))
             worker.run
             fixImport(v, File.join(gendir, "#{name}Driver.rb"))
+            #fixImport(v, File.join(gendir, "#{name}.rb"))
         end
     end
 end
@@ -71,22 +72,18 @@ def fixImport(version, file)
     tempfile = file + '.tmp'
     outfile = File.new(tempfile,"w")
     File.open(file, "r") do |infile|
-        req = 0
+#        outfile.puts "module AdWords"
+        #outfile.puts "module AdWordsV#{version}"
         infile.each do |l|
-            if (l =~/require/) then
+            if (l =~/require.*Service.rb/) then
 #                outfile.puts l.gsub(/require \'(.*)Service.rb\'/, 'require #\'adwords4r/' + vname + '/\1Service\'')
                 outfile.puts l.gsub(/require \'(.*)Service.rb\'/, 'require \'adwords4r/' + vname + '/\1Service\'')
-                req = req + 1
             else
-                if (req == 2) then
-                    outfile.puts "module AdWordsV#{version}"
-                    req = req + 1
-                end
                 outfile.puts l
             end
         end
+ #       outfile.puts "end"
     end
-    outfile.puts "end"
     outfile.close
     File.rename(tempfile, file)
 end 
@@ -117,11 +114,25 @@ def getfile(host, path)
     https.start { |w| w.get2(path).body }
 end
 
+def fix_attribute(text, name, type)
+  text.gsub!(Regexp.new("#{name}=\"#{type}\""),"#{name}=\"xsd:#{type}\"")
+end
+
+def fixWsdl(wsdl)
+    ['type', 'base'].each {|name| ['long', 'string', 'date', 'int', 'boolean'].each {|type| fix_attribute(wsdl, name, type)}}
+    schema_ns = "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\""
+    if wsdl !~ Regexp.new(schema_ns)
+        wsdl.gsub!(/(<wsdl:definitions[^>]*)>/, '\1 ' + schema_ns + '>')
+    end
+    return wsdl
+    #wsdl.gsub(/type=\"long\"/, 'type="xsd:long"')
+end
+
 # Saves this document to the specified @var path.
 #doesn't create the file if contains markup for google 404 page
 def save(content, path)
     if content !~ /<H2>Error 404<\/H2>/
-        File::open(path, 'w') {|f| f.write(content)}
+        File::open(path, 'w') {|f| f.write(fixWsdl(content))}
     end
 end
 

data/examples/campaign.rb

@@ -20,11 +20,14 @@ end
 begin
     adwords = AdWords::API.new
     #pp adwords.thismethodDoesNotExist()
-    adwords.getAllAdWordsCampaigns(123).each {|c| puts dumpObj(c)}
+    res = adwords.getAllAdWordsCampaigns(123)
+    pp res
+    res.each {|c| puts dumpObj(c)}
+    #adwords.getAllAdWordsCampaigns(123).each {|c| puts dumpObj(c)}
     c = Campaign.new
     c.dailyBudget = 10000
     c.status = 'Paused'
-    c.name = 'Test P@ #{rand(10000}'
+    c.name = "Test P@ #{rand(10000)}"
     pp adwords.addCampaign(c)
 
 rescue AdWords::Error::UnknownAPICall => e

data/examples/get_unit_count.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+require 'adwords4r'
+require 'pp'
+
+begin
+    adwords = AdWords::API.new
+    puts "result = #{adwords.getUnitCount(Date.new(2006, 4,1), Date.new(2006,4,13)).getUnitCountReturn}"
+
+rescue AdWords::Error::UnknownAPICall => e
+    puts e
+rescue AdWords::Error::ApiError => e
+    puts e.code
+    puts e.message
+end
+

data/lib/adwords4r.rb

@@ -5,7 +5,6 @@ require 'soap/soap'
 module AdWords
 
     class API
-    
         attr_reader :credentials, :drivers, :version
         @methodMap = Hash.new
         
@@ -27,10 +26,9 @@ module AdWords
         def method_missing(m, *args)
             methodName = m.id2name
             requestName = AdWords::fix_case_up(m.id2name) # upper first character
-            param = args[0]
-        
             if valid_call?(methodName)
-                req = eval("#{requestName}.new(param)")
+                constructor = eval("#{requestName}.method(\"new\")")
+                req = constructor.call(*args)
                 resp = eval("getDriver(methodName).#{methodName}(req)")
                 return resp
             else
@@ -55,7 +53,8 @@ module AdWords
         end
         
         def prepareDriver(s)
-            driver = eval("AdWordsV#{@version}::#{getServiceName(s)}.new")
+            #driver = eval("AdWordsV#{@version}::#{getServiceName(s)}.new")
+            driver = eval("#{getServiceName(s)}.new")
             @credentials.handlers.each {|h| driver.headerhandler << h}
             #driver.wiredump_dev = STDOUT if @debug
             driver.wiredump_file_base = "log"

data/lib/adwords4r/v2/AccountService.rb

@@ -476,7 +476,7 @@ class CreditCard
   @@schema_type = "CreditCard"
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_element = [
-    ["cardType", "CreditCardType"],
+    ["cardType", "SOAP::SOAPString"],
     ["cardNumber", "SOAP::SOAPString"],
     ["expirationMonth", "SOAP::SOAPInt"],
     ["expirationYear", "SOAP::SOAPInt"],
@@ -484,7 +484,7 @@ class CreditCard
     ["issueNumber", "SOAP::SOAPString"],
     ["startMonth", "SOAP::SOAPInt"],
     ["startYear", "SOAP::SOAPInt"],
-    ["status", "TaxStatus"],
+    ["status", "SOAP::SOAPString"],
     ["taxNumber", "SOAP::SOAPString"]
   ]
 

data/lib/adwords4r/v2/AccountServiceDriver.rb

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

data/lib/adwords4r/v2/AdGroupService.rb

@@ -251,7 +251,7 @@ class AdGroup
     ["name", "SOAP::SOAPString"],
     ["id", "SOAP::SOAPInt"],
     ["campaignId", "SOAP::SOAPInt"],
-    ["status", "AdGroupStatus"]
+    ["status", "SOAP::SOAPString"]
   ]
 
   attr_accessor :maxCpc

data/lib/adwords4r/v2/AdGroupServiceDriver.rb

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

data/lib/adwords4r/v2/CampaignService.rb

@@ -268,7 +268,7 @@ class Criterion
     ["exemptionRequest", "SOAP::SOAPString"],
     ["criterionType", "SOAP::SOAPString"],
     ["language", "SOAP::SOAPString"],
-    ["status", "CriterionStatus"],
+    ["status", "SOAP::SOAPString"],
     ["negative", "SOAP::SOAPBoolean"],
     ["destinationUrl", "SOAP::SOAPString"]
   ]
@@ -304,10 +304,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"]
@@ -380,7 +380,7 @@ class Campaign
   @@schema_element = [
     ["id", "SOAP::SOAPInt"],
     ["name", "SOAP::SOAPString"],
-    ["status", "CampaignStatus"],
+    ["status", "SOAP::SOAPString"],
     ["startDate", "SOAP::SOAPDateTime"],
     ["endDate", "SOAP::SOAPDateTime"],
     ["dailyBudget", "SOAP::SOAPLong"],

data/lib/adwords4r/v2/CampaignServiceDriver.rb

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

data/lib/adwords4r/v2/CreativeService.rb

@@ -256,7 +256,7 @@ class Image
     ["data", "SOAP::SOAPBase64"],
     ["width", "SOAP::SOAPInt"],
     ["height", "SOAP::SOAPInt"],
-    ["type", "ImageType"],
+    ["type", "SOAP::SOAPString"],
     ["mimeType", "SOAP::SOAPString"],
     ["imageUrl", "SOAP::SOAPString"],
     ["thumbnailUrl", "SOAP::SOAPString"]

data/lib/adwords4r/v2/CreativeServiceDriver.rb

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

data/lib/adwords4r/v2/CriterionService.rb

@@ -213,7 +213,7 @@ class Criterion
     ["exemptionRequest", "SOAP::SOAPString"],
     ["criterionType", "SOAP::SOAPString"],
     ["language", "SOAP::SOAPString"],
-    ["status", "CriterionStatus"],
+    ["status", "SOAP::SOAPString"],
     ["negative", "SOAP::SOAPBoolean"],
     ["destinationUrl", "SOAP::SOAPString"]
   ]
@@ -249,10 +249,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"]
@@ -297,7 +297,7 @@ class Website
     ["exemptionRequest", "SOAP::SOAPString"],
     ["criterionType", "SOAP::SOAPString"],
     ["language", "SOAP::SOAPString"],
-    ["status", "CriterionStatus"],
+    ["status", "SOAP::SOAPString"],
     ["negative", "SOAP::SOAPBoolean"],
     ["destinationUrl", "SOAP::SOAPString"],
     ["maxCpm", "SOAP::SOAPLong"],

data/lib/adwords4r/v2/CriterionServiceDriver.rb

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

data/lib/adwords4r/v2/InfoService.rb

@@ -6,8 +6,8 @@ class GetOperationCount
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_qualified = "true"
   @@schema_element = [
-    ["startDate", "Date"],
-    ["endDate", "Date"]
+    ["startDate", "SOAP::SOAPDate"],
+    ["endDate", "SOAP::SOAPDate"]
   ]
 
   attr_accessor :startDate
@@ -25,7 +25,7 @@ class GetOperationCountResponse
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_qualified = "true"
   @@schema_element = [
-    ["getOperationCountReturn", "Long"]
+    ["getOperationCountReturn", "SOAP::SOAPLong"]
   ]
 
   attr_accessor :getOperationCountReturn
@@ -52,7 +52,7 @@ class GetOperationsQuotaThisMonthResponse
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_qualified = "true"
   @@schema_element = [
-    ["getOperationsQuotaThisMonthReturn", "Long"]
+    ["getOperationsQuotaThisMonthReturn", "SOAP::SOAPLong"]
   ]
 
   attr_accessor :getOperationsQuotaThisMonthReturn
@@ -79,7 +79,7 @@ class GetUsageQuotaThisMonthResponse
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_qualified = "true"
   @@schema_element = [
-    ["getUsageQuotaThisMonthReturn", "Long"]
+    ["getUsageQuotaThisMonthReturn", "SOAP::SOAPLong"]
   ]
 
   attr_accessor :getUsageQuotaThisMonthReturn
@@ -106,7 +106,7 @@ class GetFreeUsageQuotaThisMonthResponse
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_qualified = "true"
   @@schema_element = [
-    ["getFreeUsageQuotaThisMonthReturn", "Long"]
+    ["getFreeUsageQuotaThisMonthReturn", "SOAP::SOAPLong"]
   ]
 
   attr_accessor :getFreeUsageQuotaThisMonthReturn
@@ -122,9 +122,9 @@ class GetMethodCost
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_qualified = "true"
   @@schema_element = [
-    ["service", "String"],
-    ["method", "String"],
-    ["date", "Date"]
+    ["service", "SOAP::SOAPString"],
+    ["method", "SOAP::SOAPString"],
+    ["date", "SOAP::SOAPDate"]
   ]
 
   attr_accessor :service
@@ -144,7 +144,7 @@ class GetMethodCostResponse
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_qualified = "true"
   @@schema_element = [
-    ["getMethodCostReturn", "Int"]
+    ["getMethodCostReturn", "SOAP::SOAPInt"]
   ]
 
   attr_accessor :getMethodCostReturn
@@ -160,8 +160,8 @@ class GetUnitCount
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_qualified = "true"
   @@schema_element = [
-    ["startDate", "Date"],
-    ["endDate", "Date"]
+    ["startDate", "SOAP::SOAPDate"],
+    ["endDate", "SOAP::SOAPDate"]
   ]
 
   attr_accessor :startDate
@@ -179,7 +179,7 @@ class GetUnitCountResponse
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_qualified = "true"
   @@schema_element = [
-    ["getUnitCountReturn", "Long"]
+    ["getUnitCountReturn", "SOAP::SOAPLong"]
   ]
 
   attr_accessor :getUnitCountReturn
@@ -195,10 +195,10 @@ class GetUnitCountForMethod
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_qualified = "true"
   @@schema_element = [
-    ["service", "String"],
-    ["method", "String"],
-    ["startDate", "Date"],
-    ["endDate", "Date"]
+    ["service", "SOAP::SOAPString"],
+    ["method", "SOAP::SOAPString"],
+    ["startDate", "SOAP::SOAPDate"],
+    ["endDate", "SOAP::SOAPDate"]
   ]
 
   attr_accessor :service
@@ -220,7 +220,7 @@ class GetUnitCountForMethodResponse
   @@schema_ns = "https://adwords.google.com/api/adwords/v2"
   @@schema_qualified = "true"
   @@schema_element = [
-    ["getUnitCountForMethodReturn", "Long"]
+    ["getUnitCountForMethodReturn", "SOAP::SOAPLong"]
   ]
 
   attr_accessor :getUnitCountForMethodReturn
@@ -235,11 +235,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