adwords4r 0.3 → 0.4

data/ChangeLog.txt

@@ -1,3 +1,5 @@
+0.4 Now all generated classes are within the Adwords module. Will make it easier to use that in Rails. Support for gen classes in a module is not implemented in soap4r for doc/literal style (it works for rpc/encoded). I logged a bug for soap4r. In the meantime I had to fix adwords4r from my module using module_eval to patch the Mapping class.
+0.3 fixed the bug in InfoService and many others. I fix the wsdl before generation.
 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.3'
+CURRENT_VERSION = '0.4'
 PKG_VERSION = ENV['REL'] ? ENV['REL'] : CURRENT_VERSION
 
 SRC_RB = FileList['lib/**/*.rb']
@@ -62,7 +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"))
+            fixImport(v, File.join(gendir, "#{name}.rb"))
         end
     end
 end
@@ -72,7 +72,7 @@ def fixImport(version, file)
     tempfile = file + '.tmp'
     outfile = File.new(tempfile,"w")
     File.open(file, "r") do |infile|
-#        outfile.puts "module AdWords"
+        outfile.puts "module AdWords"
         #outfile.puts "module AdWordsV#{version}"
         infile.each do |l|
             if (l =~/require.*Service.rb/) then
@@ -82,7 +82,7 @@ def fixImport(version, file)
                 outfile.puts l
             end
         end
- #       outfile.puts "end"
+        outfile.puts "end"
     end
     outfile.close
     File.rename(tempfile, file)

data/Todo.txt

@@ -1,9 +1,13 @@
 adwords4r todo list
 ---
-
-- gem file
+- use XSD::CodeGen::GenSupport.capitalize and unCapitalize instead of my own methods
 - handling quota management in the driver
 - pass in a hash for complex objects
 - comments everywhere, rdoc
 - documentation
 - more samples
+
+OK- make it work with all generated classes in their own module
+OK- fix bug in InfoService
+OK- gem file
+OK- traditional setup file

data/examples/campaign.rb

@@ -19,16 +19,17 @@ end
 
 begin
     adwords = AdWords::API.new
-    #pp adwords.thismethodDoesNotExist()
+    
+    res = adwords.getCampaign(6000213)
+    puts dumpObj(res)
     res = adwords.getAllAdWordsCampaigns(123)
-    pp res
     res.each {|c| puts dumpObj(c)}
     #adwords.getAllAdWordsCampaigns(123).each {|c| puts dumpObj(c)}
-    c = Campaign.new
+    c = AdWords::Campaign.new
     c.dailyBudget = 10000
     c.status = 'Paused'
     c.name = "Test P@ #{rand(10000)}"
-    pp adwords.addCampaign(c)
+    puts dumpObj(adwords.addCampaign(c).addCampaignReturn)
 
 rescue AdWords::Error::UnknownAPICall => e
     puts e
@@ -36,4 +37,3 @@ rescue AdWords::Error::ApiError => e
     puts e.code
     puts e.message
 end
-

data/lib/adwords4r.rb

@@ -1,6 +1,6 @@
+require 'soap/soap'
 require 'adwords4r/credentials'
 require 'adwords4r/services'
-require 'soap/soap'
 
 module AdWords
 
@@ -21,13 +21,14 @@ module AdWords
             end
             @drivers = Hash.new
             prepareDrivers
+            fix_soap4r
         end
         
         def method_missing(m, *args)
             methodName = m.id2name
             requestName = AdWords::fix_case_up(m.id2name) # upper first character
             if valid_call?(methodName)
-                constructor = eval("#{requestName}.method(\"new\")")
+                constructor = eval("AdWords::#{requestName}.method(\"new\")")
                 req = constructor.call(*args)
                 resp = eval("getDriver(methodName).#{methodName}(req)")
                 return resp
@@ -41,6 +42,26 @@ module AdWords
         
         private
         
+        #nasty but does the job
+        #Todo: remove when Hiroshi fix soap4r bug
+        #Todo: it would be more elegant to use alias_method but I could not
+        #make it work with class methods
+        #Todo: could also check if the class is in my module before adding it
+        def fix_soap4r
+          a = %q{
+          def self.class_from_name(name, lenient = false)
+            const = const_from_name('AdWords::' + name, lenient)
+            if const.is_a?(::Class)
+              const
+            else
+              nil
+            end
+          end
+          }
+          
+          SOAP::Mapping.module_eval(a)
+        end
+        
         def prepareDrivers()
             Service.doRequire(@version)
             Service.getServices(@version).each {|s| @drivers[s] = prepareDriver(s)}

data/lib/adwords4r/registry.rb

@@ -0,0 +1,31 @@
+require 'soap/rpc/driver'
+require 'soap/rpc/mapping'
+
+module SOAP
+module Mapping
+  
+#  alias_method :old_class_from_name,  :class_from_name
+#  def Mapping.class_from_name(*args)
+#    puts 'in new_class'
+#    result = Mapping.old_class_from_name(*args)
+#    return result
+#  end
+    
+  class AdWords4rRegistry < ::SOAP::Mapping::WSDLLiteralRegistry
+    def any2obj(node, obj_class = nil)
+      puts 'adwords4r any2obj'
+      unless obj_class
+        #puts 'adwords4r any2obj node ' + node.elemname.name
+        typestr = XSD::CodeGen::GenSupport.safeconstname(node.elename.name)
+        puts 'typestr'
+        obj_class = Mapping.class_from_name('AdWords::' + typestr)
+        puts 'in literal any2obj obj_class =' + obj_class.to_s + typestr
+        require 'pp'
+        pp obj_class
+      end
+      super(node, obj_class)
+    end
+  end
+
+end
+end

data/lib/adwords4r/v2/AccountService.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'xsd/qname'
 
 # {https://adwords.google.com/api/adwords/v2}createAdWordsAccount
@@ -624,3 +625,4 @@ class TaxStatus < ::String
   SubjectToTax = TaxStatus.new("SubjectToTax")
   ZeroRated = TaxStatus.new("ZeroRated")
 end
+end

data/lib/adwords4r/v2/AccountServiceDriver.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'adwords4r/v2/AccountService'
 
 require 'soap/rpc/driver'
@@ -149,3 +150,4 @@ private
   end
 end
 
+end

data/lib/adwords4r/v2/AdGroupService.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'xsd/qname'
 
 # {https://adwords.google.com/api/adwords/v2}getAdGroupList
@@ -313,3 +314,4 @@ class AdGroupStatus < ::String
   Enabled = AdGroupStatus.new("Enabled")
   Paused = AdGroupStatus.new("Paused")
 end
+end

data/lib/adwords4r/v2/AdGroupServiceDriver.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'adwords4r/v2/AdGroupService'
 
 require 'soap/rpc/driver'
@@ -93,3 +94,4 @@ private
   end
 end
 
+end

data/lib/adwords4r/v2/CampaignService.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'xsd/qname'
 
 # {https://adwords.google.com/api/adwords/v2}getCampaign
@@ -513,3 +514,4 @@ class CampaignStatus < ::String
   Pending = CampaignStatus.new("Pending")
   Suspended = CampaignStatus.new("Suspended")
 end
+end

data/lib/adwords4r/v2/CampaignServiceDriver.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'adwords4r/v2/CampaignService'
 
 require 'soap/rpc/driver'
@@ -107,3 +108,4 @@ private
   end
 end
 
+end

data/lib/adwords4r/v2/CreativeService.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'xsd/qname'
 
 # {https://adwords.google.com/api/adwords/v2}getAllCreatives
@@ -397,3 +398,4 @@ class ImageType < ::String
   Flash = ImageType.new("flash")
   Image = ImageType.new("image")
 end
+end

data/lib/adwords4r/v2/CreativeServiceDriver.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'adwords4r/v2/CreativeService'
 
 require 'soap/rpc/driver'
@@ -100,3 +101,4 @@ private
   end
 end
 
+end

data/lib/adwords4r/v2/CriterionService.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'xsd/qname'
 
 # {https://adwords.google.com/api/adwords/v2}getAllCriteria
@@ -411,3 +412,4 @@ class KeywordType < ::String
   Exact = KeywordType.new("Exact")
   Phrase = KeywordType.new("Phrase")
 end
+end

data/lib/adwords4r/v2/CriterionServiceDriver.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'adwords4r/v2/CriterionService'
 
 require 'soap/rpc/driver'
@@ -93,3 +94,4 @@ private
   end
 end
 
+end

data/lib/adwords4r/v2/InfoService.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'xsd/qname'
 
 # {https://adwords.google.com/api/adwords/v2}getOperationCount
@@ -256,3 +257,4 @@ class ApiException
     @violations = violations
   end
 end
+end

data/lib/adwords4r/v2/InfoServiceDriver.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'adwords4r/v2/InfoService'
 
 require 'soap/rpc/driver'
@@ -86,3 +87,4 @@ private
   end
 end
 
+end

data/lib/adwords4r/v2/KeywordService.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'xsd/qname'
 
 # {https://adwords.google.com/api/adwords/v2}getAllKeywords
@@ -539,3 +540,4 @@ class KeywordType < ::String
   Exact = KeywordType.new("Exact")
   Phrase = KeywordType.new("Phrase")
 end
+end

data/lib/adwords4r/v2/KeywordServiceDriver.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'adwords4r/v2/KeywordService'
 
 require 'soap/rpc/driver'
@@ -121,3 +122,4 @@ private
   end
 end
 
+end

data/lib/adwords4r/v2/ReportService.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'xsd/qname'
 
 # {https://adwords.google.com/api/adwords/v2}scheduleReportJob
@@ -565,3 +566,4 @@ class AdGroupStatus < ::String
   Enabled = AdGroupStatus.new("Enabled")
   Paused = AdGroupStatus.new("Paused")
 end
+end

data/lib/adwords4r/v2/ReportServiceDriver.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'adwords4r/v2/ReportService'
 
 require 'soap/rpc/driver'
@@ -79,3 +80,4 @@ private
   end
 end
 
+end

data/lib/adwords4r/v2/TrafficEstimatorService.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'xsd/qname'
 
 # {https://adwords.google.com/api/adwords/v2}estimateCampaignList
@@ -247,3 +248,4 @@ class KeywordType < ::String
   Exact = KeywordType.new("Exact")
   Phrase = KeywordType.new("Phrase")
 end
+end

data/lib/adwords4r/v2/TrafficEstimatorServiceDriver.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'adwords4r/v2/TrafficEstimatorService'
 
 require 'soap/rpc/driver'
@@ -58,3 +59,4 @@ private
   end
 end
 
+end

data/lib/adwords4r/v3/AccountService.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'xsd/qname'
 
 # {https://adwords.google.com/api/adwords/v3}createAdWordsAccount
@@ -624,3 +625,4 @@ class TaxStatus < ::String
   SubjectToTax = TaxStatus.new("SubjectToTax")
   ZeroRated = TaxStatus.new("ZeroRated")
 end
+end

data/lib/adwords4r/v3/AccountServiceDriver.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'adwords4r/v3/AccountService'
 
 require 'soap/rpc/driver'
@@ -149,3 +150,4 @@ private
   end
 end
 
+end

data/lib/adwords4r/v3/AdGroupService.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'xsd/qname'
 
 # {https://adwords.google.com/api/adwords/v3}getAdGroupList
@@ -316,3 +317,4 @@ class AdGroupStatus < ::String
   Enabled = AdGroupStatus.new("Enabled")
   Paused = AdGroupStatus.new("Paused")
 end
+end

data/lib/adwords4r/v3/AdGroupServiceDriver.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'adwords4r/v3/AdGroupService'
 
 require 'soap/rpc/driver'
@@ -93,3 +94,4 @@ private
   end
 end
 
+end

data/lib/adwords4r/v3/CampaignService.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'xsd/qname'
 
 # {https://adwords.google.com/api/adwords/v3}getCampaign
@@ -527,3 +528,4 @@ class NetworkType < ::String
   GoogleSearch = NetworkType.new("GoogleSearch")
   SearchNetwork = NetworkType.new("SearchNetwork")
 end
+end

data/lib/adwords4r/v3/CampaignServiceDriver.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'adwords4r/v3/CampaignService'
 
 require 'soap/rpc/driver'
@@ -107,3 +108,4 @@ private
   end
 end
 
+end

data/lib/adwords4r/v3/CreativeService.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'xsd/qname'
 
 # {https://adwords.google.com/api/adwords/v3}getAllCreatives
@@ -397,3 +398,4 @@ class ImageType < ::String
   Flash = ImageType.new("flash")
   Image = ImageType.new("image")
 end
+end

data/lib/adwords4r/v3/CreativeServiceDriver.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'adwords4r/v3/CreativeService'
 
 require 'soap/rpc/driver'
@@ -100,3 +101,4 @@ private
   end
 end
 
+end

data/lib/adwords4r/v3/CriterionService.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'xsd/qname'
 
 # {https://adwords.google.com/api/adwords/v3}getAllCriteria
@@ -411,3 +412,4 @@ class KeywordType < ::String
   Exact = KeywordType.new("Exact")
   Phrase = KeywordType.new("Phrase")
 end
+end

data/lib/adwords4r/v3/CriterionServiceDriver.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'adwords4r/v3/CriterionService'
 
 require 'soap/rpc/driver'
@@ -93,3 +94,4 @@ private
   end
 end
 
+end

data/lib/adwords4r/v3/InfoService.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'xsd/qname'
 
 # {https://adwords.google.com/api/adwords/v3}getOperationCount
@@ -256,3 +257,4 @@ class ApiException
     @violations = violations
   end
 end
+end

data/lib/adwords4r/v3/InfoServiceDriver.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'adwords4r/v3/InfoService'
 
 require 'soap/rpc/driver'
@@ -86,3 +87,4 @@ private
   end
 end
 
+end

data/lib/adwords4r/v3/KeywordService.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'xsd/qname'
 
 # {https://adwords.google.com/api/adwords/v3}getAllKeywords
@@ -539,3 +540,4 @@ class KeywordType < ::String
   Exact = KeywordType.new("Exact")
   Phrase = KeywordType.new("Phrase")
 end
+end

data/lib/adwords4r/v3/KeywordServiceDriver.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'adwords4r/v3/KeywordService'
 
 require 'soap/rpc/driver'
@@ -121,3 +122,4 @@ private
   end
 end
 
+end

data/lib/adwords4r/v3/KeywordToolService.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'xsd/qname'
 
 # {https://adwords.google.com/api/adwords/v3}getKeywordVariations
@@ -223,3 +224,4 @@ class KeywordType < ::String
   Exact = KeywordType.new("Exact")
   Phrase = KeywordType.new("Phrase")
 end
+end

data/lib/adwords4r/v3/KeywordToolServiceDriver.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'adwords4r/v3/KeywordToolService'
 
 require 'soap/rpc/driver'
@@ -51,3 +52,4 @@ private
   end
 end
 
+end

data/lib/adwords4r/v3/ReportService.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'xsd/qname'
 
 # {https://adwords.google.com/api/adwords/v3}scheduleReportJob
@@ -565,3 +566,4 @@ class AdGroupStatus < ::String
   Enabled = AdGroupStatus.new("Enabled")
   Paused = AdGroupStatus.new("Paused")
 end
+end

data/lib/adwords4r/v3/ReportServiceDriver.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'adwords4r/v3/ReportService'
 
 require 'soap/rpc/driver'
@@ -79,3 +80,4 @@ private
   end
 end
 
+end

data/lib/adwords4r/v3/TrafficEstimatorService.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'xsd/qname'
 
 # {https://adwords.google.com/api/adwords/v3}estimateCampaignList
@@ -261,3 +262,4 @@ class KeywordType < ::String
   Exact = KeywordType.new("Exact")
   Phrase = KeywordType.new("Phrase")
 end
+end

data/lib/adwords4r/v3/TrafficEstimatorServiceDriver.rb

@@ -1,3 +1,4 @@
+module AdWords
 require 'adwords4r/v3/TrafficEstimatorService'
 
 require 'soap/rpc/driver'
@@ -58,3 +59,4 @@ private
   end
 end
 
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: adwords4r
 version: !ruby/object:Gem::Version 
-  version: "0.3"
-date: 2006-04-21 00:00:00 -07:00
+  version: "0.4"
+date: 2006-05-03 00:00:00 -07:00
 summary: Client library for the AdWords API.
 require_paths: 
 - lib
@@ -38,6 +38,7 @@ files:
 - Rakefile
 - lib/adwords4r.rb
 - lib/adwords4r/credentials.rb
+- lib/adwords4r/registry.rb
 - lib/adwords4r/services.rb
 - lib/adwords4r/v2/AccountService.rb
 - lib/adwords4r/v2/AccountServiceDriver.rb