landslider 0.5.3 → 0.5.4

data/VERSION.yml

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

data/landslider.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{landslider}
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jay Prall"]

data/lib/landslider.rb

@@ -33,7 +33,6 @@ class Landslider < Handsoap::Service
 
 	def login(session_id)
 		self.session_id = session_id
-		
 		response = invoke('login', :soap_action => :none) do |message|
 			message.add('wsUser') { |u|
 				u.add 'username', ::LS_API_USERNAME 
@@ -45,27 +44,14 @@ class Landslider < Handsoap::Service
 		parse_login_result(node)
 	end
 	
-	def get_api_version(session_id)
-		self.session_id = session_id
-		
-		response = invoke('getApiVersion', :soap_action => :none)
-		
-		node = response.document.xpath('//ns:getApiVersionResponse', ns)
-		parse_api_version_result(node)
-	end
-	
 	def get_accounts(session_id, first_result_position=1, total_results_requested=25, search_criteria=nil)
 		self.session_id = session_id
 		response = invoke('getAccounts', :soap_action => :none) do |message|
-			message.add('accountsRequest') { |ar|
-				ar.add 'firstResultPosition', first_result_position
-				ar.add 'totalResultsRequested', total_results_requested
+			message.add('accountsRequest') { |req|
+				req.add 'firstResultPosition', first_result_position
+				req.add 'totalResultsRequested', total_results_requested
 				unless search_criteria.nil?
-					ar.add('searchCriteria') { |sc|
-						sc.add 'fieldId', search_criteria.field_id
-						sc.add 'operator', search_criteria.operator
-						sc.add 'queryValue', search_criteria.query_value
-					}
+					search_criteria.soapify_for(req)
 				end
 			}
 		end
@@ -127,13 +113,25 @@ class Landslider < Handsoap::Service
 		parse_get_account_opportunities_result(node)
 	end
 	
-	def get_contacts(session_id, first_result_position=1, total_results_requested=25)
+	def get_api_version(session_id)
+		self.session_id = session_id
+		
+		response = invoke('getApiVersion', :soap_action => :none)
+		
+		node = response.document.xpath('//ns:getApiVersionResponse', ns)
+		parse_api_version_result(node)
+	end
+	
+	def get_contacts(session_id, first_result_position=1, total_results_requested=25, search_criteria=nil)
 		self.session_id = session_id
 		
 		response = invoke('getContacts', :soap_action => :none) do |message|
-			message.add('contactsRequest') { |c|
-				c.add 'firstResultPosition', first_result_position
-				c.add 'totalResultsRequested', total_results_requested
+			message.add('contactsRequest') { |req|
+				req.add 'firstResultPosition', first_result_position
+				req.add 'totalResultsRequested', total_results_requested
+				unless search_criteria.nil?
+					search_criteria.soapify_for(req)
+				end
 			}
 		end
 		node = response.document.xpath('//ns:getContactsResponse', ns)
@@ -173,13 +171,16 @@ class Landslider < Handsoap::Service
 		parse_get_instance_information_result(node)
 	end
 
-	def get_leads(session_id, account_id, first_result_position=1, total_results_requested=25)
+	def get_leads(session_id, account_id, first_result_position=1, total_results_requested=25, search_criteria=nil)
 		self.session_id = session_id
 	
 		response = invoke('getLeads', :soap_action => :none) do |message|
-			message.add('leadRequest') { |lr|
-				lr.add 'firstResultPosition', first_result_position
-				lr.add 'totalResultsRequested', total_results_requested
+			message.add('leadRequest') { |req|
+				req.add 'firstResultPosition', first_result_position
+				req.add 'totalResultsRequested', total_results_requested
+				unless search_criteria.nil?
+					search_criteria.soapify_for(req)
+				end
 			}
 		end
 
@@ -215,11 +216,7 @@ class Landslider < Handsoap::Service
 				req.add 'firstResultPosition', first_result_position
 				req.add 'totalResultsRequested', total_results_requested
 				unless search_criteria.nil?
-					req.add('searchCriteria') { |sc|
-						sc.add 'fieldId', search_criteria.field_id
-						sc.add 'operator', search_criteria.operator
-						sc.add 'queryValue', search_criteria.query_value
-					}
+					search_criteria.soapify_for(req)
 				end
 			}
 		end
@@ -621,6 +618,18 @@ class Landslider < Handsoap::Service
 			@operator = operator
 			@query_value = query_value
 		end
+		
+		# @param [Handsoap::XmlMason::Node] msg
+		# @return [Handsoap::XmlMason::Node]
+		def soapify_for(msg)
+			
+			msg.add('searchCriteria') { |crit|
+				crit.add 'fieldId', @field_id
+				crit.add 'operator', @operator
+				crit.add 'queryValue', @query_value unless @query_value.nil?
+			}
+		end
+
 	end
 
 end

data/test/landslider_test.rb

@@ -6,11 +6,7 @@ class LandsliderTest < Test::Unit::TestCase
 	JAYTEST_ACCOUNT_ID = 55647822
 	
 	def setup
-		if $sid.nil?
-			# only get a session once
-			result = Landslider.login('LOGINTOKEN=' + LS_INSTANCE_NAME)
-			$sid = result[:session_id]
-		end
+		$sid ||= Landslider.login('LOGINTOKEN=' + LS_INSTANCE_NAME)[:session_id]
 	end
 
 	def test_landslider_login

data/test/ws_search_test.rb

@@ -4,11 +4,7 @@ require 'test_helper'
 class WsSearchTest < Test::Unit::TestCase
 
 	def setup
-		if $sid2.nil?
-			# only get a session once
-			result = Landslider.login('LOGINTOKEN=' + LS_INSTANCE_NAME)
-			$sid2 = result[:session_id]
-		end
+		$sid2 ||= Landslider.login('LOGINTOKEN=' + LS_INSTANCE_NAME)[:session_id]
 	end
 	
 	def test_ws_search_object

metadata

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