landslider 0.5.18 → 0.5.20

data/VERSION.yml

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

data/landslider.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{landslider}
-  s.version = "0.5.18"
+  s.version = "0.5.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jay Prall"]
-  s.date = %q{2011-06-23}
+  s.date = %q{2011-06-27}
   s.description = %q{Landslider is a ruby interface to the Landslide SOAP-based API}
   s.email = %q{jay@j4y.net}
   s.extra_rdoc_files = [

data/lib/landslider/entities/ws_search.rb

@@ -46,7 +46,15 @@ class Landslider
 			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)
+				if @search_criteria.kind_of?(Array)
+
+					msg.add 'allowDuplicateCriterion', true
+					@search_criteria.each do |sc|
+						sc.soapify_for(msg)
+					end
+				else
+					@search_criteria.soapify_for(msg)
+				end
 			end
 		
 		end

data/test/get_accounts_test.rb

@@ -16,7 +16,7 @@ class GetAccountsTest < Test::Unit::TestCase
 		assert_not_nil result
 		assert_equal false, result[:error]
 		assert_kind_of Array, result[:accounts]
-		assert_equal 6, result[:accounts].size
+		assert_equal 7, result[:accounts].size
 		
 	end
 	

data/test/landslider_test.rb

@@ -54,7 +54,7 @@ class LandsliderTest < Test::Unit::TestCase
 	def test_landslider_get_account_contacts
 		result = Landslider.get_account_contacts($sid, 55647822)
 
-		assert_equal 3, result[:results_returned]
+		assert_equal 4, result[:results_returned]
 		validate_standard_api_result result
 		assert_kind_of Array, result[:contacts]
 		assert_not_nil result[:contacts].first[:contact_id]

data/test/ws_account_note_search_test.rb

@@ -20,7 +20,7 @@ class WsAccountNoteSearchTest < Test::Unit::TestCase
 		search.updated_on = '2011-04-21'
 		result = Landslider.get_account_notes($sid3, search)
 		assert_equal false, result[:error]
-		assert_equal 2, result[:results_returned]
+		assert_equal 3, result[:results_returned]
 	end
 	
 	def test_account_note_search_limit_by_results_requested

data/test/ws_search_test.rb

@@ -19,7 +19,7 @@ class WsSearchTest < Test::Unit::TestCase
 		result = Landslider.get_accounts($sid2)
 
 		assert_equal false, result[:error]
-		assert_equal 6, result[:results_returned]
+		assert_equal 7, result[:results_returned]
 	end
 
 	def test_get_accounts_with_search_criteria
@@ -30,6 +30,17 @@ class WsSearchTest < Test::Unit::TestCase
 		assert_equal false, result[:error]
 		assert_equal 1, result[:results_returned]
 	end
+	
+	def test_get_accounts_with_more_than_one_search_criteria
+		search = Landslider::WsSearch.new
+		search.search_criteria = [Landslider::WsSearchCriterion.new('AccountName', 'Equals', "Jay's master account"),
+			Landslider::WsSearchCriterion.new('AccountTypeId', 'Equals', '1539484')]
+
+		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)

metadata

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