landslider 0.5.5 → 0.5.6

data/VERSION.yml

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

data/landslider.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{landslider}
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jay Prall"]
-  s.date = %q{2011-05-06}
+  s.date = %q{2011-05-07}
   s.default_executable = %q{generate_api_key.rb}
   s.description = %q{Landslider is a ruby interface to the Landslide SOAP-based API}
   s.email = %q{jay@j4y.net}
@@ -42,15 +42,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.6.2}
   s.summary = %q{Landslide Ruby}
-  s.test_files = [
-    "test/landslider_test.rb",
-    "test/test_helper.rb",
-    "test/ws_account_note_search_test.rb",
-    "test/ws_contact_note_search_test.rb",
-    "test/ws_lead_note_search_test.rb",
-    "test/ws_opportunity_note_search_test.rb",
-    "test/ws_search_test.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/landslider.rb

@@ -2,6 +2,121 @@
 require 'handsoap'
 
 class Landslider < Handsoap::Service
+	
+	class WsSearch
+		attr_writer :first_result_position, :total_results_requested, :updated_on
+		
+		def initialize
+		end
+		
+		# @param [Handsoap::XmlMason::Node] msg
+		# @return [Handsoap::XmlMason::Node]
+		def soapify_for(msg)
+			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?
+		end
+	
+	end
+	
+	class WsSearchCriterion
+		attr_reader :field_id, :operator, :query_value
+    
+		def initialize(field_id, operator, query_value)
+			@field_id = field_id
+			@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
+
+	class WsAccountNoteSearch < WsSearch
+		attr_reader :account_id
+		
+		# alias :super_soapify_for :soapify_for
+
+		def initialize(account_id)
+			@account_id = account_id
+		end
+		
+		# @param [Handsoap::XmlMason::Node] msg
+		# @return [Handsoap::XmlMason::Node]
+		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?
+			}
+		end
+	end
+	
+	class WsContactNoteSearch < WsSearch
+		attr_reader :contact_id
+
+		def initialize(contact_id)
+			@contact_id = contact_id
+		end
+
+		# @param [Handsoap::XmlMason::Node] msg
+		# @return [Handsoap::XmlMason::Node]
+		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?
+			}
+		end
+	end
+	
+	class WsLeadNoteSearch < WsSearch
+		attr_reader :lead_id
+
+		def initialize(lead_id)
+			@lead_id = lead_id
+		end
+
+		# @param [Handsoap::XmlMason::Node] msg
+		# @return [Handsoap::XmlMason::Node]
+		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?
+			}
+		end
+		
+	end
+	
+	class WsOpportunityNoteSearch < WsSearch
+		attr_reader :opportunity_id
+
+		def initialize(opportunity_id)
+			@opportunity_id = opportunity_id
+		end
+
+		# @param [Handsoap::XmlMason::Node] msg
+		# @return [Handsoap::XmlMason::Node]
+		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?
+			}
+		end
+	end
 
 	LS_API_NAMESPACE='http://www.landslide.com/webservices/SoapService'
 	LS_API_ENDPOINT = {
@@ -595,106 +710,5 @@ class Landslider < Handsoap::Service
 		:start_date => xml_to_date(node, './startDate/text()')
 		}
 	end
-	
-	class WsSearch
-		attr_reader :field_id, :operator, :query_value
-    
-		def initialize(field_id, operator, query_value)
-			@field_id = field_id
-			@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
-
-	class WsAccountNoteSearch
-		attr_reader :account_id
-		attr_writer :first_result_position, :total_results_requested, :updated_on
-
-		def initialize(account_id)
-			@account_id = account_id
-		end
-		
-		# @param [Handsoap::XmlMason::Node] msg
-		# @return [Handsoap::XmlMason::Node]
-		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?
-			}
-		end
-	end
-	
-	class WsContactNoteSearch
-		attr_reader :contact_id
-		attr_writer :first_result_position, :total_results_requested, :updated_on
-
-		def initialize(contact_id)
-			@contact_id = contact_id
-		end
-
-		# @param [Handsoap::XmlMason::Node] msg
-		# @return [Handsoap::XmlMason::Node]
-		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?
-			}
-		end
-	end
-	
-	class WsLeadNoteSearch
-		attr_reader :lead_id
-		attr_writer :first_result_position, :total_results_requested, :updated_on
-
-		def initialize(lead_id)
-			@lead_id = lead_id
-		end
-
-		# @param [Handsoap::XmlMason::Node] msg
-		# @return [Handsoap::XmlMason::Node]
-		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?
-			}
-		end
-		
-	end
-	
-	class WsOpportunityNoteSearch
-		attr_reader :opportunity_id
-		attr_writer :first_result_position, :total_results_requested, :updated_on
-
-		def initialize(opportunity_id)
-			@opportunity_id = opportunity_id
-		end
-
-		# @param [Handsoap::XmlMason::Node] msg
-		# @return [Handsoap::XmlMason::Node]
-		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?
-			}
-		end
-	end
 
 end

data/test/ws_account_note_search_test.rb

@@ -11,7 +11,7 @@ class WsAccountNoteSearchTest < Test::Unit::TestCase
 		search = Landslider::WsAccountNoteSearch.new(55647822)
 		result = Landslider.get_account_notes($sid3, search)
 		assert_equal false, result[:error]
-		assert_equal 7, result[:results_returned]
+		assert_equal 8, result[:results_returned]
 	end
 	
 	def test_account_note_search_limit_by_updated_on

data/test/ws_search_test.rb

@@ -8,7 +8,7 @@ class WsSearchTest < Test::Unit::TestCase
 	end
 	
 	def test_ws_search_object
-		search = Landslider::WsSearch.new('AccountName', 'Equals', 'Boston')
+		search = Landslider::WsSearchCriterion.new('AccountName', 'Equals', 'Boston')
 		assert_equal 'AccountName', search.field_id
 		assert_equal 'Equals', search.operator
 		assert_equal 'Boston', search.query_value
@@ -22,7 +22,7 @@ class WsSearchTest < Test::Unit::TestCase
 	end
 
 	def test_get_accounts_with_search_criteria
-		search = Landslider::WsSearch.new('AccountName', 'Equals', 'Boston')
+		search = Landslider::WsSearchCriterion.new('AccountName', 'Equals', 'Boston')
 		result = Landslider.get_accounts($sid2, 1, 25, search)
 		
 		assert_equal false, result[:error]
@@ -38,7 +38,7 @@ class WsSearchTest < Test::Unit::TestCase
 
 	def test_get_opportunities_with_search_criteria
 		target_phase_name = 'Prospect'
-		search = Landslider::WsSearch.new('CurrentPhaseName', 'Contains', target_phase_name)
+		search = Landslider::WsSearchCriterion.new('CurrentPhaseName', 'Contains', target_phase_name)
 		result = Landslider.get_opportunities($sid2, 1, 25, search)
 		
 		assert_equal false, result[:error]

metadata

@@ -2,7 +2,7 @@
 name: landslider
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors: 
 - Jay Prall
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-06 00:00:00 -04:00
+date: 2011-05-07 00:00:00 -04:00
 default_executable: generate_api_key.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,11 +112,5 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Landslide Ruby
-test_files: 
-- test/landslider_test.rb
-- test/test_helper.rb
-- test/ws_account_note_search_test.rb
-- test/ws_contact_note_search_test.rb
-- test/ws_lead_note_search_test.rb
-- test/ws_opportunity_note_search_test.rb
-- test/ws_search_test.rb
+test_files: []
+