adcenter_api 0.0.3 → 0.0.4

data/lib/adcenter_api.rb

@@ -1,19 +1,18 @@
 require 'savon'
 require 'httpi'
 require 'active_support/inflector'
-require 'ads_common/api'
-#require 'ads_common/savon_headers/oauth_header_handler'
 
+require 'ads_common_for_adcenter'
+require 'ads_common_for_adcenter/api_config'
+require 'ads_common_for_adcenter/parameters_validator'
+require 'ads_common_for_adcenter/auth/client_login_handler'
+require 'ads_common_for_adcenter/savon_service'
+require 'ads_common_for_adcenter/savon_headers_base_header_handler'
 require 'adcenter_api/api_config'
 require 'adcenter_api/client_login_header_handler'
 require 'adcenter_api/credential_handler'
 require 'adcenter_api/errors'
 require 'adcenter_api/report_utils'
-require 'ads_common/api_config_decorator'
-require 'ads_common/parameters_validator_decorator'
-require 'ads_common/auth/client_login_handler_decorator'
-require 'ads_common/savon_service_decorator'
-require 'ads_common/savon_headers_base_header_handler_decorator'
 
 module AdcenterApi
 
@@ -21,7 +20,7 @@ module AdcenterApi
   #
   # Holds all the services, as well as login credentials.
   #
-  class Api < AdsCommon::Api
+  class Api < AdsCommonForAdcenter::Api
 
     # Constructor for API.
     def initialize(provided_config = nil)
@@ -37,7 +36,7 @@ module AdcenterApi
     # Retrieve correct soap_header_handler.
     #
     # Args:
-    # - auth_handler: instance of an AdsCommon::Auth::BaseHandler subclass to
+    # - auth_handler: instance of an AdsCommonForAdcenter::Auth::BaseHandler subclass to
     #   handle authentication
     # - version: intended API version
     # - header_ns: header namespace
@@ -50,7 +49,7 @@ module AdcenterApi
       auth_method = @config.read('authentication.method', :CLIENTLOGIN)
       handler_class = case auth_method
                       when :CLIENTLOGIN then AdcenterApi::ClientLoginHeaderHandler
-                      when :OAUTH, :OAUTH2 then AdsCommon::SavonHeaders::OAuthHeaderHandler
+                      when :OAUTH, :OAUTH2 then AdsCommonForAdcenter::SavonHeaders::OAuthHeaderHandler
                       end
       return handler_class.new(@credential_handler, auth_handler, header_ns, default_ns, version)
     end
@@ -151,7 +150,7 @@ module AdcenterApi
       version = api_config.default_version if version.nil?
       # Check if version exists.
       if !api_config.versions.include?(version)
-        raise AdsCommon::Errors::Error, "Unknown version '%s'" % version
+        raise AdsCommonForAdcenter::Errors::Error, "Unknown version '%s'" % version
       end
       return AdcenterApi::ReportUtils.new(self, version)
     end

data/lib/adcenter_api/api_config.rb

@@ -1,8 +1,6 @@
 # encoding: utf-8
 # Helper methods for loading and managing the available services in the AdCenter API.
 
-require 'ads_common/api_config'
-
 require 'adcenter_api/version'
 
 module AdcenterApi
@@ -10,9 +8,9 @@ module AdcenterApi
   # Contains helper methods for loading and managing the available services.
   module ApiConfig
 
-    # Inherit from AdsCommon::ApiConfig
+    # Inherit from AdsCommonForAdcenter::ApiConfig
     class << ApiConfig
-      include AdsCommon::ApiConfig
+      include AdsCommonForAdcenter::ApiConfig
     end
 
     # Set defaults

data/lib/adcenter_api/client_login_header_handler.rb

@@ -1,8 +1,7 @@
 # Handles SOAP headers and namespaces definition for ClientLogin type header.
-require 'ads_common/savon_headers/base_header_handler'
 
 module AdcenterApi
-  class ClientLoginHeaderHandler < AdsCommon::SavonHeaders::BaseHeaderHandler
+  class ClientLoginHeaderHandler < AdsCommonForAdcenter::SavonHeaders::BaseHeaderHandler
 
     private
 

data/lib/adcenter_api/credential_handler.rb

@@ -1,8 +1,7 @@
-require 'ads_common/credential_handler'
 require 'adcenter_api/api_config'
 
 module AdcenterApi
-  class CredentialHandler < AdsCommon::CredentialHandler
+  class CredentialHandler < AdsCommonForAdcenter::CredentialHandler
     # Whether we're making MCC-level requests.
     attr_accessor :use_mcc
     # Whether we're making validate-only requests.
@@ -51,7 +50,7 @@ module AdcenterApi
     # environment.
     #
     # Raises:
-    # - AdsCommon::Error::EnvironmentMismatchError if sandbox credentials are
+    # - AdsCommonForAdcenter::Error::EnvironmentMismatchError if sandbox credentials are
     # being used for production or vice-versa.
     # - AdcenterApi::Errors:BadCredentialsError if supplied credentials are not
     # valid.
@@ -76,12 +75,12 @@ module AdcenterApi
       #case environment
       #  when :PRODUCTION
       #    if sandbox_token
-      #      raise AdsCommon::Errors::EnvironmentMismatchError,
+      #      raise AdsCommonForAdcenter::Errors::EnvironmentMismatchError,
       #          'Attempting to connect to production with sandbox credentials.'
       #    end
       #  when :SANDBOX
       #    if (!sandbox_token)
-      #      raise AdsCommon::Errors::EnvironmentMismatchError,
+      #      raise AdsCommonForAdcenter::Errors::EnvironmentMismatchError,
       #          'Attempting to connect to the sandbox with malformatted ' +
       #          'credentials. Please check http://msdn.microsoft.com/en-US/library/aa983013 for details.'
       #    end

data/lib/adcenter_api/errors.rb

@@ -1,13 +1,12 @@
 # Specific error handling for the Adcenter API.
 
-require 'ads_common/errors'
 
 module AdcenterApi
   module Errors
 
     # This class encapsulates base class for API exceptions. More specific
     # exceptions are generated based on Service WSDL.
-    class ApiException < AdsCommon::Errors::ApiException
+    class ApiException < AdsCommonForAdcenter::Errors::ApiException
       attr_reader :array_fields
 
       def initialize(exception_fault)
@@ -38,15 +37,15 @@ module AdcenterApi
     end
 
     # Error for invalid credentials sush as malformed ID.
-    class BadCredentialsError < AdsCommon::Errors::ApiException
+    class BadCredentialsError < AdsCommonForAdcenter::Errors::ApiException
     end
 
     # Error for malformed report definition.
-    class InvalidReportDefinitionError < AdsCommon::Errors::ApiException
+    class InvalidReportDefinitionError < AdsCommonForAdcenter::Errors::ApiException
     end
 
     # Error for server-side report error.
-    class ReportError < AdsCommon::Errors::ApiException
+    class ReportError < AdsCommonForAdcenter::Errors::ApiException
       attr_reader :http_code
 
       def initialize(http_code, message)
@@ -557,7 +556,7 @@ module AdcenterApi
     }
     CODES.each do |_, constant|
       unless const_defined?(constant)
-        const_set(constant,Class.new(AdsCommon::Errors::ApiException))
+        const_set(constant,Class.new(AdsCommonForAdcenter::Errors::ApiException))
       end
     end
 

data/lib/adcenter_api/report_utils.rb

@@ -3,7 +3,6 @@
 require 'cgi'
 require 'gyoku'
 
-require 'ads_common/http'
 require 'adcenter_api/errors'
 require 'adcenter_api/report_header_handler'
 
@@ -83,7 +82,7 @@ module AdcenterApi
           @api.config.read('service.environment'), @version)
       headers = get_report_request_headers(url, cid)
       log_request(url, headers, definition_text)
-      response = AdsCommon::Http.post_response(url, data, @api.config, headers)
+      response = AdsCommonForAdcenter::Http.post_response(url, data, @api.config, headers)
       check_for_errors(response)
       return response
     end

data/lib/adcenter_api/v7/administration_service.rb

@@ -7,11 +7,10 @@
 #
 # Code generated by AdsCommon library 0.7.3 on 2012-07-04 16:49:14.
 
-require 'ads_common/savon_service'
 require 'adcenter_api/v7/administration_service_registry'
 
 module AdcenterApi; module V7; module AdministrationService
-  class AdministrationService < AdsCommon::SavonService
+  class AdministrationService < AdsCommonForAdcenter::SavonService
     def initialize(config, endpoint)
       namespace = 'https://adcenter.microsoft.com/v7'
       super(config, endpoint, namespace, :v7)

data/lib/adcenter_api/v7/campaign_management_service.rb

@@ -7,11 +7,11 @@
 #
 # Code generated by AdsCommon library 0.7.3 on 2012-07-04 16:49:16.
 
-require 'ads_common/savon_service'
+require 'ads_common_for_adcenter/savon_service'
 require 'adcenter_api/v7/campaign_management_service_registry'
 
 module AdcenterApi; module V7; module CampaignManagementService
-  class CampaignManagementService < AdsCommon::SavonService
+  class CampaignManagementService < AdsCommonForAdcenter::SavonService
     def initialize(config, endpoint)
       namespace = 'https://adcenter.microsoft.com/v7'
       super(config, endpoint, namespace, :v7)

data/lib/adcenter_api/v7/customer_billing_service.rb

@@ -7,11 +7,11 @@
 #
 # Code generated by AdsCommon library 0.7.3 on 2012-07-04 16:49:46.
 
-require 'ads_common/savon_service'
+require 'ads_common_for_adcenter/savon_service'
 require 'adcenter_api/v7/customer_billing_service_registry'
 
 module AdcenterApi; module V7; module CustomerBillingService
-  class CustomerBillingService < AdsCommon::SavonService
+  class CustomerBillingService < AdsCommonForAdcenter::SavonService
     def initialize(config, endpoint)
       namespace = 'https://adcenter.microsoft.com/api/customerbilling'
       super(config, endpoint, namespace, :v7)

data/lib/adcenter_api/v7/customer_management_service.rb

@@ -7,11 +7,11 @@
 #
 # Code generated by AdsCommon library 0.7.3 on 2012-07-04 16:49:48.
 
-require 'ads_common/savon_service'
+require 'ads_common_for_adcenter/savon_service'
 require 'adcenter_api/v7/customer_management_service_registry'
 
 module AdcenterApi; module V7; module CustomerManagementService
-  class CustomerManagementService < AdsCommon::SavonService
+  class CustomerManagementService < AdsCommonForAdcenter::SavonService
     def initialize(config, endpoint)
       namespace = 'https://adcenter.microsoft.com/api/customermanagement'
       super(config, endpoint, namespace, :v7)

data/lib/adcenter_api/v7/notification_service.rb

@@ -7,11 +7,11 @@
 #
 # Code generated by AdsCommon library 0.7.3 on 2012-07-04 16:49:49.
 
-require 'ads_common/savon_service'
+require 'ads_common_for_adcenter/savon_service'
 require 'adcenter_api/v7/notification_service_registry'
 
 module AdcenterApi; module V7; module NotificationService
-  class NotificationService < AdsCommon::SavonService
+  class NotificationService < AdsCommonForAdcenter::SavonService
     def initialize(config, endpoint)
       namespace = 'https://adcenter.microsoft.com/api/notifications'
       super(config, endpoint, namespace, :v7)

data/lib/adcenter_api/v7/reporting_service.rb

@@ -7,11 +7,11 @@
 #
 # Code generated by AdsCommon library 0.7.3 on 2012-07-04 16:49:50.
 
-require 'ads_common/savon_service'
+require 'ads_common_for_adcenter/savon_service'
 require 'adcenter_api/v7/reporting_service_registry'
 
 module AdcenterApi; module V7; module ReportingService
-  class ReportingService < AdsCommon::SavonService
+  class ReportingService < AdsCommonForAdcenter::SavonService
     def initialize(config, endpoint)
       namespace = 'https://adcenter.microsoft.com/v7'
       super(config, endpoint, namespace, :v7)

data/lib/adcenter_api/v8/ad_intelligence_service.rb

@@ -7,11 +7,11 @@
 #
 # Code generated by AdsCommon library 0.7.3 on 2012-07-04 16:49:50.
 
-require 'ads_common/savon_service'
+require 'ads_common_for_adcenter/savon_service'
 require 'adcenter_api/v8/ad_intelligence_service_registry'
 
 module AdcenterApi; module V8; module AdIntelligenceService
-  class AdIntelligenceService < AdsCommon::SavonService
+  class AdIntelligenceService < AdsCommonForAdcenter::SavonService
     def initialize(config, endpoint)
       namespace = 'https://adcenter.microsoft.com/v8'
       super(config, endpoint, namespace, :v8)

data/lib/adcenter_api/v8/administration_service.rb

@@ -7,11 +7,11 @@
 #
 # Code generated by AdsCommon library 0.7.3 on 2012-07-04 16:49:52.
 
-require 'ads_common/savon_service'
+require 'ads_common_for_adcenter/savon_service'
 require 'adcenter_api/v8/administration_service_registry'
 
 module AdcenterApi; module V8; module AdministrationService
-  class AdministrationService < AdsCommon::SavonService
+  class AdministrationService < AdsCommonForAdcenter::SavonService
     def initialize(config, endpoint)
       namespace = 'https://adcenter.microsoft.com/v8'
       super(config, endpoint, namespace, :v8)

data/lib/adcenter_api/v8/bulk_service.rb

@@ -7,11 +7,11 @@
 #
 # Code generated by AdsCommon library 0.7.3 on 2012-07-04 16:49:53.
 
-require 'ads_common/savon_service'
+require 'ads_common_for_adcenter/savon_service'
 require 'adcenter_api/v8/bulk_service_registry'
 
 module AdcenterApi; module V8; module BulkService
-  class BulkService < AdsCommon::SavonService
+  class BulkService < AdsCommonForAdcenter::SavonService
     def initialize(config, endpoint)
       namespace = 'https://adcenter.microsoft.com/v8'
       super(config, endpoint, namespace, :v8)

data/lib/adcenter_api/v8/campaign_management_service.rb

@@ -7,11 +7,11 @@
 #
 # Code generated by AdsCommon library 0.7.3 on 2012-07-04 16:49:55.
 
-require 'ads_common/savon_service'
+require 'ads_common_for_adcenter/savon_service'
 require 'adcenter_api/v8/campaign_management_service_registry'
 
 module AdcenterApi; module V8; module CampaignManagementService
-  class CampaignManagementService < AdsCommon::SavonService
+  class CampaignManagementService < AdsCommonForAdcenter::SavonService
     def initialize(config, endpoint)
       namespace = 'https://adcenter.microsoft.com/v8'
       super(config, endpoint, namespace, :v8)

data/lib/adcenter_api/v8/customer_billing_service.rb

@@ -7,11 +7,11 @@
 #
 # Code generated by AdsCommon library 0.7.3 on 2012-07-04 16:50:24.
 
-require 'ads_common/savon_service'
+require 'ads_common_for_adcenter/savon_service'
 require 'adcenter_api/v8/customer_billing_service_registry'
 
 module AdcenterApi; module V8; module CustomerBillingService
-  class CustomerBillingService < AdsCommon::SavonService
+  class CustomerBillingService < AdsCommonForAdcenter::SavonService
     def initialize(config, endpoint)
       namespace = 'https://adcenter.microsoft.com/api/customerbilling'
       super(config, endpoint, namespace, :v8)

data/lib/adcenter_api/v8/customer_management_service.rb

@@ -7,11 +7,11 @@
 #
 # Code generated by AdsCommon library 0.7.3 on 2012-07-04 16:50:25.
 
-require 'ads_common/savon_service'
+require 'ads_common_for_adcenter/savon_service'
 require 'adcenter_api/v8/customer_management_service_registry'
 
 module AdcenterApi; module V8; module CustomerManagementService
-  class CustomerManagementService < AdsCommon::SavonService
+  class CustomerManagementService < AdsCommonForAdcenter::SavonService
     def initialize(config, endpoint)
       namespace = 'https://adcenter.microsoft.com/api/customermanagement'
       super(config, endpoint, namespace, :v8)

data/lib/adcenter_api/v8/notification_service.rb

@@ -7,11 +7,11 @@
 #
 # Code generated by AdsCommon library 0.7.3 on 2012-07-04 16:50:29.
 
-require 'ads_common/savon_service'
+require 'ads_common_for_adcenter/savon_service'
 require 'adcenter_api/v8/notification_service_registry'
 
 module AdcenterApi; module V8; module NotificationService
-  class NotificationService < AdsCommon::SavonService
+  class NotificationService < AdsCommonForAdcenter::SavonService
     def initialize(config, endpoint)
       namespace = 'https://adcenter.microsoft.com/api/notifications'
       super(config, endpoint, namespace, :v8)

data/lib/adcenter_api/v8/optimizer_service.rb

@@ -7,11 +7,11 @@
 #
 # Code generated by AdsCommon library 0.7.3 on 2012-07-04 16:50:31.
 
-require 'ads_common/savon_service'
+require 'ads_common_for_adcenter/savon_service'
 require 'adcenter_api/v8/optimizer_service_registry'
 
 module AdcenterApi; module V8; module OptimizerService
-  class OptimizerService < AdsCommon::SavonService
+  class OptimizerService < AdsCommonForAdcenter::SavonService
     def initialize(config, endpoint)
       namespace = 'https://adcenter.microsoft.com/v8'
       super(config, endpoint, namespace, :v8)

data/lib/adcenter_api/v8/reporting_service.rb

@@ -7,11 +7,11 @@
 #
 # Code generated by AdsCommon library 0.7.3 on 2012-07-04 16:50:32.
 
-require 'ads_common/savon_service'
+require 'ads_common_for_adcenter/savon_service'
 require 'adcenter_api/v8/reporting_service_registry'
 
 module AdcenterApi; module V8; module ReportingService
-  class ReportingService < AdsCommon::SavonService
+  class ReportingService < AdsCommonForAdcenter::SavonService
     def initialize(config, endpoint)
       namespace = 'https://adcenter.microsoft.com/v8'
       super(config, endpoint, namespace, :v8)

data/lib/adcenter_api/version.rb

@@ -1,5 +1,5 @@
 module AdcenterApi
   module ApiConfig
-    CLIENT_LIB_VERSION = "0.0.3"
+    CLIENT_LIB_VERSION = "0.0.4"
   end
 end

data/lib/ads_common_for_adcenter.rb

@@ -0,0 +1,15 @@
+require 'ads_common/api'
+require 'ads_common/api_config'
+require 'ads_common/savon_headers/base_header_handler'
+require 'ads_common/credential_handler'
+require 'ads_common/errors'
+require 'ads_common/http'
+require 'ads_common/savon_service'
+require 'ads_common/build/savon_generator'
+require 'ads_common/build/savon_registry'
+require 'ads_common/parameters_validator'
+
+####### AdsCommon Overriden for Adcenter #########
+module AdsCommonForAdcenter
+	include AdsCommon
+end

data/lib/{ads_common/api_config_decorator.rb → ads_common_for_adcenter/api_config.rb}

@@ -1,7 +1,6 @@
 ####### Overriden for Adcenter #########
-
-AdsCommon::ApiConfig.module_eval do
-
+module AdsCommonForAdcenter::ApiConfig
+  include AdsCommon::ApiConfig
   # Get the endpoint for a service on a given environment and API version.
   #
   # Args:

data/lib/{ads_common/auth/client_login_handler_decorator.rb → ads_common_for_adcenter/auth/client_login_handler.rb}

@@ -1,11 +1,11 @@
 ####### Overriden for Adcenter #########
 
-AdsCommon::Auth::ClientLoginHandler.class_eval do
+class AdsCommonForAdcenter::Auth::ClientLoginHandler
 
-    ACCOUNT_TYPE = 'GOOGLE'
-    AUTH_PATH = '/accounts/ClientLogin'
-    AUTH_PREFIX = 'GoogleLogin auth='
-    CAPTCHA_PATH = '/accounts/'
+    #ACCOUNT_TYPE = 'GOOGLE'
+    #AUTH_PATH = '/accounts/ClientLogin'
+    #AUTH_PREFIX = 'GoogleLogin auth='
+    #CAPTCHA_PATH = '/accounts/'
 
     # Initializes the ClientLoginHandler with all the necessary details.
     def initialize(config, auth_server, service_name)
@@ -47,20 +47,20 @@ AdsCommon::Auth::ClientLoginHandler.class_eval do
     #   accessed
     #
     # Raises:
-    # - AdsCommon::Errors::AuthError if validation fails
+    # - AdsCommonForAdcenter::Errors::AuthError if validation fails
     #
     def validate_credentials(credentials)
       if credentials.nil?
-        raise AdsCommon::Errors::AuthError, 'No credentials supplied.'
+        raise AdsCommonForAdcenter::Errors::AuthError, 'No credentials supplied.'
       end
 
       if credentials[:auth_token].nil?
         if credentials[:user_name].nil?
-          raise AdsCommon::Errors::AuthError,
+          raise AdsCommonForAdcenter::Errors::AuthError,
               'UserName address not included in credentials.'
         end
         if credentials[:password].nil?
-          raise AdsCommon::Errors::AuthError,
+          raise AdsCommonForAdcenter::Errors::AuthError,
               'Password not included in credentials.'
         end
       else
@@ -82,7 +82,7 @@ AdsCommon::Auth::ClientLoginHandler.class_eval do
     # - The auth token for the account
     #
     # Raises:
-    # - AdsCommon::Errors::AuthError if authentication fails
+    # - AdsCommonForAdcenter::Errors::AuthError if authentication fails
     #
     def create_token(credentials)
       token = credentials.include?(:auth_token) ?
@@ -119,7 +119,7 @@ AdsCommon::Auth::ClientLoginHandler.class_eval do
       data = get_login_data(credentials)
       headers = {'Content-Type' => 'application/x-www-form-urlencoded'}
 
-      response = AdsCommon::Http.post_response(url, data, @config, headers)
+      response = AdsCommonForAdcenter::Http.post_response(url, data, @config, headers)
       results = parse_token_text(response.body)
 
       if response.code == 200 and results.include?('Auth')
@@ -134,7 +134,7 @@ AdsCommon::Auth::ClientLoginHandler.class_eval do
       # Handling for known errors.
       if 'CaptchaRequired'.eql?(results['Error'])
         captcha_url = @server + CAPTCHA_PATH + results['CaptchaUrl']
-        raise AdsCommon::Errors::CaptchaRequiredError.new(results['Error'],
+        raise AdsCommonForAdcenter::Errors::CaptchaRequiredError.new(results['Error'],
             results['CaptchaToken'], captcha_url, results['Url'])
       end
       # For other errors throwing a generic error.
@@ -145,7 +145,7 @@ AdsCommon::Auth::ClientLoginHandler.class_eval do
       if results.include?('Info')
         error_message += " Info: %s." % results['Info']
       end
-      raise AdsCommon::Errors::AuthError.new(error_message, error_str,
+      raise AdsCommonForAdcenter::Errors::AuthError.new(error_message, error_str,
           results['Info'])
     end
 

data/lib/{ads_common/build/savon_registry_decorator.rb → ads_common_for_adcenter/build/savon_registry.rb}

@@ -1,6 +1,5 @@
-require 'ads_common/build/savon_registry'
 
-AdsCommon::Build::SavonRegistry.class_eval do
+class AdsCommonForAdcenter::Build::SavonRegistry
 
   # Extracts input parameters of given method as an array.
   def extract_input_parameters(op_node, doc)

data/lib/{ads_common/parameters_validator_decorator.rb → ads_common_for_adcenter/parameters_validator.rb}

@@ -1,6 +1,5 @@
-require 'ads_common/parameters_validator'
 
-AdsCommon::ParametersValidator.class_eval do
+class AdsCommonForAdcenter::ParametersValidator < AdsCommon::ParametersValidator
 
   # Validates input parameters to:
   # - add parameter names;

data/lib/ads_common_for_adcenter/savon_headers_base_header_handler.rb

@@ -0,0 +1,9 @@
+
+class AdsCommonForAdcenter::SavonHeaders::BaseHeaderHandler
+
+  # Generates SOAP headers with the default request header element.
+  def generate_headers(request, soap)
+    soap.header.merge!(generate_request_header())
+  end
+
+end

data/lib/{ads_common/savon_service_decorator.rb → ads_common_for_adcenter/savon_service.rb}

@@ -1,10 +1,27 @@
 ####### Overriden for Adcenter #########
-require 'ads_common/savon_service'
 
-AdsCommon::SavonService.class_eval do
+class AdsCommonForAdcenter::SavonService < AdsCommon::SavonService
 
   private
 
+  # [CHANGES: 
+  # => ParametersValidator to AdsCommonForAdcenter::ParametersValidator
+  # => ResultsExtractor    to AdsCommon::ResultsExtractor]
+  # Executes SOAP action specified as a string with given arguments.
+    def execute_action(action_name, args, &block)
+      registry = get_service_registry()
+      validator = AdsCommonForAdcenter::ParametersValidator.new(registry)
+      args = validator.validate_args(action_name, args)
+      response = execute_soap_request(
+          action_name.to_sym, args, validator.extra_namespaces)
+      log_headers(response.http.headers)
+      handle_errors(response)
+      extractor = AdsCommon::ResultsExtractor.new(registry)
+      result = extractor.extract_result(response, action_name, &block)
+      run_user_block(extractor, response, result, &block) if block_given?
+      return result
+    end
+
   # Adds namespace to the given string.
   #
   # Args:
@@ -13,13 +30,13 @@ AdsCommon::SavonService.class_eval do
   # Returns:
   #  - String with a namespace
   #
-  def prepend_namespace(str, namespace = AdsCommon::SavonHeaders::BaseHeaderHandler::DEFAULT_NAMESPACE)
+  def prepend_namespace(str, namespace = AdsCommonForAdcenter::SavonHeaders::BaseHeaderHandler::DEFAULT_NAMESPACE)
     return "%s:%s" % [namespace, str]
   end
 
   # Executes the SOAP request with original SOAP name.
   def execute_soap_request(action, args, extra_namespaces)
-    ns = AdsCommon::SavonHeaders::BaseHeaderHandler::DEFAULT_NAMESPACE
+    ns = AdsCommonForAdcenter::SavonHeaders::BaseHeaderHandler::DEFAULT_NAMESPACE
     original_input_name = get_service_registry.get_method_signature(action)[:input][:name].to_s.camelize
     original_action_name = get_service_registry.get_method_signature(action)[:original_name].to_s.camelize
     original_action_name = action if original_action_name.nil?
@@ -59,7 +76,7 @@ AdsCommon::SavonService.class_eval do
       wsdl.endpoint = endpoint
       wsdl.namespace = namespace
       wsdl.element_form_default = :qualified
-      AdsCommon::Http.configure_httpi(@config, httpi)
+      AdsCommonForAdcenter::Http.configure_httpi(@config, httpi)
     end
     client.config.raise_errors = false
     client.config.logger.subject = get_logger()
@@ -107,14 +124,14 @@ AdsCommon::SavonService.class_eval do
         return exception_class.new("#{operation_error[:message]} (#{operation_error[:details]})")
       elsif fault[:faultstring]
         fault_message = fault[:faultstring]
-        return AdsCommon::Errors::ApiException.new(
+        return AdsCommonForAdcenter::Errors::ApiException.new(
             "Unknown exception with error: %s" % fault_message)
       else
         raise ArgumentError.new(fault.to_s)
       end
     rescue Exception => e
       operation_error ||= response[:fault][:detail][:api_fault][:operation_errors][:operation_error] rescue {}
-      return AdsCommon::Errors::ApiException.new(
+      return AdsCommonForAdcenter::Errors::ApiException.new(
           "Failed to resolve exception (%s), details: %s, SOAP fault: %s" %
           [e.message, "#{operation_error[:message]} (#{operation_error[:details]})", response.soap_fault])
     end

data/rakefile.rb

@@ -31,10 +31,9 @@ lib = File.expand_path('../lib/', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 # GENERATE API SERVICES
-require 'ads_common/build/savon_generator'
 require 'adcenter_api/api_config'
-require 'ads_common/api_config_decorator'
-require 'ads_common/build/savon_registry_decorator'
+require 'ads_common_for_adcenter/api_config'
+require 'ads_common_for_adcenter/build/savon_registry'
 desc 'Generate the Adcenter API stubs.'
 
 task :generate do
@@ -47,7 +46,7 @@ task :generate do
     wsdls = AdcenterApi::ApiConfig.get_wsdls(version)
     wsdls.each do |service_name, wsdl_url|
       logger.info('Processing %s at [%s]...' % [service_name, wsdl_url])
-      generator = AdsCommon::Build::SavonGenerator.new(wsdl_url, code_path, api_config.api_name, version, service_name)
+      generator = AdsCommonForAdcenter::Build::SavonGenerator.new(wsdl_url, code_path, api_config.api_name, version, service_name)
       generator.process_wsdl()
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adcenter_api
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -120,12 +120,13 @@ files:
 - lib/adcenter_api/v8/reporting_service_registry.rb
 - lib/adcenter_api/version.rb
 - lib/adcenter_api.rb
-- lib/ads_common/api_config_decorator.rb
-- lib/ads_common/auth/client_login_handler_decorator.rb
-- lib/ads_common/build/savon_registry_decorator.rb
-- lib/ads_common/parameters_validator_decorator.rb
-- lib/ads_common/savon_headers_base_header_handler_decorator.rb
-- lib/ads_common/savon_service_decorator.rb
+- lib/ads_common_for_adcenter/api_config.rb
+- lib/ads_common_for_adcenter/auth/client_login_handler.rb
+- lib/ads_common_for_adcenter/build/savon_registry.rb
+- lib/ads_common_for_adcenter/parameters_validator.rb
+- lib/ads_common_for_adcenter/savon_headers_base_header_handler.rb
+- lib/ads_common_for_adcenter/savon_service.rb
+- lib/ads_common_for_adcenter.rb
 - rakefile.rb
 - README.md
 homepage: https://github.com/weboglobin/adcenter_api

data/lib/ads_common/savon_headers_base_header_handler_decorator.rb

@@ -1,23 +0,0 @@
-####### Overriden for Adcenter #########
-require 'ads_common/savon_headers/base_header_handler'
-
-AdsCommon::SavonHeaders::BaseHeaderHandler.class_eval do
-
-  # Generates SOAP headers with the default request header element.
-  def generate_headers(request, soap)
-    soap.header.merge!(generate_request_header())
-  end
-  # Generates SOAP default request header with all requested headers.
-  #def generate_request_header()
-  #  credentials = @credential_handler.credentials
-  #  extra_headers = credentials[:extra_headers]
-  #  puts "extra_headers=#{extra_headers}"
-  #  return extra_headers.inject({}) do |result, (header, value)|
-  #    puts "header=#{header}"
-  #    puts "value=#{value}"
-  #    result[prepend_namespace(header)] = value
-  #    result
-  #  end
-  #end
-
-end