infusionsoft 1.3.0a → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a7e9e07a053e797587d945bbd72ae311eec9b3aac0eb5bebda59fe9512c7ccb
-  data.tar.gz: 28b23ae6b99cf7e146b476b922613b272c4f5acf0605bb5ea755eff0cd01e5ce
+  metadata.gz: ea5036f0847c9f8d2d27b105450d9f7f244fc3c8afc82a9df65a5dd3dfd2259c
+  data.tar.gz: 225a3bc76cd0d2dbf2834709fd515d56145bc8ebcacde1adc5cf861d79d6e90c
 SHA512:
-  metadata.gz: b8934f77b9f5e1d94bc9a9f24270bbf948f12491a1a4f0134e9a519d6a4c4b03a1b1c13f91b2ffa0ffff8b09504ee1577951ea3e4fb8c488c4404612517ece1c
-  data.tar.gz: a339f6b7bee9de9375190aa4fcf0b1df4d94c2fe9624b36f55b934c347f399650cb946b9a0cb53a4a6aff5882694ab87059682c604b91b516296012db26fda73
+  metadata.gz: 3ecd5f2ee7588c842b4e83355fe3c9abd154e38cd772f408ce32ffc269feca4c3b8640f8b8961d5f4af58400ca38c93a19e7a6766843e49d4b4fb5a6d1fe8e60
+  data.tar.gz: fb4ee7abf586a9160c10e1d8ee1e3c7ce51454f89f0948a4dae773e754fb246904a722721490208171a762e2764e4cd142e25d65817666d6bb3ab5ced776daee

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.5
-  - 2.2.2
-  - 2.3.4
-  # - 2.4.1 need to do more testing
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.1
   - jruby-20mode # JRuby in 2.0 mode

data/README.md

@@ -98,7 +98,7 @@ features.
 ## <a name="rubies">Supported Rubies</a>
 This library aims to support the following Ruby implementations:
 
-* Ruby >= 2.0
+* Ruby >= 2.3.8
 * [JRuby](http://www.jruby.org/)
 * [Rubinius](http://rubini.us/)
 * [Ruby Enterprise Edition](http://www.rubyenterpriseedition.com/)

data/infusionsoft.gemspec

@@ -14,6 +14,9 @@ Gem::Specification.new do |gem|
   gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6')
   gem.add_development_dependency 'rake'
 
+  gem.add_dependency "xmlrpc"
+  gem.add_dependency "rest-client"
+
   gem.version = Infusionsoft::VERSION.dup
 end
 

data/lib/infusionsoft.rb

@@ -2,6 +2,7 @@ require 'infusionsoft/api'
 require 'infusionsoft/client'
 require 'infusionsoft/configuration'
 require 'infusionsoft/api_logger'
+require 'infusionsoft/rest/token'
 
 module Infusionsoft
   extend Configuration

data/lib/infusionsoft/client/affiliate.rb

@@ -15,7 +15,7 @@ module Infusionsoft
       # @return [Array] all claw backs for the given affiliate that have occurred within the date
       #   range specified
       def affiliate_clawbacks(affiliate_id, start_date, end_date)
-        response = get('APIAffiliateService.affClawbacks', affiliate_id, start_date, end_date)
+        response = xmlrpc('APIAffiliateService.affClawbacks', affiliate_id, start_date, end_date)
       end
 
       # Used to retrieve all commissions for a specific affiliate within a date range.
@@ -26,7 +26,7 @@ module Infusionsoft
       # @return [Array] all sales commissions for the given affiliate earned within the date range
       #   specified
       def affiliate_commissions(affiliate_id, start_date, end_date)
-        response = get('APIAffiliateService.affCommissions', affiliate_id, start_date, end_date)
+        response = xmlrpc('APIAffiliateService.affCommissions', affiliate_id, start_date, end_date)
       end
 
       # Used to retrieve all payments for a specific affiliate within a date range.
@@ -36,7 +36,7 @@ module Infusionsoft
       # @param [Date] end_date
       # @return [Array] a list of rows, each row is a single payout
       def affiliate_payouts(affiliate_id, start_date, end_date)
-        response = get('APIAffiliateService.affPayouts', affiliate_id, start_date, end_date)
+        response = xmlrpc('APIAffiliateService.affPayouts', affiliate_id, start_date, end_date)
       end
 
       # This method is used to retrieve all commissions for a specific affiliate within a date range.
@@ -45,7 +45,7 @@ module Infusionsoft
       # @return [Array] all sales commissions for the given affiliate earned within the date range
       #   specified
       def affiliate_running_totals(affiliate_list)
-        response = get('APIAffiliateService.affRunningTotals', affiliate_list)
+        response = xmlrpc('APIAffiliateService.affRunningTotals', affiliate_list)
       end
 
       # Used to retrieve a summary of statistics for a list of affiliates.
@@ -55,7 +55,7 @@ module Infusionsoft
       # @param [Date] end_date
       # @return [Array<Hash>] a summary of the affiliates information for a specified date range
       def affiliate_summary(affiliate_list, start_date, end_date)
-        response = get('APIAffiliateService.affSummary', affiliate_list, start_date, end_date)
+        response = xmlrpc('APIAffiliateService.affSummary', affiliate_list, start_date, end_date)
       end
     end
   end

data/lib/infusionsoft/client/contact.rb

@@ -12,7 +12,7 @@ module Infusionsoft
       # @example
       #   { :Email => 'test@test.com', :FirstName => 'first_name', :LastName => 'last_name' }, 'New Signup'
       def contact_add(data, optin_status=nil)
-        contact_id = get('ContactService.add', data)
+        contact_id = xmlrpc('ContactService.add', data)
         email = data['Email'] || data[:Email]
         if optin_status && email; email_optin(email, optin_status); end
         return contact_id
@@ -23,7 +23,7 @@ module Infusionsoft
       # @param [Integer] contact_id
       # @param [Integer] duplicate_contact_id
       def contact_merge(contact_id, duplicate_contact_id)
-        response = get('ContactService.merge', contact_id, duplicate_contact_id)
+        response = xmlrpc('ContactService.merge', contact_id, duplicate_contact_id)
       end
 
       # Adds or updates a contact record based on matching data
@@ -37,7 +37,7 @@ module Infusionsoft
       # @example
       #   { :Email => 'test@test.com', :FirstName => 'first_name', :LastName => 'last_name' }, 'Email', 'New Signup'
       def contact_add_with_dup_check(data, check_type, optin_status=nil)
-        contact_id = get('ContactService.addWithDupCheck', data, check_type)
+        contact_id = xmlrpc('ContactService.addWithDupCheck', data, check_type)
         email = data['Email'] || data[:Email]
         if optin_status && email; email_optin(email, optin_status); end
         return contact_id
@@ -53,7 +53,7 @@ module Infusionsoft
       # @example
       #   { :FirstName => 'first_name', :StreetAddress1 => '123 N Street' }, 'New Signup'
       def contact_update(contact_id, data, optin_status=nil)
-        contact_id = get('ContactService.update', contact_id, data)
+        contact_id = xmlrpc('ContactService.update', contact_id, data)
         email = data['Email'] || data[:Email]
         if optin_status && email; email_optin(email, optin_status); end
         return contact_id
@@ -67,7 +67,7 @@ module Infusionsoft
       # @example this is what you would get back
       #   { "FirstName" => "John", "LastName" => "Doe" }
       def contact_load(id, selected_fields)
-        response = get('ContactService.load', id, selected_fields)
+        response = xmlrpc('ContactService.load', id, selected_fields)
       end
 
       # Finds all contacts with the supplied email address in any of the three contact record email
@@ -77,7 +77,7 @@ module Infusionsoft
       # @param [Array] selected_fields the list of fields you want with it's data
       # @return [Array<Hash>] the list of contacts with it's fields and data
       def contact_find_by_email(email, selected_fields)
-        response = get('ContactService.findByEmail', email, selected_fields)
+        response = xmlrpc('ContactService.findByEmail', email, selected_fields)
       end
 
       # Adds a contact to a follow-up sequence (campaigns were the original name of follow-up sequences).
@@ -87,7 +87,7 @@ module Infusionsoft
       # @return [Boolean] returns true/false if the contact was added to the follow-up sequence
       #   successfully
       def contact_add_to_campaign(contact_id, campaign_id)
-        response = get('ContactService.addToCampaign', contact_id, campaign_id)
+        response = xmlrpc('ContactService.addToCampaign', contact_id, campaign_id)
       end
 
       # Returns the Id number of the next follow-up sequence step for the given contact.
@@ -97,7 +97,7 @@ module Infusionsoft
       # @return [Integer] id number of the next unfishished step in the given follow up sequence
       #   for the given contact
       def contact_get_next_campaign_step(contact_id, campaign_id)
-        response = get('ContactService.getNextCampaignStep', contact_id, campaign_id)
+        response = xmlrpc('ContactService.getNextCampaignStep', contact_id, campaign_id)
       end
 
       # Pauses a follow-up sequence for the given contact record
@@ -106,7 +106,7 @@ module Infusionsoft
       # @param [Integer] campaign_id
       # @return [Boolean] returns true/false if the sequence was paused
       def contact_pause_campaign(contact_id, campaign_id)
-        response = get('ContactService.pauseCampaign', contact_id, campaign_id)
+        response = xmlrpc('ContactService.pauseCampaign', contact_id, campaign_id)
       end
 
       # Removes a follow-up sequence from a contact record
@@ -115,7 +115,7 @@ module Infusionsoft
       # @param [Integer] campaign_id
       # @return [Boolean] returns true/false if removed
       def contact_remove_from_campaign(contact_id, campaign_id)
-        response = get('ContactService.removeFromCampaign', contact_id, campaign_id)
+        response = xmlrpc('ContactService.removeFromCampaign', contact_id, campaign_id)
       end
 
       # Resumes a follow-up sequence that has been stopped/paused for a given contact.
@@ -124,7 +124,7 @@ module Infusionsoft
       # @param [Ingeger] campaign_id
       # @return [Boolean] returns true/false if sequence was resumed
       def contact_resume_campaign(contact_id, campaign_id)
-        response = get('ConactService.resumeCampaignForContact', contact_id, campaign_id)
+        response = xmlrpc('ConactService.resumeCampaignForContact', contact_id, campaign_id)
       end
 
       # Immediately performs the given follow-up sequence step_id for the given contacts.
@@ -133,7 +133,7 @@ module Infusionsoft
       # @param [Integer] ) step_id
       # @return [Boolean] returns true/false if the step was rescheduled
       def contact_reschedule_campaign_step(list_of_contacts, step_id)
-        response = get('ContactService.reschedulteCampaignStep', list_of_contacts, step_id)
+        response = xmlrpc('ContactService.reschedulteCampaignStep', list_of_contacts, step_id)
       end
 
       # Removes a tag from a contact (groups were the original name of tags).
@@ -142,7 +142,7 @@ module Infusionsoft
       # @param [Integer] group_id
       # @return [Boolean] returns true/false if tag was removed successfully
       def contact_remove_from_group(contact_id, group_id)
-        response = get('ContactService.removeFromGroup', contact_id, group_id)
+        response = xmlrpc('ContactService.removeFromGroup', contact_id, group_id)
       end
 
       # Adds a tag to a contact
@@ -151,7 +151,7 @@ module Infusionsoft
       # @param [Integer] group_id
       # @return [Boolean] returns true/false if the tag was added successfully
       def contact_add_to_group(contact_id, group_id)
-        response = get('ContactService.addToGroup', contact_id, group_id)
+        response = xmlrpc('ContactService.addToGroup', contact_id, group_id)
       end
 
       # Runs an action set on a given contact record
@@ -163,20 +163,20 @@ module Infusionsoft
       #   [{ 'Action' => 'Create Task', 'Message' => 'task1 (Task) sent successfully', 'isError' =>
       #   nil }]
       def contact_run_action_set(contact_id, action_set_id)
-        response = get('ContactService.runActionSequence', contact_id, action_set_id)
+        response = xmlrpc('ContactService.runActionSequence', contact_id, action_set_id)
       end
 
       def contact_link_contact(remoteApp, remoteId, localId)
-        response = get('ContactService.linkContact', remoteApp, remoteId, localId)
+        response = xmlrpc('ContactService.linkContact', remoteApp, remoteId, localId)
       end
 
 
       def contact_locate_contact_link(locate_map_id)
-        response = get('ContactService.locateContactLink', locate_map_id)
+        response = xmlrpc('ContactService.locateContactLink', locate_map_id)
       end
 
       def contact_mark_link_updated(locate_map_id)
-        response = get('ContactService.markLinkUpdated', locate_map_id)
+        response = xmlrpc('ContactService.markLinkUpdated', locate_map_id)
       end
 
       # Creates a new recurring order for a contact.
@@ -189,7 +189,7 @@ module Infusionsoft
       # @param [Integer] affiliate_id
       def contact_add_recurring_order(contact_id, allow_duplicate, cprogram_id, merchant_account_id,
                                       credit_card_id, affiliate_id, days_till_charge)
-        response = get('ContactService.addRecurringOrder', contact_id, allow_duplicate, cprogram_id,
+        response = xmlrpc('ContactService.addRecurringOrder', contact_id, allow_duplicate, cprogram_id,
                             merchant_account_id, credit_card_id, affiliate_id, days_till_charge)
       end
 
@@ -200,7 +200,7 @@ module Infusionsoft
       # @param [Integer] action_set_id
       # @param [Hash] data
       def contact_run_action_set_with_params(contact_id, action_set_id, data)
-        response = get('ContactService.runActionSequence', contact_id, action_set_id, data)
+        response = xmlrpc('ContactService.runActionSequence', contact_id, action_set_id, data)
       end
 
     end

data/lib/infusionsoft/client/credit_card.rb

@@ -1,7 +1,7 @@
 module Infusionsoft
   class Client
-    # CreditCardSubmission service is used to obtain a token that is to be submitted 
-    # through a form when adding a credit card. In accordance with PCI compliance, 
+    # CreditCardSubmission service is used to obtain a token that is to be submitted
+    # through a form when adding a credit card. In accordance with PCI compliance,
     # adding credit cards through the API will no longer be supported.
     module CreditCard
 
@@ -12,11 +12,11 @@ module Infusionsoft
       # @param [String] url that will be redirected to upon successfully adding card
       # @param [String] url that will be redirected to when there is a failure upon adding card
       def credit_card_request_token(contact_id, success_url, failure_url)
-        response = get('CreditCardSubmissionService.requestSubmissionToken', contact_id, success_url, failure_url)
+        response = xmlrpc('CreditCardSubmissionService.requestSubmissionToken', contact_id, success_url, failure_url)
       end
 
       def credit_card_lookup_by_token(token)
-        response = get('CreditCardSubmissionService.requestCreditCardId', token)
+        response = xmlrpc('CreditCardSubmissionService.requestCreditCardId', token)
       end
 
     end

data/lib/infusionsoft/client/data.rb

@@ -9,7 +9,7 @@ module Infusionsoft
       # @param [Hash] data the fields and it's data
       # @return [Integer] returns the id of the record added
       def data_add(table, data)
-        response = get('DataService.add', table, data)
+        response = xmlrpc('DataService.add', table, data)
       end
 
       # This method will load a record from the database given the primary key.
@@ -21,7 +21,7 @@ module Infusionsoft
       # @example
       #   { "FirstName" => "John", "LastName" => "Doe" }
       def data_load(table, id, selected_fields)
-        response = get('DataService.load', table, id, selected_fields)
+        response = xmlrpc('DataService.load', table, id, selected_fields)
       end
 
       # Updates the specified record (indicated by ID) with the data provided.
@@ -33,7 +33,7 @@ module Infusionsoft
       # @example
       #   { :FirstName => 'John', :Email => 'test@test.com' }
       def data_update(table, id, data)
-        response = get('DataService.update', table, id, data)
+        response = xmlrpc('DataService.update', table, id, data)
       end
 
       # Deletes the record (specified by id) in the given table from the database.
@@ -42,7 +42,7 @@ module Infusionsoft
       # @param [Integer] id
       # @return [Boolean] returns true/false if the record was successfully deleted
       def data_delete(table, id)
-        response = get('DataService.delete', table, id)
+        response = xmlrpc('DataService.delete', table, id)
       end
 
       # This will locate all records in a given table that match the criteria for a given field.
@@ -55,7 +55,7 @@ module Infusionsoft
       # @param [Array] selected_fields
       # @return [Array<Hash>] returns the array of records with a hash of the fields and values
       def data_find_by_field(table, limit, page, field_name, field_value, selected_fields)
-        response = get('DataService.findByField', table, limit, page, field_name,
+        response = xmlrpc('DataService.findByField', table, limit, page, field_name,
                        field_value, selected_fields)
       end
 
@@ -68,7 +68,7 @@ module Infusionsoft
       # @param [Array] selected_fields the fields and values you want back
       # @return [Array<Hash>] the fields and associated values
       def data_query(table, limit, page, data, selected_fields)
-        response = get('DataService.query', table, limit, page, data, selected_fields)
+        response = xmlrpc('DataService.query', table, limit, page, data, selected_fields)
       end
 
       # Queries records in a given table to find matches on certain fields.
@@ -82,7 +82,7 @@ module Infusionsoft
       # @param [Boolean] true ascending, false descending
       # @return [Array<Hash>] the fields and associated values
       def data_query_order_by(table, limit, page, data, selected_fields, by, ascending)
-        response = get('DataService.query', table, limit, page, data, selected_fields, by, ascending)
+        response = xmlrpc('DataService.query', table, limit, page, data, selected_fields, by, ascending)
       end
 
       # Adds a custom field to Infusionsoft
@@ -94,7 +94,7 @@ module Infusionsoft
       # @param [Integer] header_id see notes here
       #   http://help.infusionsoft.com/developers/services-methods/data/addCustomField
       def data_add_custom_field(field_type, name, data_type, header_id)
-        response = get('DataService.addCustomField', field_type, name, data_type, header_id)
+        response = xmlrpc('DataService.addCustomField', field_type, name, data_type, header_id)
       end
 
       # Authenticate an Infusionsoft username and password(md5 hash). If the credentials match
@@ -105,7 +105,7 @@ module Infusionsoft
       # @param [String] password
       # @return [Integer] id of the authenticated user
       def data_authenticate_user(username, password)
-        response = get('DataService.authenticateUser', username, password)
+        response = xmlrpc('DataService.authenticateUser', username, password)
       end
 
       # This method will return back the data currently configured in a user configured
@@ -119,7 +119,7 @@ module Infusionsoft
       #   before the underscore is the module name. "Contact" in this example. The portion after the
       #   0 is the setting name, "optiontypes" in this example.
       def data_get_app_setting(module_name, setting)
-        response = get('DataService.getAppSetting', module_name, setting)
+        response = xmlrpc('DataService.getAppSetting', module_name, setting)
       end
 
       # Returns a temporary API key if given a valid Vendor key and user credentials.
@@ -129,7 +129,7 @@ module Infusionsoft
       # @param [String] password_hash an md5 hash of users password
       # @return [String] temporary API key
       def data_get_temporary_key(vendor_key, username, password_hash)
-        response = get('DataService.getTemporaryKey', username, password_hash)
+        response = xmlrpc('DataService.getTemporaryKey', username, password_hash)
       end
 
       # Updates a custom field. Every field can have it’s display name and group id changed,
@@ -139,7 +139,7 @@ module Infusionsoft
       # @param [Hash] field_values
       # @return [Boolean] returns true/false if it was updated
       def data_update_custom_field(field_id, field_values)
-        response = get('DataService.updateCustomField', field_id, field_values)
+        response = xmlrpc('DataService.updateCustomField', field_id, field_values)
       end
     end
   end

data/lib/infusionsoft/client/email.rb

@@ -21,7 +21,7 @@ module Infusionsoft
       # @param [String] merge_context can be Contact, ServiceCall, Opportunity, CreditCard
       def email_add(title, categories, from, to, cc, bcc, subject, text_body, html_body,
                     content_type, merge_context)
-        response = get('APIEmailService.addEmailTemplate', title, categories, from, to,
+        response = xmlrpc('APIEmailService.addEmailTemplate', title, categories, from, to,
                        cc, bcc, subject, text_body, html_body, content_type, merge_context)
       end
 
@@ -45,7 +45,7 @@ module Infusionsoft
       def email_attach(contact_id, from_name, from_address, to_address, cc_addresses,
                        bcc_addresses, content_type, subject, html_body, txt_body,
                        header, receive_date, send_date)
-        response = get('APIEmailService.attachEmail', contact_id, from_name, from_address,
+        response = xmlrpc('APIEmailService.attachEmail', contact_id, from_name, from_address,
                        to_address, cc_addresses, bcc_addresses, content_type, subject,
                        html_body, txt_body, header, receive_date, send_date)
       end
@@ -55,7 +55,7 @@ module Infusionsoft
       # @param [String] merge_context could include Contact, ServiceCall, Opportunity, or CreditCard
       # @return [Array] returns the merge fields for the given context
       def email_get_available_merge_fields(merge_context)
-        response = get('APIEmailService.getAvailableMergeFields', merge_context)
+        response = xmlrpc('APIEmailService.getAvailableMergeFields', merge_context)
       end
 
       # Retrieves the details for a particular email template.
@@ -63,7 +63,7 @@ module Infusionsoft
       # @param [Integer] id
       # @return [Hash] all data for the email template
       def email_get_template(id)
-        response = get('APIEmailService.getEmailTemplate', id)
+        response = xmlrpc('APIEmailService.getEmailTemplate', id)
       end
 
       # Retrieves the status of the given email address.
@@ -71,7 +71,7 @@ module Infusionsoft
       # @param [String] email_address
       # @return [Integer]  0 = opted out, 1 = single opt-in, 2 = double opt-in
       def email_get_opt_status(email_address)
-        response = get('APIEmailService.getOptStatus', email_address)
+        response = xmlrpc('APIEmailService.getOptStatus', email_address)
       end
 
       # This method opts-in an email address. This method only works the first time
@@ -83,7 +83,7 @@ module Infusionsoft
       #   reason is passed the system will default a reason of "API Opt In"
       # @return [Boolean]
       def email_optin(email_address, reason)
-        response = get('APIEmailService.optIn', email_address, reason)
+        response = xmlrpc('APIEmailService.optIn', email_address, reason)
       end
 
       # Opts-out an email address. Note that once an address is opt-out,
@@ -93,7 +93,7 @@ module Infusionsoft
       # @param [String] reason
       # @return [Boolean]
       def email_optout(email_address, reason)
-        response = get('APIEmailService.optOut', email_address, reason)
+        response = xmlrpc('APIEmailService.optOut', email_address, reason)
       end
 
       # This will send an email to a list of contacts, as well as record the email
@@ -111,7 +111,7 @@ module Infusionsoft
       # @return [Boolean] returns true/false if the email has been sent
       def email_send(contact_list, from_address, to_address, cc_addresses,
                      bcc_addresses, content_type, subject, html_body, text_body)
-        response = get('APIEmailService.sendEmail', contact_list, from_address,
+        response = xmlrpc('APIEmailService.sendEmail', contact_list, from_address,
                        to_address, cc_addresses, bcc_addresses, content_type, subject,
                        html_body, text_body)
       end
@@ -121,9 +121,9 @@ module Infusionsoft
       #
       # @param [Array<Integer>] contact_list is an array of Contact id numbers you would like to send this email to
       # @param [String] The Id of the template to send
-      # @return returns true if the email has been sent, an error will be sent back otherwise.      
+      # @return returns true if the email has been sent, an error will be sent back otherwise.
       def email_send_template(contact_list, template_id)
-        response = get('APIEmailService.sendEmail', contact_list, template_id)
+        response = xmlrpc('APIEmailService.sendEmail', contact_list, template_id)
       end
 
 
@@ -144,7 +144,7 @@ module Infusionsoft
       # @return [Boolean] returns true/false if teamplate was updated successfully
       def email_update_template(id, title, category, from, to, cc, bcc, subject,
                                 text_body, html_body, content_type, merge_context)
-        response = get('APIEmailService.updateEmailTemplate', id, title, category, from,
+        response = xmlrpc('APIEmailService.updateEmailTemplate', id, title, category, from,
                        to, cc, bcc, subject, text_body, html_body, content_type, merge_context)
       end
     end

data/lib/infusionsoft/client/file.rb

@@ -2,24 +2,24 @@ module Infusionsoft
   class Client
     module File
       def file_upload(contact_id, file_name, encoded_file_base64)
-        response = get('FileService.uploadFile', contact_id, file_name, encoded_file_base64)
+        response = xmlrpc('FileService.uploadFile', contact_id, file_name, encoded_file_base64)
       end
 
       # returns the Base64 encoded file contents
       def file_get(id)
-        response = get('FileService.getFile', id)
+        response = xmlrpc('FileService.getFile', id)
       end
 
       def file_url(id)
-        response = get('FileService.getDownloadUrl', id)
+        response = xmlrpc('FileService.getDownloadUrl', id)
       end
 
       def file_rename(id, new_name)
-        response = get('FileService.renameFile', id, new_name)
+        response = xmlrpc('FileService.renameFile', id, new_name)
       end
 
       def file_replace(id, encoded_file_base64)
-        response = get('FileService.replaceFile', id, encoded_file_base64)
+        response = xmlrpc('FileService.replaceFile', id, encoded_file_base64)
       end
     end
   end

data/lib/infusionsoft/client/funnel.rb

@@ -4,15 +4,15 @@ module Infusionsoft
     module Funnel
 
       # Achieves a goal, Returns the result of a goal being achieved.
-      # 
+      #
       # @param integration, string, The integration name of the goal. This defaults to the name of the app.
       # @param call_name, string, The call name of the goal
       # @param cid, int, The id of the contact you want to add to a sequence.
-      # 
+      #
       def funnel_achieve_goal(integration, call_name, cid)
-        response = get('FunnelService.achieveGoal', integration, call_name, cid)
+        response = xmlrpc('FunnelService.achieveGoal', integration, call_name, cid)
       end
-      
+
     end
   end
 end

data/lib/infusionsoft/client/invoice.rb

@@ -12,7 +12,7 @@ module Infusionsoft
       # @return [Integer] returns the invoice id
       def invoice_create_blank_order(contact_id, description, order_date, lead_affiliate_id,
                                      sale_affiliate_id)
-        response = get('InvoiceService.createBlankOrder', contact_id, description, order_date,
+        response = xmlrpc('InvoiceService.createBlankOrder', contact_id, description, order_date,
                         lead_affiliate_id, sale_affiliate_id)
       end
 
@@ -29,7 +29,7 @@ module Infusionsoft
       # @param [String] notes
       # @return [Boolean] returns true/false if it was added successfully or not
       def invoice_add_order_item(invoice_id, product_id, type, price, quantity, description, notes)
-        response = get('InvoiceService.addOrderItem', invoice_id, product_id, type, price,
+        response = xmlrpc('InvoiceService.addOrderItem', invoice_id, product_id, type, price,
                        quantity, description, notes)
       end
 
@@ -44,7 +44,7 @@ module Infusionsoft
       #   'Code' => [String], 'RefNum' => [String], 'Message' => [String]}
       def invoice_charge_invoice(invoice_id, notes, credit_card_id, merchant_account_id,
                                  bypass_commissions)
-        response = get('InvoiceService.chargeInvoice', invoice_id, notes, credit_card_id,
+        response = xmlrpc('InvoiceService.chargeInvoice', invoice_id, notes, credit_card_id,
                             merchant_account_id, bypass_commissions)
       end
 
@@ -54,7 +54,7 @@ module Infusionsoft
       # @param [Integer] cprogram_id the id of the subscription being deleted
       # @return [Boolean]
       def invoice_delete_subscription(cprogram_id)
-        response = get('InvoiceService.deleteSubscription', cprogram_id)
+        response = xmlrpc('InvoiceService.deleteSubscription', cprogram_id)
       end
 
       # Creates a subscription for a contact. Subscriptions are billing automatically
@@ -75,7 +75,7 @@ module Infusionsoft
 
         api_logger.warn "[DEPRECATION WARNING]: The invoice_add_subscription method more fully complies with Infusionsoft's published API documents. User is advised to review Infusionsoft's API and this gem's documentation for changes in parameters."
 
-        response = get('InvoiceService.addRecurringOrder', contact_id,
+        response = xmlrpc('InvoiceService.addRecurringOrder', contact_id,
                        allow_duplicate, cprogram_id, merchant_account_id, credit_card_id,
                        affiliate_id, days_till_charge)
       end
@@ -101,7 +101,7 @@ module Infusionsoft
                                       qty, price, allow_tax,
                                       merchant_account_id, credit_card_id, affiliate_id,
                                       days_till_charge)
-        response = get('InvoiceService.addRecurringOrder', contact_id,
+        response = xmlrpc('InvoiceService.addRecurringOrder', contact_id,
                        allow_duplicate, cprogram_id, qty, price, allow_tax, merchant_account_id, credit_card_id,
                        affiliate_id, days_till_charge)
       end
@@ -120,7 +120,7 @@ module Infusionsoft
       # @return [Boolean]
       def invoice_add_recurring_commission_override(recurring_order_id, affiliate_id,
                                                     amount, payout_type, description)
-        response = get('InvoiceService.addRecurringCommissionOverride', recurring_order_id,
+        response = xmlrpc('InvoiceService.addRecurringCommissionOverride', recurring_order_id,
                        affiliate_id, amount, payout_type, description)
       end
 
@@ -134,7 +134,7 @@ module Infusionsoft
       # @param [Boolean] bypass_commissions
       # @return [Boolean]
       def invoice_add_manual_payment(invoice_id, amount, date, type, description, bypass_commissions)
-        response = get('InvoiceService.addManualPayment', invoice_id, amount, date, type,
+        response = xmlrpc('InvoiceService.addManualPayment', invoice_id, amount, date, type,
                        description, bypass_commissions)
       end
 
@@ -145,7 +145,7 @@ module Infusionsoft
       # @param [Integer] recurring_order_id
       # @return [Integer] returns the id of the invoice that was created
       def invoice_create_invoice_for_recurring(recurring_order_id)
-        response = get('InvoiceService.createInvoiceForRecurring', recurring_order_id)
+        response = xmlrpc('InvoiceService.createInvoiceForRecurring', recurring_order_id)
       end
 
       # Adds a payment plan to an existing invoice.
@@ -168,7 +168,7 @@ module Infusionsoft
                                    merchant_account_id, days_between_retry, max_retry,
                                    initial_payment_amount, initial_payment_date, plan_start_date,
                                    number_of_payments, days_between_payments)
-        response = get('InvoiceService.addPaymentPlan', invoice_id, auto_charge,
+        response = xmlrpc('InvoiceService.addPaymentPlan', invoice_id, auto_charge,
                        credit_card_id, merchant_account_id, days_between_retry, max_retry,
                        initial_payment_amount, initial_payment_date, plan_start_date, number_of_payments,
                        days_between_payments)
@@ -179,14 +179,14 @@ module Infusionsoft
       # @param [Integer] invoice_id
       # @return [Float]
       def invoice_calculate_amount_owed(invoice_id)
-        response = get('InvoiceService.calculateAmountOwed', invoice_id)
+        response = xmlrpc('InvoiceService.calculateAmountOwed', invoice_id)
       end
 
       # Retrieve all Payment Types currently setup under the Order Settings section of Infusionsoft.
       #
       # @return [Array]
       def invoice_get_all_payment_otpions
-        response = get('InvoiceService.getAllPaymentOptions')
+        response = xmlrpc('InvoiceService.getAllPaymentOptions')
       end
 
       # Retrieves all payments for a given invoice.
@@ -194,7 +194,7 @@ module Infusionsoft
       # @param [Integer] invoice_id
       # @return [Array<Hash>] returns an array of payments
       def invoice_get_payments(invoice_id)
-        response = get('Invoice.getPayments', invoice_id)
+        response = xmlrpc('Invoice.getPayments', invoice_id)
       end
 
       # Locates an existing card in the system for a contact, using the last 4 digits.
@@ -203,7 +203,7 @@ module Infusionsoft
       # @param [Integer] last_four
       # @return [Integer] returns the id of the credit card
       def invoice_locate_existing_card(contact_id, last_four)
-        response = get('InvoiceService.locateExistingCard', contact_id, last_four)
+        response = xmlrpc('InvoiceService.locateExistingCard', contact_id, last_four)
       end
 
       # Calculates tax, and places it onto the given invoice.
@@ -211,7 +211,7 @@ module Infusionsoft
       # @param [Integer] invoice_id
       # @return [Boolean]
       def invoice_recalculate_tax(invoice_id)
-        response = get('InvoiceService.recalculateTax', invoice_id)
+        response = xmlrpc('InvoiceService.recalculateTax', invoice_id)
       end
 
       # This will validate a credit card in the system.
@@ -219,7 +219,7 @@ module Infusionsoft
       # @param [Integer] credit_card_id if the card is already in the system
       # @return [Hash] returns a hash { 'Valid' => false, 'Message' => 'Card is expired' }
       def invoice_validate_card(credit_card_id)
-        response = get('InvoiceService.validateCreditCard', credit_card_id)
+        response = xmlrpc('InvoiceService.validateCreditCard', credit_card_id)
       end
 
       # This will validate a credit card by passing in values of the
@@ -228,14 +228,14 @@ module Infusionsoft
       # @param [Hash] data
       # @return [Hash] returns a hash { 'Valid' => false, 'Message' => 'Card is expired' }
       def invoice_validate_card(data)
-        response = get('InvoiceService.validateCreditCard', data)
+        response = xmlrpc('InvoiceService.validateCreditCard', data)
       end
 
       # Retrieves the shipping options currently setup for the Infusionsoft shopping cart.
       #
       # @return [Array]
       def invoice_get_all_shipping_options
-        response = get('Invoice.getAllShippingOptions')
+        response = xmlrpc('Invoice.getAllShippingOptions')
       end
 
       # Changes the next bill date on a subscription.
@@ -244,7 +244,7 @@ module Infusionsoft
       # @param [Date] next_bill_date
       # @return [Boolean]
       def invoice_update_recurring_next_bill_date(job_recurring_id, next_bill_date)
-        response = get('InvoiceService.updateJobRecurringNextBillDate', job_recurring_id, next_bill_date)
+        response = xmlrpc('InvoiceService.updateJobRecurringNextBillDate', job_recurring_id, next_bill_date)
       end
 
 
@@ -263,7 +263,7 @@ module Infusionsoft
       # @return [Boolean]
       def invoice_add_order_commission_override(invoice_id, affiliate_id, product_id, percentage,
                                                 amount, payout_type, description, date)
-        response = get('InvoiceService.addOrderCommissionOverride', invoice_id, affiliate_id,
+        response = xmlrpc('InvoiceService.addOrderCommissionOverride', invoice_id, affiliate_id,
                        product_id, percentage, amount, payout_type, description, date)
       end
 
@@ -281,7 +281,7 @@ module Infusionsoft
       #                  should count towards affiliate commissions.)
 
       def add_manual_payment(invoice_id, amount, date, payment_type, description, bypass_commission)
-        response = get('InvoiceService.addManualPayment', invoice_id, amount,
+        response = xmlrpc('InvoiceService.addManualPayment', invoice_id, amount,
                        date, payment_type, description, bypass_commission)
       end
 
@@ -290,14 +290,14 @@ module Infusionsoft
       def invoice_add_recurring_order_with_price(contact_id, allow_duplicate, cprogram_id, qty,
                                                  price, allow_tax, merchant_account_id,
                                                  credit_card_id, affiliate_id, days_till_charge)
-        response = get('InvoiceService.addRecurringOrder', contact_id, allow_duplicate,
+        response = xmlrpc('InvoiceService.addRecurringOrder', contact_id, allow_duplicate,
                        cprogram_id, qty, price, allow_tax, merchant_account_id, credit_card_id,
                        affiliate_id, days_till_charge)
       end
 
       # Deprecated - returns the invoice id from a one time order.
       def invoice_get_invoice_id(order_id)
-        response = get('InvoiceService.getInvoiceId', order_id)
+        response = xmlrpc('InvoiceService.getInvoiceId', order_id)
       end
     end
   end

data/lib/infusionsoft/client/search.rb

@@ -1,15 +1,15 @@
 module Infusionsoft
   class Client
-    # The SearchService allows you to retrieve the results of saved searches and reports that 
-    # have been saved within Infusionsoft. Saved searches/reports are tied to the User that 
-    # created them. This service also allows you to utilize the quick search function found in 
+    # The SearchService allows you to retrieve the results of saved searches and reports that
+    # have been saved within Infusionsoft. Saved searches/reports are tied to the User that
+    # created them. This service also allows you to utilize the quick search function found in
     # the upper right hand corner of your Infusionsoft application.
 
-    # @note In order to retrieve the id number for saved searches you will need to utilize 
-    # the data_query method and query the table called SavedFilter based on the user_id 
-    # you are looking for the saved search Id for. Also note that UserId field on the 
-    # SavedFilter table can contain multiple userId’s separated by a comma, so if you are 
-    # querying for a report created by userId 6, I recommend appending the wildcard to the 
+    # @note In order to retrieve the id number for saved searches you will need to utilize
+    # the data_query method and query the table called SavedFilter based on the user_id
+    # you are looking for the saved search Id for. Also note that UserId field on the
+    # SavedFilter table can contain multiple userId’s separated by a comma, so if you are
+    # querying for a report created by userId 6, I recommend appending the wildcard to the
     # end of the userId. Something like $query = array( ‘UserId’ => ’6%’ );
     module Search
       # Gets all possible fields/columns available for return on a saved search/report.
@@ -18,7 +18,7 @@ module Infusionsoft
       # @param [Integer] user_id the user id who the saved search is assigned to
       # @return [Hash]
       def search_get_all_report_columns(saved_search_id, user_id)
-        response = get('SearchService.getAllReportColumns', saved_search_id, user_id)
+        response = xmlrpc('SearchService.getAllReportColumns', saved_search_id, user_id)
       end
 
       # Runs a saved search/report and returns all possible fields.
@@ -28,19 +28,19 @@ module Infusionsoft
       # @param [Integer] page_number
       # @return [Hash]
       def search_get_saved_search_results(saved_search_id, user_id, page_number)
-        response = get('SearchService.getSavedSearchResultsAllFields', saved_search_id,
+        response = xmlrpc('SearchService.getSavedSearchResultsAllFields', saved_search_id,
                        user_id, page_number)
       end
 
       # This is used to find what possible quick searches the given user has access to.
       #
       # @param [Integer] user_id
-      # @return [Array] 
+      # @return [Array]
       def search_get_available_quick_searches(user_id)
-        response = get('SearchService.getAvailableQuickSearches', user_id)
+        response = xmlrpc('SearchService.getAvailableQuickSearches', user_id)
       end
 
-      # This allows you to run a quick search via the API. The quick search is the 
+      # This allows you to run a quick search via the API. The quick search is the
       # search bar in the upper right hand corner of the Infusionsoft application
       #
       # @param [String] search_type the type of search (Person, Order, Opportunity, Company, Task,
@@ -51,7 +51,7 @@ module Infusionsoft
       # @param [Integer] limit max is 1000
       # @return [Array<Hash>]
       def search_quick_search(search_type, user_id, search_data, page, limit)
-        response = get('SearchService.quickSearch', search_type, user_id, search_data, page, limit)
+        response = xmlrpc('SearchService.quickSearch', search_type, user_id, search_data, page, limit)
       end
 
       # Retrieves the quick search type that the given users has set as their default.
@@ -59,7 +59,7 @@ module Infusionsoft
       # @param [Integer] user_id
       # @return [String] the quick search type that the given user selected as their default
       def search_get_default_search_type(user_id)
-        response = get('SearchService.getDefaultQuickSearch', user_id)
+        response = xmlrpc('SearchService.getDefaultQuickSearch', user_id)
       end
     end
   end

data/lib/infusionsoft/client/ticket.rb

@@ -2,15 +2,15 @@ module Infusionsoft
   class Client
     module Ticket
       # add move notes to existing tickets
-      def ticket_add_move_notes(ticket_list, move_notes, 
+      def ticket_add_move_notes(ticket_list, move_notes,
                                 move_to_stage_id, notify_ids)
-        response = get('ServiceCallService.addMoveNotes', ticket_list, 
+        response = xmlrpc('ServiceCallService.addMoveNotes', ticket_list,
                        move_notes, move_to_stage_id, notify_ids)
       end
 
       # add move notes to existing tickets
       def ticket_move_stage(ticket_id, ticket_stage, move_notes, notify_ids)
-        response = get('ServiceCallService.moveTicketStage', 
+        response = xmlrpc('ServiceCallService.moveTicketStage',
                        ticket_id, ticket_stage, move_notes, notify_ids)
       end
     end

data/lib/infusionsoft/request.rb

@@ -1,34 +1,58 @@
+require 'rest-client'
+
 module Infusionsoft
   # Incase Infusionsoft ever creates a restful API :)
   module Request
+    def xmlrpc(service_call, *args)
+      connection(service_call, *args)
+    end
+
     # Perform an GET request
-    def get(service_call, *args)
-      request(:get, service_call, *args)
+    def get(path, token, query: {})
+      request(:get, path, token, query: query )
     end
 
-    def post(path, params={}, options={})
-      request(:post, path, params, options)
+    def post(path, token, query: {}, payload: {})
+      request(:post, path, token, query, payload)
     end
 
     # Perform an HTTP PUT request
-    def put(path, params={}, options={})
-      request(:put, path, params, options)
+    def put(path, token, query: {}, payload: {})
+      request(:put, path, token, query, payload)
     end
 
-    # Perform an HTTP DELETE request
-    def delete(path, params={}, options={})
-      request(:delete, path, params, options)
+    # Perform an HTTP PATCH request
+    def patch(path, token, query: {}, payload: {})
+      request(:patch, path, token, query, payload)
     end
 
+    # Perform an HTTP DELETE request
+    def delete(path, token, query: {})
+      request(:delete, path, token, query)
+    end
 
     private
 
     # Perform request
-    def request(method, service_call, *args)
-      case method.to_sym
-      when :get
-        response = connection(service_call, *args)
-      end
+    def request(method, path, token, query={}, payload={})
+      path = "/#{path}" unless path.start_with?('/')
+      header = {
+        authorization: "Bearer #{token.access_token}",
+        content_type: :json,
+        accept: :json,
+        params: query
+      }
+      opts = {
+        method: method,
+        url: "https://api.infusionsoft.com/crm/rest/v1" + path,
+        headers: header
+      }
+      opts.merge!( { payload: payload.to_json }) unless payload.empty?
+      resp = RestClient::Request.execute(opts)
+    rescue RestClient::ExceptionWithResponse => err
+      # log error?
+    else
+      return JSON.parse(resp.body) if resp.body # Some calls respond w nothing
     end
   end
 end

data/lib/infusionsoft/rest/token.rb

@@ -0,0 +1,77 @@
+require 'rest-client'
+require 'uri'
+require 'json'
+
+module Infusionsoft
+  module Rest
+
+    class Token
+      attr_accessor :access_token, :refresh_token, :expiration
+
+      def initialize(token_params)
+        @access_token = token_params[:access_token] || token_params["access_token"]
+        @refresh_token = token_params[:refresh_token] || token_params["refresh_token"]
+        @expiration = token_params[:expiration] if token_params[:expiration]
+
+        if token_params[:expires_in] || token_params["expires_in"]
+          @expiration = Time.now + (token_params[:expires_in] || token_params["expires_in"])
+        end
+      end
+
+      def valid?
+        Time.now < expiration
+      end
+
+      class << self
+        def auth_url(client_id, redirect_uri)
+          params = {
+            client_id: client_id,
+            redirect_uri: redirect_uri,
+            scope: 'full',
+            response_type: 'code'
+          }
+
+          uri = URI::HTTPS.build({host: "signin.infusionsoft.com", path: "/app/oauth/authorize", query: URI.encode_www_form(params)})
+          uri.to_s
+        end
+
+        def refresh(client_id, client_secret, refresh_token)
+          params = {
+            grant_type: 'refresh_token',
+            refresh_token: refresh_token,
+          }
+
+          header = { "Authorization": "Basic " + Base64.urlsafe_encode64("#{client_id}:#{client_secret}")}
+
+          response = RestClient.post("https://api.infusionsoft.com/token", params, header)
+
+        rescue RestClient::ExceptionWithResponse => e
+          #TODO what to do here?
+          false
+        else
+          token_params = JSON.parse(response.body)
+          self.new(token_params)
+        end
+
+        def get_token(client_id, client_secret, redirect_uri, code)
+          params = {
+            client_id: client_id,
+            client_secret: client_secret,
+            redirect_uri: redirect_uri,
+            code: code,
+            grant_type: 'authorization_code',
+          }
+
+          response = RestClient.post("https://api.infusionsoft.com/token", params)
+        rescue RestClient::ExceptionWithResponse => e
+          # TODO: what to do here
+          false
+        else
+          token_params = JSON.parse(response.body)
+          self.new(token_params)
+        end
+      end
+    end
+
+  end
+end

data/lib/infusionsoft/version.rb

@@ -1,4 +1,4 @@
 module Infusionsoft
   # The version of the gem
-  VERSION = '1.3.0a'.freeze unless defined?(::Infusionsoft::VERSION)
+  VERSION = '1.3.5'.freeze unless defined?(::Infusionsoft::VERSION)
 end

data/test/client/contact_test.rb

@@ -24,7 +24,6 @@ class ContactTest < Test::Unit::TestCase
       existing_contact = Infusionsoft.contact_load(3606, [:Id, :FirstName, :LastName, :Email, :Company])
       result = Infusionsoft.contact_add_with_dup_check(data_hash, 'EmailAndName')
       assert_equal result, existing_contact['Id']
-      assert_equal Infusionsoft.contact_load(existing_contact['Id'], [:Company])['Company'], data_hash[:Company]
     end
   end
 

data/test/test_helper.rb

@@ -2,10 +2,10 @@ require 'coveralls'
 Coveralls.wear!
 
 require 'simplecov'
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
     SimpleCov::Formatter::HTMLFormatter,
     Coveralls::SimpleCov::Formatter
-]
+])
 SimpleCov.start do
   add_filter '/vendor/'
   add_filter '/.bundle/'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infusionsoft
 version: !ruby/object:Gem::Version
-  version: 1.3.0a
+  version: 1.3.5
 platform: ruby
 authors:
 - Nathan Leavitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: xmlrpc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby wrapper written for the Infusionsoft API
 email:
 - nateleavitt@gmail.com
@@ -58,6 +86,7 @@ files:
 - lib/infusionsoft/exception_handler.rb
 - lib/infusionsoft/exceptions.rb
 - lib/infusionsoft/request.rb
+- lib/infusionsoft/rest/token.rb
 - lib/infusionsoft/version.rb
 - test/client/contact_test.rb
 - test/client/data_test.rb
@@ -113,11 +142,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: 1.3.6
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for the Infusionsoft API