infusionsoft 1.0.6 → 1.0.7

data/lib/infusionsoft/connection.rb

@@ -4,45 +4,32 @@ module Infusionsoft
   module Connection
     private
 
+    @retry_count = 0
+
     def connection(service_call, *args)
       server = XMLRPC::Client.new3({
-        'host' => api_url, 
-        'path' => "/api/xmlrpc", 
-        'port' => 443, 
+        'host' => api_url,
+        'path' => "/api/xmlrpc",
+        'port' => 443,
         'use_ssl' => true
       })
-      begin 
-      result = server.call("#{service_call}", api_key, *args)
+      begin
+        result = server.call("#{service_call}", api_key, *args)
+        if result.nil?; result = [] end
+      rescue Timeout::Error
+        @retry_count += 1
+        puts "*** INFUSION API TIMEOUT: retrying #{@retry_count} ***"
+        retry if ok_to_retry
       rescue XMLRPC::FaultException => e
-          puts "*** INFUSION API ERROR: #{e.faultCode} - #{e.faultString} ***"
+        puts "*** INFUSION API ERROR: #{e.faultCode} - #{e.faultString} ***"
       end
+
       return result
     end
 
-    #end
-        #if result.nil?; raise RetryException.new(true, @retry_count), "transient read error" end
-      #rescue RetryException => detail
-        ## Catch for transietn Infusionsoft connection errors
-        #puts "*** INFUSION API ERROR: Transient read error *** retrying: #{@retry_count}"
-        #self.retry_count += 1
-        #retry if detail.ok_to_retry
-      #rescue XMLRPC::FaultException => e
-        #puts "*** INFUSION API ERROR: #{e.faultCode} - #{e.faultString} ***"
-      #rescue Timeout::Error
-        #detail = RetryException.new(true, @retry_count)
-        #puts "*** INFUSION API ERROR: Timeout *** retrying #{@retry_count}"
-        #@retry_count += 1
-        #retry if detail.ok_to_retry
-      #rescue
-        #detail = RetryException.new(true, @retry_count)
-        ## This is most likely a catch for the infamous Content-Type bug from Infusionsoft.
-        ## Their response has an issue where it isn't sending back a Content-Type in the header,
-        ## which throws an nill error in the xml-rpc client in Ruby.
-        ## see xmlrcp/client.rb:552 and xmlrpc/utils.rb:159 in Ruby Standard Library.
-        #puts "*** INFUSION API ERROR: Content Type is nil back from Infusionsoft *** retrying: #{@retry_count}"
-        #@retry_count += 1
-        #retry if detail.ok_to_retry
-      #end
+    def ok_to_retry
+      @retry_count <= 5 ? true : false
+    end
 
   end
 end

data/lib/infusionsoft/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: infusionsoft
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Nathan Leavitt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-01 00:00:00 -07:00
+date: 2011-11-22 00:00:00 -07:00
 default_executable: 
 dependencies: []