landslider 0.5.6 → 0.5.7

data/VERSION.yml

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

data/landslider.gemspec

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

data/lib/landslider.rb

@@ -5,6 +5,7 @@ class Landslider < Handsoap::Service
 	
 	class WsSearch
 		attr_writer :first_result_position, :total_results_requested, :updated_on
+		attr_writer :search_criteria
 		
 		def initialize
 		end
@@ -15,6 +16,10 @@ class Landslider < Handsoap::Service
 			msg.add 'firstResultPosition', @first_result_position || DEFAULT_FIRST_RESULT_POSITION
 			msg.add 'totalResultsRequested', @total_results_requested || DEFAULT_TOTAL_RESULTS_REQUESTED
 			msg.add 'updatedOn', @updated_on unless @updated_on.nil?
+			unless @search_criteria.nil?
+				@search_criteria.soapify_for(msg)
+			end
+			
 		end
 	
 	end
@@ -42,8 +47,6 @@ class Landslider < Handsoap::Service
 	class WsAccountNoteSearch < WsSearch
 		attr_reader :account_id
 		
-		# alias :super_soapify_for :soapify_for
-
 		def initialize(account_id)
 			@account_id = account_id
 		end
@@ -53,9 +56,7 @@ class Landslider < Handsoap::Service
 		def soapify_for(msg)
 			msg.add('accountNoteSearch') { |crit|
 				crit.add 'accountId', @account_id
-				crit.add 'firstResultPosition', @first_result_position || DEFAULT_FIRST_RESULT_POSITION
-				crit.add 'totalResultsRequested', @total_results_requested || DEFAULT_TOTAL_RESULTS_REQUESTED
-				crit.add 'updatedOn', @updated_on unless @updated_on.nil?
+				super(crit)
 			}
 		end
 	end
@@ -72,9 +73,7 @@ class Landslider < Handsoap::Service
 		def soapify_for(msg)
 			msg.add('contactNote') { |crit|
 				crit.add 'contactId', @contact_id
-				crit.add 'firstResultPosition', @first_result_position || DEFAULT_FIRST_RESULT_POSITION
-				crit.add 'totalResultsRequested', @total_results_requested || DEFAULT_TOTAL_RESULTS_REQUESTED
-				crit.add 'updatedOn', @updated_on unless @updated_on.nil?
+				super(crit)
 			}
 		end
 	end
@@ -91,9 +90,7 @@ class Landslider < Handsoap::Service
 		def soapify_for(msg)
 			msg.add('leadNote') { |crit|
 				crit.add 'leadId', @lead_id
-				crit.add 'firstResultPosition', @first_result_position || DEFAULT_FIRST_RESULT_POSITION
-				crit.add 'totalResultsRequested', @total_results_requested || DEFAULT_TOTAL_RESULTS_REQUESTED
-				crit.add 'updatedOn', @updated_on unless @updated_on.nil?
+				super(crit)
 			}
 		end
 		
@@ -111,9 +108,7 @@ class Landslider < Handsoap::Service
 		def soapify_for(msg)
 			msg.add('opportunityNote') { |crit|
 				crit.add 'opportunityId', @opportunity_id
-				crit.add 'firstResultPosition', @first_result_position || DEFAULT_FIRST_RESULT_POSITION
-				crit.add 'totalResultsRequested', @total_results_requested || DEFAULT_TOTAL_RESULTS_REQUESTED
-				crit.add 'updatedOn', @updated_on unless @updated_on.nil?
+				super(crit)
 			}
 		end
 	end
@@ -163,15 +158,11 @@ class Landslider < Handsoap::Service
 		parse_login_result(node)
 	end
 	
-	def get_accounts(session_id, first_result_position=1, total_results_requested=25, search_criteria=nil)
+	def get_accounts(session_id, search=WsSearch.new)
 		self.session_id = session_id
 		response = invoke('getAccounts', :soap_action => :none) do |message|
 			message.add('accountsRequest') { |req|
-				req.add 'firstResultPosition', first_result_position
-				req.add 'totalResultsRequested', total_results_requested
-				unless search_criteria.nil?
-					search_criteria.soapify_for(req)
-				end
+				search.soapify_for(req)
 			}
 		end
 		
@@ -236,16 +227,12 @@ class Landslider < Handsoap::Service
 		parse_api_version_result(node)
 	end
 	
-	def get_contacts(session_id, first_result_position=1, total_results_requested=25, search_criteria=nil)
+	def get_contacts(session_id, search=WsSearch.new)
 		self.session_id = session_id
 		
 		response = invoke('getContacts', :soap_action => :none) do |message|
 			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
+				search.soapify_for(req)
 			}
 		end
 		node = response.document.xpath('//ns:getContactsResponse', ns)
@@ -281,16 +268,12 @@ 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, search_criteria=nil)
+	def get_leads(session_id, search=WsSearch.new)
 		self.session_id = session_id
 	
 		response = invoke('getLeads', :soap_action => :none) do |message|
 			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
+				search.soapify_for(req)
 			}
 		end
 
@@ -314,16 +297,12 @@ class Landslider < Handsoap::Service
 		parse_get_lead_notes_result(node)
 	end
 	
-	def get_opportunities(session_id, first_result_position=1, total_results_requested=25, search_criteria=nil)
+	def get_opportunities(session_id, search=WsSearch.new)
 		self.session_id = session_id
 		
 		response = invoke('getOpportunities', :soap_action => :none) do |message|
 			message.add('opportunityRequest') { |req|
-				req.add 'firstResultPosition', first_result_position
-				req.add 'totalResultsRequested', total_results_requested
-				unless search_criteria.nil?
-					search_criteria.soapify_for(req)
-				end
+				search.soapify_for(req)
 			}
 		end
 		node = response.document.xpath('//ns:getOpportunitiesResponse', ns)

data/test/landslider_test.rb

@@ -27,16 +27,6 @@ class LandsliderTest < Test::Unit::TestCase
 		assert_operator result[:revision_version], :>=, 0
 	end
 	
-	def test_landslider_get_accounts
-		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"
-		assert_operator result[:results_returned], :>=, 0
-		assert_operator result[:total_results_available], :>=, 0
-		assert_not_nil result[:result_msg]
-	end
 	
 	def test_landslider_get_account_by_id
 		result = Landslider.get_account_by_id($sid, JAYTEST_ACCOUNT_ID)
@@ -133,7 +123,7 @@ class LandsliderTest < Test::Unit::TestCase
 	end
 	
 	def test_landslider_get_leads
-		result = Landslider.get_leads($sid, 51857822)
+		result = Landslider.get_leads($sid)
 		
 		validate_standard_api_result result
 		assert_not_nil result[:leads]
@@ -146,11 +136,6 @@ class LandsliderTest < Test::Unit::TestCase
 		assert_not_nil result[:custom_fields].first[:custom_field_id]
 	end
 	
-	def test_landslider_get_opportunities
-		result = Landslider.get_opportunities($sid)
-		assert_not_nil result[:opportunities]
-	end
-	
 	def test_landslider_get_user_information
 		result = Landslider.get_user_information($sid, 'jayp@landslide.com')
 		

data/test/ws_account_note_search_test.rb

@@ -4,6 +4,7 @@ require 'test_helper'
 class WsAccountNoteSearchTest < Test::Unit::TestCase
 
 	def setup
+		# Landslider.logger = $stdout
 		$sid3 ||= Landslider.login('LOGINTOKEN=' + LS_INSTANCE_NAME)[:session_id]
 	end
 	

data/test/ws_search_test.rb

@@ -4,42 +4,45 @@ require 'test_helper'
 class WsSearchTest < Test::Unit::TestCase
 
 	def setup
+		# Landslider.logger = $stdout
 		$sid2 ||= Landslider.login('LOGINTOKEN=' + LS_INSTANCE_NAME)[:session_id]
 	end
 	
 	def test_ws_search_object
-		search = Landslider::WsSearchCriterion.new('AccountName', 'Equals', 'Boston')
-		assert_equal 'AccountName', search.field_id
-		assert_equal 'Equals', search.operator
-		assert_equal 'Boston', search.query_value
+		search_criteria = Landslider::WsSearchCriterion.new('AccountName', 'Equals', 'Boston')
+		assert_equal 'AccountName', search_criteria.field_id
+		assert_equal 'Equals', search_criteria.operator
+		assert_equal 'Boston', search_criteria.query_value
 	end
 
 	def test_get_accounts_without_search_criteria
-		result = Landslider.get_accounts($sid2, 1, 25)
+		result = Landslider.get_accounts($sid2)
 
 		assert_equal false, result[:error]
 		assert_equal 6, result[:results_returned]
 	end
 
 	def test_get_accounts_with_search_criteria
-		search = Landslider::WsSearchCriterion.new('AccountName', 'Equals', 'Boston')
-		result = Landslider.get_accounts($sid2, 1, 25, search)
+		search = Landslider::WsSearch.new
+		search.search_criteria = Landslider::WsSearchCriterion.new('AccountName', 'Equals', 'Boston')
+		result = Landslider.get_accounts($sid2, search)
 		
 		assert_equal false, result[:error]
 		assert_equal 1, result[:results_returned]
 	end
 
 	def test_get_opportunities_without_search_criteria
-		result = Landslider.get_opportunities($sid2, 1, 25)
-
+		result = Landslider.get_opportunities($sid2)
+	
 		assert_equal false, result[:error]
 		assert_equal 4, result[:results_returned]
 	end
-
+	
 	def test_get_opportunities_with_search_criteria
 		target_phase_name = 'Prospect'
-		search = Landslider::WsSearchCriterion.new('CurrentPhaseName', 'Contains', target_phase_name)
-		result = Landslider.get_opportunities($sid2, 1, 25, search)
+		search = Landslider::WsSearch.new
+		search.search_criteria = Landslider::WsSearchCriterion.new('CurrentPhaseName', 'Contains', target_phase_name)
+		result = Landslider.get_opportunities($sid2, search)
 		
 		assert_equal false, result[:error]
 		assert_equal 3, result[:results_returned]

metadata

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