zuora_api 1.7.40 → 1.7.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddea3e02b62e1bd8462b6de0a33bb2844d8b40ce60982de16e4eefb0ef89a8f6
-  data.tar.gz: b12a298384dada824c3dd03f4fb9d8983945495709ec8695adaea37f30772492
+  metadata.gz: 214e86bb52eddc6ab01627e7ea987c4c8371d6b0fb18ee67b248ee27fa493883
+  data.tar.gz: 8653b4b8dea2b4d891aad5d9702fae8331ed086b7d33c819f72393bdb9b025f3
 SHA512:
-  metadata.gz: 8100c26e8011fe2b56ca304b432a5b1c9bf88539b64bd6d10362b5610eae781a921284bd7408d955ab8156844cfede4da58895bf7693890ab7c2c14d7dadf14f
-  data.tar.gz: 77f8d82449f3bb4ce0aa1569cf082cc431f7fc03191eea0c0dab00bb493bb1fe4dac3d92d76e5a18ac07253327090afa7d7d106d08bb766962b9217a6fa01ba0
+  metadata.gz: ea2f8114229f2eb9cdbc3fc483e372aa4b9cd7fee055411e212eb47d3915583d0a0c94c50c5a4dc4ec70476fcc6fc90855bd83507146c26a1ad58aba9cf4904a
+  data.tar.gz: 743a34ae3864c9c907ee23d7689fe12218b9ef621a235851bd7633e2bfce58e50e2bf1ffb4fceb301f4756e0257a7115c0df966c4420cec4bf9fbecc5d13daa4

data/lib/zuora_api/login.rb

@@ -508,24 +508,29 @@ module ZuoraAPI
         return output_xml, input_xml, response
       end
     rescue *CONNECTION_EXCEPTIONS => ex
-      raise ex if tries.zero?
+      if tries.zero?
+        Rails.logger.info("SOAP Call - #{ex.class} Timed out will retry after 5 seconds")
+        raise ex 
+      end
 
       tries -= 1
-      Rails.logger.info("SOAP Call - #{ex.class} Timed out will retry after 5 seconds")
       sleep(self.timeout_sleep)
       retry
     rescue *CONNECTION_READ_EXCEPTIONS => ex
-      raise ex if tries.zero?
+      if tries.zero?
+        Rails.logger.info("SOAP Call - #{ex.class} Timed out will retry after 5 seconds") 
+        raise ex
+      end
 
       tries -= 1
 
       if ex.is_a?(Errno::ECONNRESET) && ex.message.include?('SSL_connect')
         retry
       elsif timeout_retry
-        Rails.logger.info("SOAP Call - #{ex.class} Timed out will retry after 5 seconds")
         sleep(self.timeout_sleep)
         retry
       else
+        Rails.logger.info("SOAP Call - #{ex.class} Timed out will retry after 5 seconds") 
         raise ex
       end
     rescue => ex
@@ -641,15 +646,19 @@ module ZuoraAPI
           if body["faultcode"].present?
             case body["faultcode"]
             when "fns:MALFORMED_QUERY"
-              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{body["faultcode"]}::#{body["faultstring"]}", response)
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body["faultstring"], response)
             when "fns:REQUEST_EXCEEDED_LIMIT"
-              raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{body["faultcode"]}::#{body["faultstring"]}", response)
+              raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new(body["faultstring"], response)
             when "fns:LOCK_COMPETITION"
-              raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{body["faultcode"]}::#{body["faultstring"]}", response)
+              raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new(body["faultstring"], response)
             when "INVALID_SESSION"
-              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{body["faultcode"]}::#{body["faultstring"]}", response)
+              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(body["faultstring"], response)
+            when /fns:INVALID_TYPE/
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body["faultstring"], response)
+            when /.*soapenv:Server.*/
+              raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(body["faultstring"], response)
             else
-              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{body["faultcode"]}::#{body["faultstring"]}", response)
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Z:#{body["faultcode"]}::#{body["faultstring"]}", response)
             end
           end
 
@@ -753,7 +762,7 @@ module ZuoraAPI
           raise ZuoraAPI::Exceptions::ZuoraAPIError.new(message, response, errors, success)
         end
       when /.*TEMPORARY_ERROR/
-        raise ZuoraAPI::Exceptions::ZuoraAPITemporaryError.new("#{error}::#{message}", response, errors, success)
+        raise ZuoraAPI::Exceptions::ZuoraAPITemporaryError.new(message, response, errors, success)
       when /.*INVALID_VALUE/
         if message.include?("data integrity violation")
           raise ZuoraAPI::Exceptions::ZuoraDataIntegrity.new("Data Integrity Violation", response, errors), success
@@ -766,23 +775,23 @@ module ZuoraAPI
         else
           raise ZuoraAPI::Exceptions::ZuoraAPIError.new(message, response, errors, success)
         end
-      when /INVALID_ID/, /MAX_RECORDS_EXCEEDED/, /INVALID_FIELD/, /MALFORMED_QUERY/, /NO_PERMISSION/, /PDF_QUERY_ERROR/, /MISSING_REQUIRED_VALUE/, /INVALID_TYPE/, /TRANSACTION_FAILED/, /API_DISABLED/
+      when /INVALID_ID/, /MAX_RECORDS_EXCEEDED/, /INVALID_FIELD/, /MALFORMED_QUERY/, /NO_PERMISSION/, /PDF_QUERY_ERROR/, /MISSING_REQUIRED_VALUE/, /INVALID_TYPE/, /TRANSACTION_FAILED/, /API_DISABLED/, /CANNOT_DELETE/, /ACCOUNTING_PERIOD_CLOSED/
         raise ZuoraAPI::Exceptions::ZuoraAPIError.new(message, response, errors, success)
       when /.*soapenv:Server.*/
         if /Invalid value.*for type|Id is invalid/.match(message).present?
           raise ZuoraAPI::Exceptions::ZuoraAPIError.new(message, response, errors, success)
         end
-        raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new("#{error}::#{message}", response, errors, success)
+        raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(message, response, errors, success)
       end
 
       if response.code == 500
         if message.present?
-          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", response, errors, success)
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Z:#{error}::#{message}", response, errors, success)
         else
           raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(response.body, response, errors, success)
         end
       else
-        raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", response, errors, success) if error.present?
+        raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Z:#{error}::#{message}", response, errors, success) if error.present?
       end
     end
 
@@ -864,10 +873,12 @@ module ZuoraAPI
         des_hash[:related_objects] = output_xml.xpath(".//related-objects").xpath(".//object").map{ |x| [x.xpath(".//name").text.to_sym, [ [:url, x.attributes["href"].value], [:label, x.xpath(".//name").text ] ].to_h] }.to_h
       end
     rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
-      raise ex if tries.zero?
+      if tries.zero?
+        Rails.logger.info("Describe - #{ex.class} Timed out will retry after 5 seconds")
+        raise ex 
+      end
 
       tries -= 1
-      Rails.logger.info("Describe - #{ex.class} Timed out will retry after 5 seconds")
       sleep(self.timeout_sleep)
       retry
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
@@ -969,24 +980,29 @@ module ZuoraAPI
     rescue ZuoraAPI::Exceptions::BadEntityError => ex
       raise ex
     rescue *CONNECTION_EXCEPTIONS => ex
-      raise ex if tries.zero?
+      if tries.zero?
+        Rails.logger.info("Rest Call - #{ex.class} Timed out will retry after 5 seconds")
+        raise ex 
+      end
 
       tries -= 1
-      Rails.logger.info("Rest Call - #{ex.class} Timed out will retry after 5 seconds")
       sleep(self.timeout_sleep)
       retry
     rescue *CONNECTION_READ_EXCEPTIONS => ex
-      raise ex if tries.zero?
+      if tries.zero?
+        Rails.logger.info("Rest Call - #{ex.class} Timed out will retry after 5 seconds")
+        raise ex 
+      end
 
       tries -= 1
 
       if ex.is_a?(Errno::ECONNRESET) && ex.message.include?('SSL_connect')
         retry
       elsif timeout_retry
-        Rails.logger.info("Rest Call - #{ex.class} Timed out will retry after 5 seconds")
         sleep(self.timeout_sleep)
         retry
       else
+        Rails.logger.info("Rest Call - #{ex.class} Timed out will retry after 5 seconds")
         raise ex
       end
     rescue => ex

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.7.40"
+  VERSION = "1.7.41"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.7.40
+  version: 1.7.41
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2020-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler