Fixes require sentences for fault classes (issue #2). Support for OAuth

Author: jplopez

bing-ads-api-0.2.0.gem

@@ -17,7 +17,13 @@
 Dir[File.join(File.dirname(__FILE__), 'bing-ads-api', 'data', '*.rb')].each { |file| require file }
 
 # Require Fault objects
-Dir[File.join(File.dirname(__FILE__), 'bing-ads-api', 'fault', '*.rb')].each { |file| require file }
+require 'bing-ads-api/fault/application_fault'
+require 'bing-ads-api/fault/ad_api_error'
+require 'bing-ads-api/fault/ad_api_fault_detail'
+require 'bing-ads-api/fault/api_fault_detail'
+require 'bing-ads-api/fault/batch_error'
+require 'bing-ads-api/fault/operation_error'
+require 'bing-ads-api/fault/partial_errors'
 
 # Require Reporting helper objects
 Dir[File.join(File.dirname(__FILE__), 'bing-ads-api', 'data', 'reporting', 'helpers', '*.rb')].each { |file| require file }

lib/bing-ads-api.rb

@@ -12,7 +12,7 @@ wsdl:
     reporting: "https://api.sandbox.bingads.microsoft.com/Api/Advertiser/Reporting/V9/ReportingService.svc?singleWsdl"
   production:
     campaign_management: "https://api.bingads.microsoft.com/Api/Advertiser/CampaignManagement/v9/CampaignManagementService.svc?singleWsdl"
-    customer_management: "i.bingads.microsoft.com/Api/CustomerManagement/v9/CustomerManagementService.svc?singleWsdl"
+    customer_management: "https://clientcenter.api.bingads.microsoft.com/Api/CustomerManagement/v9/CustomerManagementService.svc?singleWsdl"
     reporting: "https://api.bingads.microsoft.com/Api/Advertiser/Reporting/V9/ReportingService.svc?singleWsdl"
 
 # All major constants are here

lib/bing-ads-api.yml

@@ -33,7 +33,7 @@ class ClientProxy
 
 
 		# Atributos del client proxy
-		attr_accessor :username, :password, :developer_token, :wsdl_url, :account_id, :customer_id, :service, :namespace
+		attr_accessor :username, :password, :developer_token, :authentication_token, :wsdl_url, :account_id, :customer_id, :service, :namespace
 
 		# Public : Constructor 
 		# 
@@ -67,8 +67,12 @@ class ClientProxy
 		# Returns:: ClientProxy instance
 		def initialize(options=nil)
 			if options
-				@username        ||= options[:username]
-				@password        ||= options[:password]
+				if options[:authentication_token]
+					@authentication_token ||= options[:authentication_token]
+				else
+					@username    ||= options[:username]
+					@password    ||= options[:password]
+				end
 				@developer_token ||= options[:developer_token]
 				@wsdl_url        ||= options[:wsdl_url]
 				@account_id      ||= options[:account_id]
@@ -115,17 +119,29 @@ def get_proxy(client_settings)
 					convert_request_keys_to: KEYS_CASE,
 					wsdl: self.wsdl_url,
 					namespace_identifier: NAMESPACE,
-					soap_header: {
-						"#{NAMESPACE.to_s}:CustomerAccountId" => self.account_id,
-						"#{NAMESPACE.to_s}:CustomerId" => self.customer_id,
-						"#{NAMESPACE.to_s}:DeveloperToken" => self.developer_token,
-						"#{NAMESPACE.to_s}:UserName" => self.username,
-						"#{NAMESPACE.to_s}:Password" => self.password
-					}
+					soap_header: build_headers
 				}
 				settings.merge(client_settings) if client_settings
+				puts "settings"
+				puts settings
 				return Savon.client(settings)
 			end
+			
+			
+			def build_headers
+				headers = {
+					"#{NAMESPACE.to_s}:CustomerAccountId" => self.account_id,
+					"#{NAMESPACE.to_s}:CustomerId" => self.customer_id,
+					"#{NAMESPACE.to_s}:DeveloperToken" => self.developer_token,
+				}
+				if self.authentication_token
+					headers["#{NAMESPACE.to_s}:AuthenticationToken"] = self.authentication_token
+				else
+					headers["#{NAMESPACE.to_s}:UserName"] = self.username
+					headers["#{NAMESPACE.to_s}:Password"] = self.password
+				end
+				return headers
+			end
 	end
 
 end

lib/bing-ads-api/client_proxy.rb

@@ -6,6 +6,15 @@
 # Author:: jlopezn@neonline.cl 
 class BingAdsApiTest < ActiveSupport::TestCase
 
+	def setup
+		@username = ""
+		@password = ""
+		@developer_token = ""
+		@customer_id = ""
+		@account_id = ""
+		@auth_token = ""
+	end
+
 	test "truth" do
 		assert_kind_of Module, BingAdsApi
 	end
@@ -53,11 +62,11 @@ class BingAdsApiTest < ActiveSupport::TestCase
 
 	test "create client proxy" do
 		options = {
-			:username => "desarrollo_neonline",
-			:password => "neonline2013",
-			:developer_token => "BBD37VB98",
-			:customer_id => "21021746",
-			:account_id => "5978083",
+			:username => @username,
+			:password => @password,
+			:developer_token => @developer_token,
+			:customer_id => @customer_id,
+			:account_id => @account_id,
 			:wsdl_url => "https://api.sandbox.bingads.microsoft.com/Api/Advertiser/CampaignManagement/v9/CampaignManagementService.svc?singleWsdl"
 		}
 		client = BingAdsApi::ClientProxy.new(options)
@@ -71,11 +80,11 @@ class BingAdsApiTest < ActiveSupport::TestCase
 
 	test "create client proxy with additional settings" do
 		options = {
-			:username => "desarrollo_neonline",
-			:password => "neonline2013",
-			:developer_token => "BBD37VB98",
-			:customer_id => "21021746",
-			:account_id => "5978083",
+			:username => @username,
+			:password => @password,
+			:developer_token => @developer_token,
+			:customer_id => @customer_id,
+			:account_id => @account_id,
 			:wsdl_url => "https://api.sandbox.bingads.microsoft.com/Api/Advertiser/CampaignManagement/v9/CampaignManagementService.svc?singleWsdl",
 			:proxy => {
 				:logger => Rails.logger, 
@@ -91,13 +100,42 @@ class BingAdsApiTest < ActiveSupport::TestCase
 	end
 
 
+	test "create oauth client proxy" do
+		
+		options = {
+			:authentication_token => @auth_token,
+			:developer_token => @developer_token,
+			:customer_id => @customer_id,
+			:account_id => @account_id,
+			:wsdl_url => "https://api.bingads.microsoft.com/Api/Advertiser/CampaignManagement/v9/CampaignManagementService.svc?singleWsdl",
+			:proxy => {
+				:logger => Rails.logger, 
+				:encoding => "UTF-8"
+			}
+		}
+		client = BingAdsApi::ClientProxy.new(options)
+		#puts client.inspect
+		assert !client.nil?, "Client proxy not created"
+
+		#puts client.service
+		assert !client.service.nil?, "Service client not created"
+		
+		#call service method
+		assert_nothing_raised(Exception, "Service call raised exception") {
+			response = client.call(:get_campaigns_by_account_id, 
+				message: {Account_id: "2642632"})
+			puts response
+		}
+	end
+
+
 	test "call service" do
 		options = {
-			:username => "desarrollo_neonline",
-			:password => "neonline2013",
-			:developer_token => "BBD37VB98",
-			:customer_id => "21021746",
-			:account_id => "5978083",
+			:username => @username,
+			:password => @password,
+			:developer_token => @developer_token,
+			:customer_id => @customer_id,
+			:account_id => @account_id,
 			:wsdl_url => "https://api.sandbox.bingads.microsoft.com/Api/Advertiser/CampaignManagement/v9/CampaignManagementService.svc?singleWsdl"
 		}
 
@@ -113,11 +151,11 @@ class BingAdsApiTest < ActiveSupport::TestCase
 	test "create and call from config" do
 		config = BingAdsApi::Config.instance
 		options = {
-			:username => "desarrollo_neonline",
-			:password => "neonline2013",
-			:developer_token => "BBD37VB98",
-			:customer_id => "21021746",
-			:account_id => "5978083",
+			:username => @username,
+			:password => @password,
+			:developer_token => @developer_token,
+			:customer_id => @customer_id,
+			:account_id => @account_id,
 			:wsdl_url => config.service_wsdl(:sandbox, :campaign_management)
 		}