sem4r 0.1.1 → 0.1.2

data/lib/sem4r/v13_report/report_account_extension.rb

@@ -0,0 +1,63 @@
+# -------------------------------------------------------------------------
+# Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
+# 
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# 
+# -------------------------------------------------------------------------
+
+module Sem4r
+
+  module ReportAccountExtension
+    ############################################################################
+    # Reports - Service Report
+
+    def report(&block)
+      Report.new(self, &block)
+    end
+
+    def p_reports(refresh = false)
+      reports(refresh).each do |report|
+        puts report.to_s
+      end
+    end
+
+    def reports(refresh = false)
+      _reports unless @reports and !refresh
+      @reports
+    end
+
+    private
+
+    def _reports
+      soap_message = service.report.all(credentials)
+      add_counters( soap_message.counters )
+      els = soap_message.response.xpath("//getAllJobsResponse/getAllJobsReturn")
+      @reports = els.map do |el|
+        Report.from_element(self, el)
+      end
+    end
+
+  end
+
+  class Account
+    include ReportAccountExtension
+  end
+  
+end

data/lib/sem4r/v13_report/report_job.rb

@@ -42,7 +42,7 @@ module Sem4r
     def status
       soap_message = service.report.status(credentials, @job_id)
       add_counters( soap_message.counters )
-      el = REXML::XPath.first( soap_message.response, "//getReportJobStatusResponse/getReportJobStatusReturn")
+      el = soap_message.response.xpath("//getReportJobStatusResponse/getReportJobStatusReturn").first
       status = el.text
       status
     end

data/lib/sem4r.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 #
@@ -23,9 +24,14 @@
 
 require 'yaml'
 require 'pathname'
-require 'rubygems'
+
+# use bundler
+require "rubygems"
+require "bundler/setup"
+
 require 'builder'
-require 'rexml/document'
+# require 'rexml/document'
+require 'nokogiri'
 require 'uri'
 require 'pp'
 require 'logger'
@@ -50,26 +56,37 @@ require 'sem4r/extensions.rb'
 require 'sem4r/adwords'
 require 'sem4r/credentials'
 require 'sem4r/sem4r_error'
-require 'sem4r/soap_attributes'
+require 'soap_helpers/soap_attributes'
 
 require 'sem4r/base'
 require 'sem4r/account'
 
+require 'sem4r/bulk_mutate_job/bulk_mutate_job_account_extension'
+require 'sem4r/campaign/campaign_account_extension'
+require 'sem4r/geo_location/geo_location_account_extension'
+require 'sem4r/info/info_account_extension'
+require 'sem4r/report_definition/report_definition_account_extension'
+require 'sem4r/targeting_idea/targeting_idea_account_extension'
+
+require 'sem4r/v13_report/report_account_extension'
+require 'sem4r/v13_account/account_account_extension'
 
 #
 # soap connection layer
 #
 require 'sem4r/services/soap_error'
+require 'sem4r/services/http_connector'
+require 'sem4r/services/soap_dumper'
 require 'sem4r/services/soap_connector'
 require 'sem4r/services/soap_message_v13'
-require 'sem4r/services/soap_message_v2009'
+require 'sem4r/services/soap_message_v2010'
 require 'sem4r/services/soap_call'
 require 'sem4r/services/service'
 
 #
 # common
 #
-require 'sem4r/common/operation'
+require 'sem4r/operation'
 
 #
 # adgroup
@@ -114,6 +131,10 @@ require 'sem4r/bulk_mutate_job/bulk_mutate_job'
 #
 require 'sem4r/campaign/campaign'
 
+#
+# info
+#
+require'sem4r/info/info_selector'
 
 #
 # targeting_idea
@@ -137,6 +158,6 @@ require 'sem4r/v13_report/report_job'
 # report_definition
 #
 require 'sem4r/report_definition/report_definition'
+require 'sem4r/report_definition/report_field'
 require 'sem4r/report_definition/report_definition_selector'
 require 'sem4r/report_definition/report_definition_operation'
-

data/lib/sem4r_cli.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 #
@@ -32,9 +33,6 @@ require 'sem4r/cli/cli_command'
 require 'sem4r/cli/cli_helpers'
 
 # commands
-require 'sem4r/cli/cli_commands'
-require 'sem4r/cli/cli_download_report'
-require 'sem4r/cli/cli_ideas'
-require 'sem4r/cli/cli_list_ads'
-require 'sem4r/cli/cli_list_keywords'
-require 'sem4r/cli/cli_request_report'
+Dir[File.join( File.dirname(__FILE__), "sem4r", "cli", "commands", "*.rb" )].each do |f|
+  require f
+end

data/lib/{sem4r → soap_helpers}/soap_attributes.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 #
@@ -22,12 +23,51 @@
 # -------------------------------------------------------------------
 
 module Sem4r
+
+  class MetaSoapAttribute
+    attr_reader :name, :xpath
+    def initialize(name, is_enum, xpath = nil)
+      @name, @is_enum = name.to_sym, is_enum
+      if xpath
+        @xpath = xpath
+      else
+        @xpath = name.to_s.camel_case 
+      end
+    end
+
+    def enum?
+      @is_enum
+    end
+  end
+
   module SoapAttributes
 
     def self.included(base)
       base.extend ClassMethods
     end
 
+    def _to_xml(tag)
+      builder = Builder::XmlMarkup.new
+      builder.tag!(tag) do |t|
+        self.class.attributes.each do |a|
+          unless a.enum?
+            value = self.send(a.name)
+            t.__send__(a.xpath, value) unless value.nil? # value could be a boolean so 'if value' is wrong
+          end
+        end
+      end
+    end
+
+    def _from_element(el)
+      self.class.attributes.each do |a|
+        unless a.enum?
+          value = el.at_xpath(a.xpath)
+          __send__ a.name, value.text.strip unless value.nil?
+        end
+      end
+      self
+    end
+
     module ClassMethods
 
       def enum(set, values)
@@ -41,21 +81,36 @@ module Sem4r
         const_set( set.to_sym, tmp )
       end
 
+      def attributes
+        @attributes
+      end
+
       def g_reader(name)
+        @attributes  ||= []
+        @attributes << MetaSoapAttribute.new(name, false)
         attr_reader name
       end
 
+
       #
       # constraints
-      #   values_in
+      #   :values_in
+      #   :if_type
+      #   :default
       #
       # TODO: g_accessor prende in input anche elements ed estrae automaticamente l'elemento che interessa
-      #       cioe' invece di scrivere headline       el.elements["headline"].text dovrebbe bastare scrivere
+      #       cioe' invece di scrivere headline       el.at_xpath("headline").text dovrebbe bastare scrivere
       #       headline el
       def g_accessor(name, constraints = {})
+        constraints.assert_valid_keys(:xpath, :values_in, :if_type, :default)
+        attribute = add_attribute(name, false, constraints[:xpath])
         name = name.to_s
 
-        # vales_in
+        #
+        # define setter
+        #
+
+        # values_in
         enum = nil
         if constraints.key?(:values_in)
           enum = const_get(constraints[:values_in])
@@ -68,12 +123,6 @@ module Sem4r
           other_instance_var = "type"
         end
 
-        # default_value
-        default_value = nil
-        if constraints.key?(:default)
-          default_value = constraints[:default]
-        end
-
         define_method "#{name}=" do |value|
           if enum and !enum.include?(value)
             raise "Value '#{value}' not permitted "
@@ -85,6 +134,16 @@ module Sem4r
           instance_variable_set "@#{name}", value
         end
 
+        #
+        # define getter ( almost :-) )
+        #
+
+        # default_value
+        default_value = nil
+        if constraints.key?(:default)
+          default_value = constraints[:default]
+        end
+
         define_method "#{name}" do |*values|  # |value = nil| is incorrect in ruby 1.8
           raise ArgumentError, "wrong number of arguments (#{values.size} for 0)" if values.length > 1
           value = values.first
@@ -99,8 +158,11 @@ module Sem4r
       end
       
       def g_set_accessor(column, constraints = {})
+        constraints.assert_valid_keys(:values_in)
+
         column  = column.to_s
         columns = "#{column}s"
+        attribute = add_attribute(columns, true)
 
         # values_in
         enum = nil
@@ -108,6 +170,12 @@ module Sem4r
           enum = const_get(constraints[:values_in])
         end
 
+        #
+        # define
+        #    column= :a
+        #    column :a
+        #
+
         define_method "#{column}=" do |value|
           if enum and !enum.include?(value)
             raise "Value not permitted #{value}"
@@ -120,6 +188,13 @@ module Sem4r
 
         alias_method column, "#{column}="
 
+        #
+        # define
+        #    colums [:a,:b,:c]
+        # define
+        #    colums
+        #
+
         define_method "#{columns}" do |*values|
           if values and !values.empty?
             instance_eval "@#{columns} ||= []"
@@ -131,11 +206,28 @@ module Sem4r
             instance_variable_get "@#{columns}"
           end
         end
+      end
 
+      def _from_element(el)
+        return nil unless el
+        new._from_element(el)
       end
-      
-    end
 
-  end
-end
+      private
+
+      def add_attribute(name, is_enum, xpath = nil)
+        @attributes  ||= []
+        name = name.to_sym
+        m = @attributes.find { |e| e.name == name.to_sym }
+        if m
+          raise "attribute #{name} already defined!!"
+        end
+        m = MetaSoapAttribute.new(name, is_enum, xpath)
+        @attributes << m
+        m
+      end
+
+    end # ClassMethods
 
+  end # SoapAttributes
+end # Sem4r