landslider 0.5.9 → 0.5.11

data/README.md

@@ -26,7 +26,7 @@ Installation
 Documentation
 -------------
 
-	Read the [ruby doc](http://www.rubydoc.info/github/j4y/landslider/master/frames).
+Read the [ruby doc](http://www.rubydoc.info/github/j4y/landslider/master/frames).
 
 Configuration
 -------------
@@ -85,6 +85,7 @@ API methods
 * getAccountContacts
 * getAccountNotes
 * getAccountOpportunities
+* getAccountTypes
 * getContacts
 * getContactCustomFields
 * getContactNotes

data/VERSION.yml

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

data/landslider.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{landslider}
-  s.version = "0.5.9"
+  s.version = "0.5.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jay Prall"]
-  s.date = %q{2011-05-11}
+  s.date = %q{2011-05-13}
   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}
@@ -65,6 +65,7 @@ Gem::Specification.new do |s|
     "lib/landslider/entities/ws_selling_process.rb",
     "lib/landslider/entities/ws_user.rb",
     "lib/landslider/entities/ws_user_search.rb",
+    "test/get_account_types_test.rb",
     "test/landslider_test.rb",
     "test/test_helper.rb",
     "test/ws_account_note_search_test.rb",
@@ -78,6 +79,16 @@ 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/get_account_types_test.rb",
+    "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

@@ -5,7 +5,7 @@
 # require 'landslider'
 # response = Landslider.login('LOGINTOKEN=' + LS_INSTANCE_NAME)
 # response = Landslider.get_accounts(response[:session_id])
-# response[:accounts].each do |account| 
+# response[:accounts].each do |account|
 # 	puts "id: #{account[:account_id]} name: #{account[:account_name]}"
 # end
 #
@@ -13,7 +13,7 @@
 require 'handsoap'
 
 class Landslider < Handsoap::Service
-	
+
 	require 'landslider/entities'
 
 	LS_API_NAMESPACE='http://www.landslide.com/webservices/SoapService'
@@ -21,12 +21,12 @@ class Landslider < Handsoap::Service
 	  :uri => "https://#{LS_INSTANCE_NAME}.api.landslide.com/webservices/SoapService",
 	  :version => 1
 	}
-	
+
 	DEFAULT_FIRST_RESULT_POSITION = 1
 	DEFAULT_TOTAL_RESULTS_REQUESTED = 25
-	
+
 	endpoint LS_API_ENDPOINT
-	
+
 	attr_accessor :session_id
 
 	# @param [Handsoap::XmlMason::Document] doc
@@ -37,7 +37,7 @@ class Landslider < Handsoap::Service
 			sh.add('urn:sessionId', self.session_id)
 		}
 	end
-	
+
 	# @param [Handsoap::Http::Request] http_request
 	def on_after_create_http_request(http_request)
 		http_request.headers.merge!({'user-agent' => ['landslider-ruby-gem-version-0.4.6']})
@@ -53,15 +53,15 @@ class Landslider < Handsoap::Service
 		self.session_id = session_id
 		response = invoke('login', :soap_action => :none) do |message|
 			message.add('wsUser') { |u|
-				u.add 'username', ::LS_API_USERNAME 
+				u.add 'username', ::LS_API_USERNAME
 				u.add 'password', ::LS_API_KEY
 			}
 		end
-		
+
 		node = response.document.xpath('//ns:loginResponse/loginResponse', ns)
 		parse_login_result(node)
 	end
-	
+
 	# @param [WsAccountSearch] search
 	# @param [String] session_id
 	# @return [Hash]
@@ -72,20 +72,20 @@ class Landslider < Handsoap::Service
 				search.soapify_for(req)
 			}
 		end
-		
+
 		node = response.document.xpath('//ns:getAccountsResponse', ns)
 		parse_get_accounts_result(node)
 	end
-	
+
 	# @param [String] session_id
 	# @return [Hash]
 	def get_account_by_id(session_id, account_id)
 		self.session_id = session_id
-		
+
 		response = invoke('getAccountById', :soap_action => :none) do |message|
 			message.add 'accountId', account_id
 		end
-		
+
 		node = response.document.xpath('//ns:getAccountByIdResponse', ns)
 		parse_get_account_by_id_result(node)
 	end
@@ -100,11 +100,11 @@ class Landslider < Handsoap::Service
 			message.add 'accountId', account_id
 			message.add 'isPrimary', is_primary
 		end
-		
+
 		node = response.document.xpath('//ns:getAccountContactsResponse', ns)
 		parse_get_account_contacts_result(node)
 	end
-	
+
 	# @param [String] session_id
 	# @return [Hash]
 	def get_account_custom_fields(session_id)
@@ -112,7 +112,7 @@ class Landslider < Handsoap::Service
 		node = response.document.xpath('//ns:getAccountCustomFieldsResponse', ns)
 		parse_get_entity_custom_fields_result(node)
 	end
-	
+
 	# @param [String] session_id
 	# @param [WsSearch] search
 	# @return [Hash]
@@ -133,30 +133,40 @@ class Landslider < Handsoap::Service
 		response = invoke('getAccountOpportunities', :soap_action => :none) do |message|
 			message.add 'accountId', account_id
 		end
-		
+
 		node = response.document.xpath('//ns:getAccountOpportunitiesResponse', ns)
 		parse_get_account_opportunities_result(node)
 	end
-	
+
 	# @param [String] session_id
 	# @return [Hash]
-	def get_api_version(session_id)
+	def get_account_types(session_id)
 		self.session_id = session_id
+		response = invoke('getAccountTypes')
 		
+		node = response.document.xpath('//ns:getAccountTypesResponse', ns)
+		parse_get_account_types_result(node)
+	end
+
+	# @param [String] session_id
+	# @return [Hash]
+	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
-	
-	
+
+
 	# @param [String] session_id
 	# @param [WsContactSearch] search
 	# @return [Hash]
 	def get_contacts(session_id, search=WsSearch.new)
 		self.session_id = session_id
-		
-		# public WsContactResultSet getContacts(WsContactSearch request) 
+
+		# public WsContactResultSet getContacts(WsContactSearch request)
 		response = invoke('getContacts', :soap_action => :none) do |message|
 			message.add('contactsRequest') { |req|
 				search.soapify_for(req)
@@ -165,12 +175,12 @@ class Landslider < Handsoap::Service
 		node = response.document.xpath('//ns:getContactsResponse', ns)
 		parse_get_contacts_result(node)
 	end
-	
+
 	# @param [String] session_id
 	# @return [Hash]
 	def get_contact_custom_fields(session_id)
 		self.session_id = session_id
-	
+
 		response = invoke('getContactCustomFields')
 		node = response.document.xpath('//ns:getContactCustomFieldsResponse', ns)
 		parse_get_entity_custom_fields_result(node)
@@ -181,7 +191,7 @@ class Landslider < Handsoap::Service
 	# @return [Hash]
 	def get_contact_notes(session_id, search)
 		self.session_id = session_id
-		
+
 		response = invoke('getContactNotes', :soap_action => :none) do |message|
 			search.soapify_for(message)
 		end
@@ -195,7 +205,7 @@ class Landslider < Handsoap::Service
 	# @return [Hash]
 	def get_instance_information(session_id, user_id)
 		self.session_id = session_id
-		
+
 		response = invoke('getInstanceInformation', :soap_action => :none) do |message|
 			message.add 'userId', user_id
 		end
@@ -206,9 +216,9 @@ class Landslider < Handsoap::Service
 	# @param [String] session_id
 	# @param [WsLeadSearch] search
 	# @return [Hash]
-	def get_leads(session_id, search=WsSearch.new)
+	def get_leads(session_id, search=WsLeadSearch.new)
 		self.session_id = session_id
-	
+
 		response = invoke('getLeads', :soap_action => :none) do |message|
 			message.add('leadRequest') { |req|
 				search.soapify_for(req)
@@ -218,7 +228,7 @@ class Landslider < Handsoap::Service
 		node = response.document.xpath('//ns:getLeadsResponse', ns)
 		parse_get_leads_result(node)
 	end
-	
+
 	# @param [String] session_id
 	# @return [Hash]
 	def get_lead_custom_fields(session_id)
@@ -226,26 +236,26 @@ class Landslider < Handsoap::Service
 		node = response.document.xpath('//ns:getLeadCustomFieldsResponse', ns)
 		parse_get_entity_custom_fields_result(node)
 	end
-	
+
 	# @param [String] session_id
 	# @param [WsSearch] search
 	# @return [Hash]
 	def get_lead_notes(session_id, search)
 		self.session_id = session_id
-	
+
 		response = invoke('getLeadNotes', :soap_action => :none) do |message|
 			search.soapify_for(message)
 		end
 		node = response.document.xpath('//ns:getLeadNotesResponse', ns)
 		parse_get_lead_notes_result(node)
 	end
-	
+
 	# @param [WsOpportunitySearch] search
 	# @param [String] session_id
 	# @return [Hash]
 	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|
 				search.soapify_for(req)
@@ -270,14 +280,14 @@ class Landslider < Handsoap::Service
 	# @return [Hash]
 	def get_opportunity_notes(session_id, search)
 		self.session_id = session_id
-	
+
 		response = invoke('getOpportunityNotes', :soap_action => :none) do |message|
 			search.soapify_for(message)
 		end
 		node = response.document.xpath('//ns:getOpportunityNotesResponse', ns)
 		parse_get_opportunity_notes_result(node)
 	end
-	
+
 	# @param [String] session_id
 	# @return [Hash]
 	def get_user_information(session_id, user_id)
@@ -294,14 +304,14 @@ class Landslider < Handsoap::Service
 	# @return [Hash]
 	def get_user_information_by_id(session_id, user_id)
 		self.session_id = session_id
-		
+
 		response = invoke('getUserInformationById', :soap_action => :none) do |message|
 			message.add 'userId', user_id
 		end
 		node = response.document.xpath('//ns:getUserInformationByIdResponse', ns)
 		parse_get_user_information_by_id_result(node)
 	end
-	
+
 	private
 
 	def ns
@@ -310,7 +320,7 @@ class Landslider < Handsoap::Service
 
 	def parse_login_result(node)
 		{
-		:error => xml_to_bool(node, './error/text()'),	
+		: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()'),
@@ -318,7 +328,7 @@ class Landslider < Handsoap::Service
 		:session_id => xml_to_str(node, './sessionId/text()')
 		}
 	end
-	
+
 	def parse_api_version_result(node)
 		{
 		:internal_name => xml_to_str(node, '//ApiVersion/internalName/text()'),
@@ -332,7 +342,7 @@ class Landslider < Handsoap::Service
 	def parse_get_accounts_result(node)
 		{
 		:accounts => node.xpath('//Accounts/accountList', ns).map { |child| parse_account(child) },
-		
+
 		:error => xml_to_bool(node, '//Accounts/error/text()'),
 		:error_code => xml_to_int(node, '//Accounts/errorCode/text()'),
 		:result_msg => xml_to_str(node, '//Accounts/resultMsg/text()'),
@@ -340,19 +350,19 @@ class Landslider < Handsoap::Service
 		:total_results_available => xml_to_int(node, '//Accounts/totalResultsAvailable/text()')
 		}
 	end
-	
+
 	def parse_get_account_by_id_result(node)
 		{
 		:account => parse_account(node.xpath('./Account/account')),
 		:error => xml_to_bool(node, './*/error/text()'),
 		:error_code => xml_to_int(node, './*/errorCode/text()'),
 		:result_msg => xml_to_str(node, './*/resultMsg/text()')
-		}	
+		}
 	end
-	
+
 	def parse_get_account_notes_result(node)
 		notes = parse_notes(node)
-		
+
 		{
 		:error => xml_to_bool(node, './*/error/text()'),
 		:error_code => xml_to_int(node, './*/errorCode/text()'),
@@ -362,11 +372,11 @@ class Landslider < Handsoap::Service
 		:total_results_available => xml_to_int(node, './*/totalResultsAvailable/text()')
 		}.merge(notes)
 	end
-	
+
 	def parse_get_account_opportunities_result(node)
 		{
 		:opportunities => node.xpath('./*/opportunityList', ns).map { |child| parse_opportunity(child) },
-		
+
 		:error => xml_to_bool(node, './*/error/text()'),
 		:results_returned => xml_to_int(node, './*/resultsReturned/text()'),
 		:total_results_available => xml_to_int(node, './*/totalResultsAvailable/text()')
@@ -376,23 +386,30 @@ class Landslider < Handsoap::Service
 	def parse_get_account_contacts_result(node)
 		{
 		:contacts => node.xpath('./*/contactList', ns).map { |child| parse_contact(child) },
-		
+
 		:error => xml_to_bool(node, './*/error/text()'),
 		:results_returned => xml_to_int(node, './*/resultsReturned/text()'),
 		:total_results_available => xml_to_int(node, './*/totalResultsAvailable/text()')
 		}
 	end
 	
+	def parse_get_account_types_result(node)
+		{
+			:account_types => node.xpath('AccountTypes/accountTypes', ns).map { |child| parse_account_type(child) },
+			:error => xml_to_bool(node, 'AccountTypes/error/text()')
+		}
+	end
+
 	def parse_get_contacts_result(node)
 		{
 		:contacts => node.xpath('./*/contactList', ns).map { |child| parse_contact(child) },
-		
+
 		:error => xml_to_bool(node, './*/error/text()'),
 		:results_returned => xml_to_int(node, './*/resultsReturned/text()'),
 		:total_results_available => xml_to_int(node, './*/totalResultsAvailable/text()')
 		}
 	end
-	
+
 	def parse_get_contact_notes_result(node)
 		notes = parse_notes(node)
 		{
@@ -402,38 +419,38 @@ class Landslider < Handsoap::Service
 		: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()')
-		
+
 		}.merge(notes)
 	end
-	
+
 	def parse_get_entity_custom_fields_result(node)
 		{
 		:custom_fields => node.xpath('./*/customFields', ns).map { |child| parse_custom_field(child) },
-			
+
 		: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()')
 		}
 	end
-	
+
 	def parse_get_instance_information_result(node)
 		{
 		:address => parse_address(node.xpath('./*/address')),
 		:company_name => xml_to_str(node, './*/companyName/text()'),
 		:instance_url => xml_to_str(node, './*/instanceURL/text()'),
-			
+
 		: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()')
 		}
 	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()'),
@@ -442,9 +459,9 @@ class Landslider < Handsoap::Service
 		:total_results_available => xml_to_int(node, './*/totalResultsAvailable/text()')
 		}.merge(leads)
 	end
-	
+
 	def parse_get_lead_notes_result(node)
-		
+
 		notes = parse_notes(node)
 		{
 		:error => xml_to_bool(node, './Notes/error/text()'),
@@ -455,11 +472,11 @@ class Landslider < Handsoap::Service
 		:total_results_available => xml_to_int(node, './Notes/totalResultsAvailable/text()')
 		}.merge(notes)
 	end
-	
+
 	def parse_get_opportunities_result(node)
 		{
 		:opportunities => node.xpath('./*/opportunityList', ns).map { |child| parse_opportunity(child) },
-			
+
 		:error => xml_to_bool(node, './*/error/text()'),
 		:error_code => xml_to_int(node, './*/errorCode/text()'),
 		:result_msg => xml_to_str(node, './*/resultMsg/text()'),
@@ -468,7 +485,7 @@ class Landslider < Handsoap::Service
 		:total_results_available => xml_to_int(node, './*/totalResultsAvailable/text()')
 		}
 	end
-	
+
 	def parse_get_opportunity_notes_result(node)
 		notes = parse_notes(node)
 		{
@@ -484,15 +501,14 @@ class Landslider < Handsoap::Service
 	def parse_get_user_information_by_id_result(node)
 		{
 		:employee => parse_employee(node.xpath('./WsEmployee/employee')),
-			
+
 		: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()')
 		}
 	end
-	
-	
+
 	# WsAccount
 	def parse_account(node)
 		{
@@ -516,17 +532,18 @@ class Landslider < Handsoap::Service
 		:sync_with_quickbooks => xml_to_str(node, './isSyncWithQuickbooks/text()'),
 		:custom_fields => node.xpath('./customFields', ns).map { |child| parse_custom_field(child) }
 		}
-		
+
 	end
-	
+
 	# WsAccountType
 	def parse_account_type(node)
 		{
-		:account_type => xml_to_str(node, './accountType/text()')
+		:account_type_id => xml_to_str(node, 'accountTypeId/text()'),
+		:account_type => xml_to_str(node, 'accountType/text()')
 		}
 	end
-	
-	# WsAddress 
+
+	# WsAddress
 	def parse_address(node)
 		{
 		:address => xml_to_str(node, './address1/text()'),
@@ -536,7 +553,7 @@ class Landslider < Handsoap::Service
 		:country => xml_to_str(node, './country/text()')
 		}
 	end
-	
+
 	# WsContact
 	def parse_contact(node)
 		{
@@ -554,7 +571,7 @@ class Landslider < Handsoap::Service
 		:custom_fields => node.xpath('./customFields', ns).map { |child| parse_custom_field(child) }
 		}
 	end
-	
+
 	# WsCustomField
 	def parse_custom_field(node)
 		{
@@ -564,7 +581,7 @@ class Landslider < Handsoap::Service
 		:custom_field_value => xml_to_str(node, './customFieldValue/customFieldValue/text()')
 		}
 	end
-	
+
 	# WsEmployee
 	def parse_employee(node)
 		{
@@ -579,7 +596,7 @@ class Landslider < Handsoap::Service
 		:user_id => xml_to_str(node, './userId/text()')
 		}
 	end
-	
+
 	def parse_notes(node)
 		{
 		:notes => node.xpath('./*/notes', ns).map { |child| parse_note(child) }
@@ -597,13 +614,13 @@ class Landslider < Handsoap::Service
 		:updated_on => xml_to_date(node, './updatedOn/text()'),
 		}
 	end
-	
+
 	def parse_leads(node)
 		{
 		:leads => node.xpath('./*/leadList', ns).map { |child| parse_lead(child) }
 		}
 	end
-	
+
 	# WsLead
 	def parse_lead(node)
 		{
@@ -621,10 +638,10 @@ class Landslider < Handsoap::Service
 		:ok_to_email => xml_to_bool(node, './okToEmail/text()'),
 		:primary_owner_id => xml_to_int(node, './primaryOwnerId/text()'),
 		:custom_fields => node.xpath('./customFields', ns).map { |child| parse_custom_field(child) }
-		
+
 		}
 	end
-	
+
 	# WsOpportunity
 	def parse_opportunity(node)
 		{
@@ -646,3 +663,4 @@ class Landslider < Handsoap::Service
 	end
 
 end
+

data/test/get_account_types_test.rb

@@ -0,0 +1,20 @@
+
+require 'test_helper'
+
+class GetAccountTypesTest < Test::Unit::TestCase
+
+	def setup
+		# Landslider.logger = $stdout
+		$sesson_id ||= Landslider.login('LOGINTOKEN=' + LS_INSTANCE_NAME)[:session_id]
+	end
+	
+	def test_get_account_types
+		result = Landslider.get_account_types($sesson_id)
+
+		assert_not_nil result
+		assert_equal false, result[:error]
+		assert_kind_of Array, result[:account_types]
+	end
+	
+	
+end

metadata

@@ -2,7 +2,7 @@
 name: landslider
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.9
+  version: 0.5.11
 platform: ruby
 authors: 
 - Jay Prall
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 -04:00
+date: 2011-05-13 00:00:00 -04:00
 default_executable: generate_api_key.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,6 +113,7 @@ files:
 - lib/landslider/entities/ws_selling_process.rb
 - lib/landslider/entities/ws_user.rb
 - lib/landslider/entities/ws_user_search.rb
+- test/get_account_types_test.rb
 - test/landslider_test.rb
 - test/test_helper.rb
 - test/ws_account_note_search_test.rb
@@ -148,5 +149,12 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Landslide Ruby
-test_files: []
-
+test_files: 
+- test/get_account_types_test.rb
+- 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