zuora_api 1.7.15 → 1.7.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 368bd70e47e5faf2fc48cab8947d213a8c114c1543febab533f9dfe59b51af5d
-  data.tar.gz: edb7da29daa5dbefc730c2fde19d1254c54b98153b9c45810aa3e82ce24968e1
+  metadata.gz: e0d12f28a8dd0d3dc042691ed4f6d264ac51ce9671b219ab77563f48848613df
+  data.tar.gz: c3d3529f936d9af377acb360d0f0825619030a6f31131286ef10e1b34e568b3c
 SHA512:
-  metadata.gz: 2d29ad44e59a1a8afe46b2f077cf04124996b6c2c94f2d443c7c1c19ec7803197548c94cdf12229d240fa73c302b1d5421e30aad1598880093e9d49bb12dcb98
-  data.tar.gz: b83aa492903c29907d0322aa831d7398c983f8873f24aba34d9e74db43391d428cbf7bb650c9fd29cbfac28aa686cbd99ef3a7ad763b13b507b7ecbf440a36c6
+  metadata.gz: 8b376ab16beafc2816d107164afd6b62e80a31dcb084ee20e28ba2fc9cf6ee881158ed6b685770d7d86857a75d3957ff3844aecf17936a50a17ee7f05225a91f
+  data.tar.gz: 89366c69cd6f137a812b76a92501549324997da097b4bf2b3cbea7f478a9f0951a4641e22728f6594e7e4d1ce944513ddea606b1ebc9fb273f1c8ff11c2c11a2

data/lib/insights_api/login.rb

@@ -190,12 +190,11 @@ module InsightsAPI
       end
 
       rescue => ex
-        if !(tries -= 1).zero?
-         sleep 3
-         retry
-        else
-         raise ex
-        end
+        raise ex if tries.zero?
+
+        tries -= 1
+        sleep 3
+        retry
       else
         return temp_file
     end

data/lib/zuora_api/exceptions.rb

@@ -1,6 +1,7 @@
 module ZuoraAPI
   module Exceptions
     class Error < StandardError; end
+    class FileDownloadError < StandardError; end
     class AuthorizationNotPerformed < Error; end
     class ZuoraAPISessionError < Error
       attr_reader :code, :response

data/lib/zuora_api/login.rb

@@ -468,7 +468,8 @@ module ZuoraAPI
 
       raise_errors(type: :SOAP, body: output_xml, response: response)
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
-      if !(tries -= 1).zero? && z_session
+      if !tries.zero? && z_session
+        tries -= 1
         Rails.logger.debug("SOAP Call - Session Invalid")
         self.new_session(auth_type: :basic, zuora_track_id: zuora_track_id)
         retry
@@ -486,17 +487,16 @@ module ZuoraAPI
         return output_xml, input_xml, response
       end
     rescue *CONNECTION_EXCEPTIONS => ex
-      if !(tries -= 1).zero?
-        Rails.logger.info("SOAP Call - #{ex.class} Timed out will retry after 5 seconds")
-        sleep(self.timeout_sleep)
-        retry
-      else
-        raise ex
-      end
+      raise ex if tries.zero?
+
+      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
-      if (tries -= 1).zero?
-        raise ex
-      end
+      raise ex if tries.zero?
+
+      tries -= 1
 
       if ex.is_a?(Errno::ECONNRESET) && ex.message.include?('SSL_connect')
         retry
@@ -785,15 +785,15 @@ 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
-      if !(tries -= 1).zero?
-        Rails.logger.info("Describe - #{ex.class} Timed out will retry after 5 seconds")
-        sleep(self.timeout_sleep)
-        retry
-      else
-        raise ex
-      end
+      raise ex if tries.zero?
+
+      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
-      if !(tries -= 1).zero? && self.status == 'Active'
+      if !tries.zero? && self.status == 'Active'
+        tries -= 1
         Rails.logger.debug("Describe session expired. Starting new session.")
         self.new_session
         retry
@@ -859,7 +859,8 @@ module ZuoraAPI
         raise ex
       end
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
-      if !(tries -= 1).zero? && z_session
+      if !tries.zero? && z_session
+        tries -= 1
         Rails.logger.debug("Rest Call - Session Invalid #{session_type}")
         self.new_session(auth_type: session_type)
         retry
@@ -879,17 +880,16 @@ module ZuoraAPI
     rescue ZuoraAPI::Exceptions::BadEntityError => ex
       raise ex
     rescue *CONNECTION_EXCEPTIONS => ex
-      if !(tries -= 1).zero?
-        Rails.logger.info("Rest Call - #{ex.class} Timed out will retry after 5 seconds")
-        sleep(self.timeout_sleep)
-        retry
-      else
-        raise ex
-      end
+      raise ex if tries.zero?
+
+      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
-      if (tries -= 1).zero?
-        raise ex
-      end
+      raise ex if tries.zero?
+
+      tries -= 1
 
       if ex.is_a?(Errno::ECONNRESET) && ex.message.include?('SSL_connect')
         retry
@@ -952,7 +952,7 @@ module ZuoraAPI
       return products, catalog_map
     end
 
-    def get_file(url: nil, headers: {}, z_session: true, tempfile: true, output_file_name: nil, add_timestamp: true, file_path: defined?(Rails.root.join('tmp')) ? Rails.root.join('tmp') : Pathname.new(Dir.pwd), timeout_retries: 3, timeout: 120, session_type: :basic, **execute_params)
+    def get_file(url: nil, headers: {}, z_session: true, tempfile: true, output_file_name: nil, zuora_track_id: nil, add_timestamp: true, file_path: defined?(Rails.root.join('tmp')) ? Rails.root.join('tmp') : Pathname.new(Dir.pwd), timeout_retries: 3, timeout: 120, session_type: :basic, **execute_params)
       raise "file_path must be of class Pathname" if file_path.class != Pathname
 
       #Make sure directory exists
@@ -969,6 +969,8 @@ module ZuoraAPI
         headers = headers.merge({"Zuora-Entity-Ids" => self.entity_id}) if !self.entity_id.blank?
       end
 
+      headers['Zuora-Track-Id'] = zuora_track_id if zuora_track_id.present?
+
       response_save = nil
       retry_count ||= timeout_retries
       http.request_get(uri.request_uri, headers) do |response|
@@ -1064,7 +1066,7 @@ module ZuoraAPI
             raise
           end
         else
-          raise StandardError.new("File Download Failed #{response.class}")
+          raise ZuoraAPI::Exceptions::FileDownloadError.new("File Download Failed #{response.class}")
         end
       end
           

data/lib/zuora_api/logins/basic.rb

@@ -98,7 +98,8 @@ module ZuoraAPI
       end
       return self.status
     rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
-      if !(tries -= 1).zero?
+      if !tries.zero?
+        tries -= 1
         Rails.logger.info {"#{ex.class} Timed out will retry after 5 seconds"}
         sleep(self.timeout_sleep)
         retry

data/lib/zuora_api/logins/oauth.rb

@@ -36,7 +36,8 @@ module ZuoraAPI
       output_json, response = self.rest_call(:url => self.rest_endpoint("connections"), :session_type => :bearer, :headers => headers)
       self.current_session = response.headers.to_h['set-cookie'][0].split(';')[0].split('=',2)[1].gsub('%3D', '=')
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
-      if !(tries -= 1).zero?
+      if !tries.zero?
+        tries -= 1
         Rails.logger.debug {"Session Invalid"}
         self.new_session(auth_type: :bearer)
         retry
@@ -54,7 +55,8 @@ module ZuoraAPI
         return [output_json, response]
       end
     rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
-      if !(tries -= 1).zero?
+      if !tries.zero?
+        tries -= 1
         Rails.logger.info {"#{ex.class} Timed out will retry after 5 seconds"}
         sleep(self.timeout_sleep)
         retry
@@ -88,12 +90,11 @@ module ZuoraAPI
       return self.status
 
     rescue ZuoraAPI::Exceptions::ZuoraUnexpectedError => ex
-      if !(tries -= 1).zero?
-        sleep(self.timeout_sleep)
-        retry
-      else
-        raise ex
-      end
+      raise ex if tries.zero?
+
+      tries -= 1
+      sleep(self.timeout_sleep)
+      retry
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
       self.bearer_token = nil
       self.oauth_session_expires_at = nil
@@ -111,7 +112,8 @@ module ZuoraAPI
     rescue ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition  => ex
       raise ex
     rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
-      if !(tries -= 1).zero?
+      if !tries.zero?
+        tries -= 1
         Rails.logger.info {"#{ex.class} Timed out will retry after 5 seconds"}
         sleep(self.timeout_sleep)
         retry

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.7.15"
+  VERSION = "1.7.16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.7.15
+  version: 1.7.16
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group