landslider 0.2.3 → 0.2.4

data/VERSION.yml

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

data/lib/landslider.rb

@@ -98,6 +98,13 @@ class Landslider < Handsoap::Service
 				ans.add 'accountId', account_id
 				ans.add 'firstResultPosition', 1
 				ans.add 'totalResultsRequested', 10
+				
+				ans.add('searchCriteria') { |sc|
+					# just find accounts with an empty main city
+					
+					sc.add 'fieldId', 'MainAddressCity'
+					sc.add 'operator', 'Empty'
+				}
 			}
 		end
 		node = response.document.xpath('//ns:getAccountNotesResponse', ns)
@@ -143,43 +150,18 @@ class Landslider < Handsoap::Service
 		parse_get_opportunity_notes_result(node)
 	end
 	
-	def get_leads(session_id)
-      # <soap:getLeads>
-      #    <!--Optional:-->
-      #    <leadRequest>
-      #       <entityId>?</entityId>
-      #       <!--Optional:-->
-      #       <entityName>?</entityName>
-      #       <!--Optional:-->
-      #       <entityType>?</entityType>
-      #       <allowDuplicateCriterion>?</allowDuplicateCriterion>
-      #       <firstResultPosition>?</firstResultPosition>
-      #       <returnDeletedRecords>?</returnDeletedRecords>
-      #       <!--Zero or more repetitions:-->
-      #       <searchCriteria>
-      #          <!--Optional:-->
-      #          <fieldId>?</fieldId>
-      #          <!--Optional:-->
-      #          <operator>?</operator>
-      #          <!--Optional:-->
-      #          <queryValue>?</queryValue>
-      #       </searchCriteria>
-      #       <!--Optional:-->
-      #       <sourceSystemId>?</sourceSystemId>
-      #       <totalResultsRequested>?</totalResultsRequested>
-      #       <!--Optional:-->
-      #       <updatedOn>?</updatedOn>
-      #       <accountId>?</accountId>
-      #       <hot>?</hot>
-      #       <hotSpecified>?</hotSpecified>
-      #       <!--Optional:-->
-      #       <name>?</name>
-      #       <primaryOwnerId>?</primaryOwnerId>
-      #       <statusId>?</statusId>
-      #       <targetId>?</targetId>
-      #    </leadRequest>
-      # </soap:getLeads>	
+	def get_leads(session_id, account_id)
+		self.session_id = session_id
+	
+		response = invoke("getLeads", :soap_action => :none) do |message|
+			message.add('leadRequest') { |lr|
 		
+				lr.add 'firstResultPosition', 1
+				lr.add 'totalResultsRequested', 10
+			}
+		end
+		node = response.document.xpath('//ns:getLeadsResponse', ns)
+		parse_get_leads_result(node)
 	end
 	
 	def get_lead_notes(session_id, lead_id)
@@ -291,6 +273,18 @@ class Landslider < Handsoap::Service
 		
 		}
 	end
+	def parse_get_leads_result(node)
+		{
+		:leads => parse_leads(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)
 		{
@@ -400,7 +394,24 @@ class Landslider < Handsoap::Service
 		
 		}
 	end
-
+	
+	def parse_leads(node)
+		{
+		:leads => node.xpath('./*/leadList', ns).map { |child| parse_lead(child) }
+		}
+	end
+	
+	# WsLead
+	def parse_lead(node)
+		{
+		:name => xml_to_str(node, './name/text()'),
+		:ok_to_call => xml_to_bool(node, './okToCall/text()'),
+		:ok_to_email => xml_to_bool(node, './okToEmail/text()'),
+		:hot => xml_to_bool(node, './hot/text()')
+		}
+	
+	end
+	
 	# WsOpportunity
 	def parse_opportunity(node)
 		{

data/test/landslider_test.rb

@@ -64,7 +64,7 @@ class LandsliderTest < Test::Unit::TestCase
 		validate_standard_api_result result
 		validate_at_least_one_note_returned result
 	end
-
+	
 	def test_landslider_get_account_opportunities
 		# exists on jaytest
 		result = Landslider.get_account_opportunities($sid, 51858821)
@@ -77,7 +77,7 @@ class LandsliderTest < Test::Unit::TestCase
 			!opp[:selling_process].nil?
 		}, "opportunities require a name, account, deal value and selling process"
 	end
-
+	
 	def test_landslider_get_contact_notes
 		# exists on jaytest
 		result = Landslider.get_contact_notes($sid, 62813411)
@@ -87,9 +87,10 @@ class LandsliderTest < Test::Unit::TestCase
 	end
 	
 	def test_landslider_get_leads
-		result = Landslider.get_leads($sid)
-		puts result.inspect
-	
+		result = Landslider.get_leads($sid, 51857822)
+		
+		validate_standard_api_result result
+		assert_not_nil result[:leads]
 	end
 	
 	
@@ -109,9 +110,9 @@ class LandsliderTest < Test::Unit::TestCase
 		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"

metadata

@@ -2,7 +2,7 @@
 name: landslider
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Jay Prall