infusionsoft 1.1.1 → 1.1.2

data/lib/infusionsoft/client/invoice.rb

@@ -102,7 +102,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 = get('InvoiceService.addManualPayment', invoice_id, amount, date, type,
                        description, bypass_commissions)
       end
 

data/lib/infusionsoft/connection.rb

@@ -14,19 +14,21 @@ module Infusionsoft
       begin
         result = server.call("#{service_call}", api_key, *args)
         if result.nil?; result = [] end
-      rescue Timeout::Error
-        retry if ok_to_retry
-      rescue
-        retry if ok_to_retry
+      rescue Timeout::Error => timeout
+        # Retry up to 5 times on a Timeout before raising it
+        ok_to_retry(timeout) ? retry : raise
+      rescue => e
+        # Wrap the underlying error in an InfusionAPIError
+        raise InfusionAPIError.new(e.to_s, e)
       end
 
       return result
     end
 
-    def ok_to_retry
+    def ok_to_retry(e)
       @retry_count += 1
       if @retry_count <= 5
-        Rails.logger.info "*** INFUSION API ERROR: retrying #{@retry_count} ***" if Rails
+        Rails.logger.info "*** INFUSION API ERROR: [#{e}] retrying #{@retry_count} ***" if Rails
         true
       else
         false
@@ -36,4 +38,12 @@ module Infusionsoft
   end
 end
 
-class InfusionAPIError < StandardError; end
+# Extend StandardError to keep track of Error being wrapped
+# Pattern from Exceptional Ruby by Avdi Grimm (http://avdi.org/talks/exceptional-ruby-2011-02-04/)
+class InfusionAPIError < StandardError
+  attr_reader :original
+    def initialize(msg, original=nil);
+      super(msg);
+      @original = original;
+    end
+end

data/lib/infusionsoft/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infusionsoft
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-17 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby wrapper written for the Infusionsoft API
 email: