sem4r 0.1.2 → 0.1.3

data/lib/sem4r/ad_group_ad/ad_group_mobile_ad.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 # 
@@ -61,7 +62,10 @@ module Sem4r
       @image = MobileAdImage.new(self, &block)
     end
 
-    def xml(t)
+    #
+    # @private
+    #
+    def _xml(t)
       t.adGroupId   ad_group.id
       t.ad("xsi:type" => "MobileAd") do |ad|
         ad.headline        headline
@@ -83,32 +87,19 @@ module Sem4r
       t.status status
     end
 
-    def to_xml(tag)
-      builder = Builder::XmlMarkup.new
-      builder.tag!(tag, "xsi:type" => "AdGroupAd") do |t|
-        xml(t)
-        #      t.adGroupId   ad_group.id
-        #      t.ad("xsi:type" => "MobileAd") do |ad|
-        #        ad.headline        headline
-        #        ad.description     description
-        #        unless markups.empty?
-        #          markups.each do |m|
-        #            ad.markupLanguages m
-        #          end
-        #        end
-        #        unless carriers.empty?
-        #          carriers.each do |carrier|
-        #            ad.mobileCarriers carrier
-        #          end
-        #        end
-        #        ad.businessName    business_name
-        #        ad.countryCode     country_code
-        #        ad.phoneNumber     phone_number
-        #      end
-        #      t.status status
+    def xml(t, tag = nil)
+      if tag
+        t.__send__(tag, {"xsi:type" => "AdGroupAd"}) { |t| _xml(t) }
+      else
+        _xml(t)
       end
     end
 
+    def to_xml(tag)
+      xml(Builder::XmlMarkup.new, tag)
+    end
+
+
     def self.from_element(ad_group, el)
       new(ad_group) do
         @id         = el.at_xpath("id").text.strip.to_i
@@ -124,7 +115,7 @@ module Sem4r
 
     def save
       unless @id
-        soap_message = service.ad_group_ad.create(credentials, to_xml("operand"))
+        soap_message = service.ad_group_ad.create( credentials, to_xml("operand") )
         add_counters( soap_message.counters )
         rval = soap_message.response.xpath("//mutateResponse/rval", soap_message.response_headers).first
         id = rval.xpath("value/ad/id").first

data/lib/sem4r/ad_group_ad/ad_group_text_ad.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 # 
@@ -38,7 +39,10 @@ module Sem4r
       "#{@id} textad '#{headline}' #{url}"
     end
 
-    def xml(t)
+    #
+    # @private
+    #
+    def _xml(t)
       t.adGroupId   ad_group.id
       t.ad("xsi:type" => "TextAd") do |ad|
         ad.url              url
@@ -50,22 +54,22 @@ module Sem4r
       t.status status
     end
 
-    def to_xml(tag)
-      builder = Builder::XmlMarkup.new
-      builder.tag!(tag, "xsi:type" => "AdGroupAd") do |t|
-        xml(t)
-        #        t.adGroupId   ad_group.id
-        #        t.ad("xsi:type" => "TextAd") do |ad|
-        #          ad.url              url
-        #          ad.displayUrl       display_url
-        #          ad.headline         headline
-        #          ad.description1     description1
-        #          ad.description2     description2
-        #        end
-        #        t.status status
+    #
+    # Marshall with Builder::XmlMarkup
+    #
+    def xml(t, tag = nil)
+      if tag
+        t.__send__(tag, "xsi:type" => "AdGroupAd") { |t| _xml(t) }
+      else
+        _xml(t)
       end
     end
 
+    def to_xml(tag)
+      xml(Builder::XmlMarkup.new, tag)
+    end
+
+
     def self.from_element(ad_group, el)
       new(ad_group) do
         @id         = el.at_xpath("id").text.strip.to_i

data/lib/sem4r/ad_group_criterion/ad_group_criterion.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 #
@@ -27,7 +28,7 @@ module Sem4r
   # http://code.google.com/apis/adwords/v2009/docs/reference/AdGroupCriterionService.AdGroupCriterion.html
   #
   class AdGroupCriterion
-    include SoapAttributes
+    include Sem4rSoap::SoapAttributes
     
     g_accessor :criterion
 
@@ -51,7 +52,7 @@ module Sem4r
       unless criterion.saved?
         o = AdGroupCriterionOperation.new.add(self)
         soap_message =
-          criterion.service.ad_group_criterion.mutate(criterion.credentials, o.to_xml("operations"))
+          criterion.service.ad_group_criterion.mutate( credentials, o.to_xml("operations") )
         criterion.add_counters( soap_message.counters )
         rval = soap_message.response.xpath("//mutateResponse/rval").first
         id = rval.xpath("value/criterion/id").first
@@ -84,24 +85,25 @@ module Sem4r
       end
     end
 
-    def xml(t)
+    def _xml(t)
       t.adGroupId   @ad_group.id
       # t.status "ENABLED"
       criterion.xml(t)
       @bids.xml(t) if @bids
     end
 
-    def to_xml(tag)
-      builder = Builder::XmlMarkup.new
-      builder.tag!(tag, "xsi:type" => "BiddableAdGroupCriterion") do |t|
-        xml(t)
-        #        t.adGroupId   @ad_group.id
-        #        # t.status "ENABLED"
-        #        criterion.to_xml(t)
-        #        @bids.to_xml(t) if @bids
+    def xml(t, tag = nil)
+      if tag
+        t.__send__(tag, {"xsi:type" => "BiddableAdGroupCriterion"}) { |t| _xml(t) }
+      else
+        _xml(t)
       end
     end
 
+    def to_xml(tag)
+      xml(Builder::XmlMarkup.new, tag)
+    end
+
   end
 
   class NegativeAdGroupCriterion < AdGroupCriterion
@@ -123,22 +125,28 @@ module Sem4r
       end
     end
 
-    def xml(t)
+    # @private
+    #
+    #
+    def _xml(t)
       t.adGroupId   criterion.ad_group.id
       # t.status "ENABLED"
       criterion.xml(t)
     end
 
-    def to_xml(tag)
-      builder = Builder::XmlMarkup.new
-      builder.tag!(tag, "xsi:type" => "NegativeAdGroupCriterion") do |t|
-        xml(t)
-        #        t.adGroupId   criterion.ad_group.id
-        #        # t.status "ENABLED"
-        #        criterion.to_xml(t)
+    def xml(t, tag = nil)
+      if tag
+        t.__send__(tag, {"xsi:type" => "NegativeAdGroupCriterion"}) { |t| _xml(t) }
+      else
+        _xml(t)
       end
     end
 
+    def to_xml(tag)
+      xml(Builder::XmlMarkup.new, tag)
+    end
+
+
   end
 
 end

data/lib/sem4r/ad_group_criterion/ad_group_criterion_bids.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 # 
@@ -25,7 +26,7 @@
 module Sem4r
 
   class AdGroupCriterionBids
-    include SoapAttributes
+    include Sem4rSoap::SoapAttributes
 
     enum :Types, [
       :BudgetOptimizerAdGroupCriterionBids,

data/lib/sem4r/ad_group_criterion/ad_group_criterion_operations.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 # 

data/lib/sem4r/ad_group_criterion/ad_group_criterion_service.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 #
@@ -22,8 +23,11 @@
 # -------------------------------------------------------------------
 
 module Sem4r
-  class AdGroupCriterionService
-    include SoapCall
+
+  #
+  # @private
+  #
+  class AdGroupCriterionService < Sem4rSoap::SoapServiceV2010 #:nodoc: all
 
     def initialize(connector)
       @connector = connector
@@ -31,10 +35,11 @@ module Sem4r
       @header_namespace = @service_namespace
 
       @sandbox_service_url = "https://adwords-sandbox.google.com/api/adwords/cm/v201008/AdGroupCriterionService"
+      init(@header_namespace, @service_namespace)
     end
 
-    soap_call_v2010 :all,   :mutate => false
-    soap_call_v2010 :mutate
+    soap_call :all,   :mutate => false
+    soap_call :mutate
 
     private
     

data/lib/sem4r/ad_group_criterion/criterion.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 #

data/lib/sem4r/ad_group_criterion/criterion_keyword.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 #

data/lib/sem4r/ad_group_criterion/criterion_placement.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 #

data/lib/sem4r/ad_param/ad_param.rb

@@ -52,6 +52,8 @@ module Sem4r
       "#{@id} #{@index} #{@text}"
     end
 
+    # @private
+    #
     # adGroupId  	   Id of ad_group This field is required and should not be null.
     # criterionId 	 The id of the Keyword criterion that this ad parameter applies to.
     #                The keyword must be associated with the same ad_group as this AdParam.
@@ -61,16 +63,30 @@ module Sem4r
     #                within Operators : SET. The length of this string should be
     #                between 1 and 25, inclusive.
     # paramIndex
-    def to_xml(tag)
-      builder = Builder::XmlMarkup.new
-      builder.tag!(tag) do |t|
-        t.adGroupId     @ad_group.id
-        t.criterionId   @criterion.id
-        t.insertionText @text
-        t.paramIndex    @index
+    def _xml(t)
+      t.adGroupId     @ad_group.id
+      t.criterionId   @criterion.id
+      t.insertionText @text
+      t.paramIndex    @index
+    end
+
+    #
+    # Marshall to xml
+    # @param [Builder::XmlMarkup]
+    #
+    def xml(t, tag = nil)
+      if tag
+        t.__send__(tag) { |t| _xml(t) }
+      else
+        _xml(t)
       end
     end
 
+    def to_xml(tag)
+      xml(Builder::XmlMarkup.new, tag)
+    end
+
+
     def self.from_element(ad_group, el)
       criterion_id = el.at_xpath("criterionId").text.strip.to_i
       criterion = ad_group.find_criterion(criterion_id)
@@ -85,7 +101,7 @@ module Sem4r
     def save
       return if @saved
       o = AdParamOperation.new.set( self )
-      soap_message = service.ad_param.mutate(credentials, o.to_xml("operations") )
+      soap_message = service.ad_param.mutate( credentials, o.to_xml("operations") )
       add_counters( soap_message.counters )
       # ignore response ad_param doesn't have id
       @saved = true

data/lib/sem4r/ad_param/ad_param_service.rb

@@ -23,21 +23,24 @@
 # -------------------------------------------------------------------------
 
 module Sem4r
-  class AdParamService
-    include SoapCall
+
+  #
+  # @private
+  #
+  class AdParamService < Sem4rSoap::SoapServiceV2010
 
     def initialize(connector)
       @connector = connector
-
       @service_namespace = "https://adwords.google.com/api/adwords/cm/v201008"
       @header_namespace = @service_namespace
 
       @sandbox_service_url    = "https://adwords-sandbox.google.com/api/adwords/cm/v201008/AdParamService"
       @production_service_url = "https://adwords.google.com/api/adwords/cm/v201008/AdParamService"
+      init(@header_namespace, @service_namespace)
     end
 
-    soap_call_v2010 :all, :mutate => false
-    soap_call_v2010 :mutate
+    soap_call :all, :mutate => false
+    soap_call :mutate
 
     private