landslider 0.2.1 → 0.2.2

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 2
-:patch: 1
+:patch: 2
 :build: 

data/lib/landslider.rb

@@ -43,7 +43,7 @@ class Landslider < Handsoap::Service
 	def get_api_version(session_id)
 		self.session_id = session_id
 		
-		response = invoke("urn:getApiVersion", :soap_action => :none)
+		response = invoke("getApiVersion", :soap_action => :none)
 		
 		node = response.document.xpath('//ns:getApiVersionResponse', ns)
 		parse_api_version_result(node)
@@ -113,8 +113,8 @@ class Landslider < Handsoap::Service
 				ans.add 'totalResultsRequested', 10
 			}
 		end
-		puts response.document.inspect
-	
+		node = response.document.xpath('//ns:getContactNotesResponse', ns)
+		parse_get_contact_notes_result(node)
 	end
 	
 	def get_opportunity_notes(session_id, opportunity_id)
@@ -128,8 +128,8 @@ class Landslider < Handsoap::Service
 				ans.add 'totalResultsRequested', 10
 			}
 		end
-		puts response.document.inspect
-
+		node = response.document.xpath('//ns:getOpportunityNotesResponse', ns)
+		parse_get_opportunity_notes_result(node)
 	end
 	
 	def get_lead_notes(session_id, lead_id)
@@ -143,8 +143,8 @@ class Landslider < Handsoap::Service
 				ans.add 'totalResultsRequested', 10
 			}
 		end
-		puts response.document.inspect
-	
+		node = response.document.xpath('//ns:getLeadNotesResponse', ns)
+		parse_get_lead_notes_result(node)
 	end
 	
 	private
@@ -177,6 +177,7 @@ class Landslider < Handsoap::Service
 	def parse_get_accounts_result(node)
 		{
 		:accounts => node.xpath('//Accounts/accountList', ns).map { |child| parse_account(child) },
+		
 		:error => xml_to_bool(node, '//Accounts/error/text()'),
 		:error_code => xml_to_int(node, '//Accounts/errorCode/text()'),
 		:result_msg => xml_to_str(node, '//Accounts/resultMsg/text()'),
@@ -187,17 +188,21 @@ class Landslider < Handsoap::Service
 	
 	def parse_get_account_notes_result(node) 
 		{
+		:notes => parse_notes(node),
+		
 		:error => xml_to_bool(node, './*/error/text()'),
 		:error_code => xml_to_int(node, './*/errorCode/text()'),
 		:result_msg => xml_to_str(node, './*/resultMsg/text()'),
 		:status_code => xml_to_int(node, './*/statusCode/text()'),
-		:results_returned => xml_to_int(node, './*/resultsReturned/text()')
+		:results_returned => xml_to_int(node, './*/resultsReturned/text()'),
+		:total_results_available => xml_to_int(node, './*/totalResultsAvailable/text()')
 		}
 	end
 	
 	def parse_get_account_opportunities_result(node)
 		{
 		:opportunities => node.xpath('./*/opportunityList', ns).map { |child| parse_opportunity(child) },
+		
 		:error => xml_to_bool(node, './*/error/text()'),
 		:results_returned => xml_to_int(node, './*/resultsReturned/text()'),
 		:total_results_available => xml_to_int(node, './*/totalResultsAvailable/text()')
@@ -207,7 +212,48 @@ class Landslider < Handsoap::Service
 	def parse_get_account_contacts_result(node)
 		{
 		:contacts => node.xpath('./*/contactList', ns).map { |child| parse_contact(child) },
+		
+		:error => xml_to_bool(node, './*/error/text()'),
+		:results_returned => xml_to_int(node, './*/resultsReturned/text()'),
+		:total_results_available => xml_to_int(node, './*/totalResultsAvailable/text()')
+		}
+	end
+	
+	def parse_get_contact_notes_result(node)
+		{
+		:notes => parse_notes(node),
+			
+		:error => xml_to_bool(node, './*/error/text()'),
+		:error_code => xml_to_int(node, './*/errorCode/text()'),
+		:result_msg => xml_to_str(node, './*/resultMsg/text()'),
+		:status_code => xml_to_int(node, './*/statusCode/text()'),
+		:results_returned => xml_to_int(node, './*/resultsReturned/text()'),
+		:total_results_available => xml_to_int(node, './*/totalResultsAvailable/text()')
+		
+		}
+	end
+	
+	def parse_get_lead_notes_result(node)
+		{
+		:notes => parse_notes(node),
+		
+		:error => xml_to_bool(node, './*/error/text()'),
+		:error_code => xml_to_int(node, './*/errorCode/text()'),
+		:result_msg => xml_to_str(node, './*/resultMsg/text()'),
+		:status_code => xml_to_int(node, './*/statusCode/text()'),
+		:results_returned => xml_to_int(node, './*/resultsReturned/text()'),
+		:total_results_available => xml_to_int(node, './*/totalResultsAvailable/text()')
+		}
+	end
+	
+	def parse_get_opportunity_notes_result(node)
+		{
+		:notes => parse_notes(node),
+			
 		:error => xml_to_bool(node, './*/error/text()'),
+		:error_code => xml_to_int(node, './*/errorCode/text()'),
+		:result_msg => xml_to_str(node, './*/resultMsg/text()'),
+		:status_code => xml_to_int(node, './*/statusCode/text()'),
 		:results_returned => xml_to_int(node, './*/resultsReturned/text()'),
 		:total_results_available => xml_to_int(node, './*/totalResultsAvailable/text()')
 		}
@@ -275,6 +321,27 @@ class Landslider < Handsoap::Service
 		}
 	end
 	
+	def parse_notes(node)
+		{
+		:notes => node.xpath('./*/notes', ns).map { |child| parse_note(child) }
+		}
+	end
+	
+	# WsNote
+	def parse_note(node)
+		{
+		#:entity_id => xml_to_str(node, './entityId/text()'),
+		#:entity_type => xml_to_str(node, './entityType/text()'),
+		:archived_by => xml_to_int(node, './archivedBy/text()'),
+		:created_by => xml_to_int(node, './createdBy/text()'),
+		:created_on => xml_to_str(node, './createdOn/text()'),
+		:latest => xml_to_bool(node, './latest/text()'),
+		:note_id => xml_to_str(node, './noteId/text()'),
+		:note_html => xml_to_str(node, './note/text()')
+		
+		}
+	end
+
 	# WsOpportunity
 	def parse_opportunity(node)
 		{

data/test/landslider_test.rb

@@ -3,7 +3,17 @@ require 'test_helper'
 
 class LandsliderTest < Test::Unit::TestCase
 
+	def setup
+		# TODO: fetch a session_id once
+		# if $sid.nil?
+			result = Landslider.login('LOGINTOKEN=' + LS_INSTANCE_NAME)
+			$sid = result[:session_id]
+		# end
+		#puts "using #{$sid} to login"
+	end
+
 	def test_landslider_login
+		# other tests should use $sid for authenticatoin
 		result = Landslider.login('LOGINTOKEN=' + LS_INSTANCE_NAME)
 		
 		assert_not_nil result
@@ -12,8 +22,7 @@ class LandsliderTest < Test::Unit::TestCase
 	end
 	
 	def test_landslider_get_api_version
-		result = Landslider.login('LOGINTOKEN=' + LS_INSTANCE_NAME)
-		result = Landslider.get_api_version(result[:session_id])
+		result = Landslider.get_api_version($sid)
 		
 		assert_not_nil result
 		assert_operator result[:major_version], :>=, 2
@@ -22,8 +31,8 @@ class LandsliderTest < Test::Unit::TestCase
 	end
 	
 	def test_landslider_get_accounts
-		result = Landslider.login('LOGINTOKEN=' + LS_INSTANCE_NAME)
-		result = Landslider.get_accounts(result[:session_id])
+		result = Landslider.get_accounts($sid)
+		
 		assert_equal false, result[:error]
 		assert_not_nil result[:accounts]
 		assert result[:accounts].all? { |a| !a[:account_name].nil? }, "account name required"
@@ -32,34 +41,25 @@ class LandsliderTest < Test::Unit::TestCase
 		assert_not_nil result[:result_msg]
 	end
 	
-	def test_landslider_get_account_contacts
-		result = Landslider.login('LOGINTOKEN=' + LS_INSTANCE_NAME)
-		
+	def test_landslider_get_account_contacts		
 		# exists on jaytest
-		result = Landslider.get_account_contacts(result[:session_id], 51857822)		
+		result = Landslider.get_account_contacts($sid, 51857822)		
 		
-		assert_equal false, result[:error]
-		assert_operator result[:results_returned], :>=, 1
+		validate_standard_api_result result
 		assert result[:contacts].all? { |con| !con[:last_name].nil? }, "last name required"
 	end
 	
 	def test_landslider_get_account_notes
-		result = Landslider.login('LOGINTOKEN=' + LS_INSTANCE_NAME)
-
 		# exists on jaytest
-		result = Landslider.get_account_notes(result[:session_id], 55647822)
+		result = Landslider.get_account_notes($sid, 55647822)
 		
 		validate_standard_api_result result
-		assert_operator result[:results_returned], :>=, 1
-
+		validate_at_least_one_note_returned result
 	end
-	
-	
-	def test_landslider_get_account_opportunities
-		result = Landslider.login('LOGINTOKEN=' + LS_INSTANCE_NAME)
 
+	def test_landslider_get_account_opportunities
 		# exists on jaytest
-		result = Landslider.get_account_opportunities(result[:session_id], 51858821)
+		result = Landslider.get_account_opportunities($sid, 51858821)
 	  
 		assert_equal false, result[:error]
 		assert result[:opportunities].all? { |opp| 
@@ -68,22 +68,55 @@ class LandsliderTest < Test::Unit::TestCase
 			!opp[:deal_value].nil? && 
 			!opp[:selling_process].nil?
 		}, "opportunities require a name, account, deal value and selling process"
-  
-  end
+	end
+
+	def test_landslider_get_contact_notes
+		# exists on jaytest
+		result = Landslider.get_contact_notes($sid, 62813411)
+		
+		validate_standard_api_result result
+		validate_at_least_one_note_returned result
+	end
+	
+	def test_landslider_get_lead_notes
+		# exists on jaytest
+		result = Landslider.get_lead_notes($sid, 33592028)
+		
+		validate_standard_api_result result
+		validate_at_least_one_note_returned result
+	end
+	
 	
+	def test_landslider_get_opportunity_notes
+		# exists on jaytest
+		result = Landslider.get_opportunity_notes($sid, 55952453)
+		
+		validate_standard_api_result result
+		validate_at_least_one_note_returned result
+	end
 
 	private
 
 	def validate_standard_api_result(result) 
 		assert_equal Hash, result.class, "api method should return a hash"
+		assert_not_nil result[:results_returned], ":results_returned missing"
 		assert_operator result[:results_returned], :>=, 0
+		assert_not_nil result[:total_results_available], ":total_results_available missing"
+		assert_operator result[:total_results_available], :>=, 0
+		assert_not_nil result[:error]
 		assert_equal false, result[:error], "error should be false"
 	end
-
-	def login(session_id)
-		Landslider.login(session_id)
-	end
 	
+	def validate_at_least_one_note_returned(result)
+		assert_operator result[:results_returned], :>=, 1
+		assert_not_nil result[:notes], "at least one note should be returned"
+		assert_equal Hash, result[:notes].class
+	end
+
+	# def login(session_id)
+	# 	Landslider.login(session_id)
+	# end
+	# 
 
 end
 

metadata

@@ -2,7 +2,7 @@
 name: landslider
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Jay Prall
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 -04:00
+date: 2011-04-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency