zuora_api 1.6.252 → 1.6.253

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f36543b739da8affca96e7879ceffb1c9bb9db3
-  data.tar.gz: 21753e9b98a2e7d8f5d1b84cdfc84868f2663f31
+  metadata.gz: 75aaa525b01f8cb9dc61575b5ffbce6c45aeff5a
+  data.tar.gz: df7b4849281c83e10590c51088e0c3813ce305d2
 SHA512:
-  metadata.gz: fc8c96cb1d707a94901bfee70abef611799a9d19b3cfd9e42cee8380ab9d0ef71f8552860429feb38157a7a93f82ac51305814e4c7e0927ba68e45e3273ec0bf
-  data.tar.gz: 02c478ab7b96a0274e304669bdc0ae7f22a5a9929979051da06bd4cc97e05a71cfb8c1147da1afdbed5ea011786051c2cc55f14eddeb9b02e3de634856085032
+  metadata.gz: 91b63981c496283de20f9387aa616c36f3ea035f034480874bdc14f1c9a82ce3f15a66977cef94a5f08aa9019f121049bea979938133bae23ad700db264204f0
+  data.tar.gz: 57ba1131cdbb7480a7769fe306e53641df7d6608091465e765ef3a8c7d7c528cc3db96d2bb5b46edf0498f641d2fbe0467e8938a2add8755b6cb0cef134917b0

data/lib/zuora_api/login.rb

@@ -863,110 +863,116 @@ module ZuoraAPI
         end
 
         response_save = nil
-        http.request_get(uri.request_uri, headers) do |response|
-          response_save = response
-          status_code = response.code if response
-
-          case response
-          when Net::HTTPNotFound
-            Rails.logger.fatal("404 - Not Found")
-            raise
-
-          when Net::HTTPUnauthorized
-            if count <= 0
-              if z_session
-                raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error)
-              else
-                raise
+        begin
+          http.request_get(uri.request_uri, headers) do |response|
+            response_save = response
+            status_code = response.code if response
+
+            case response
+            when Net::HTTPNotFound
+              Rails.logger.fatal("404 - Not Found")
+              raise
+
+            when Net::HTTPUnauthorized
+              if count <= 0
+                if z_session
+                  raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error)
+                else
+                  raise
+                end
               end
-            end
-            Rails.logger.fatal("Unauthorized: Retry")
-            self.new_session if z_session
-            return get_file(:url => url, :headers => headers, :count => count - 1, :z_session => z_session, :tempfile => tempfile, :file_path => file_path, :timeout_retries => timeout_retries, :timeout => timeout)
+              Rails.logger.fatal("Unauthorized: Retry")
+              self.new_session if z_session
+              return get_file(:url => url, :headers => headers, :count => count - 1, :z_session => z_session, :tempfile => tempfile, :file_path => file_path, :timeout_retries => timeout_retries, :timeout => timeout)
 
-          when *(CONNECTION_EXCEPTIONS).concat(CONNECTION_READ_EXCEPTIONS)
-            Rails.logger.fatal("#{response.class} timeout - retry")
-            return get_file(:url => url, :headers => headers, :count => count, :z_session => z_session, :tempfile => tempfile, :file_path => file_path, :timeout_retries => timeout_retries - 1, :timeout => timeout)
+            when Net::HTTPClientError
+              raise
 
-          when Net::HTTPClientError
-            raise
+            when Net::HTTPOK
+              headers = {}
+              response.each_header do |k,v|
+                headers[k] = v
+              end
+              Rails.logger.debug("Headers: #{headers.to_s}")
 
-          when Net::HTTPOK
-            headers = {}
-            response.each_header do |k,v|
-              headers[k] = v
-            end
-            Rails.logger.debug("Headers: #{headers.to_s}")
+              if output_file_name.present?
+                file_ending ||= output_file_name.end_with?(".csv.zip") ? ".csv.zip" : File.extname(output_file_name)
+                filename ||= File.basename(output_file_name, file_ending)
+              end
 
-            if output_file_name.present?
-              file_ending ||= output_file_name.end_with?(".csv.zip") ? ".csv.zip" : File.extname(output_file_name)
-              filename ||= File.basename(output_file_name, file_ending)
-            end
+              size, export_progress = [0, 0]
+              encoding, type, full_filename = [nil, nil, nil]
+              if response.header["Content-Disposition"].present?
+                case response.header["Content-Disposition"]
+                when /.*; filename\*=.*/
+                  full_filename ||= /.*; filename\*=(.*)''(.*)/.match(response.header["Content-Disposition"])[2].strip
+                  encoding = /.*; filename\*=(.*)''(.*)/.match(response.header["Content-Disposition"])[1].strip
+                when /.*; filename=/
+                  full_filename ||= /.*; filename=(.*)/.match(response.header["Content-Disposition"])[1].strip
+                else
+                  raise "Can't parse Content-Disposition header: #{response.header["Content-Disposition"]}"
+                end
+                file_ending ||= full_filename.end_with?(".csv.zip") ? ".csv.zip" : File.extname(full_filename)
+                filename ||= File.basename(full_filename, file_ending)
+              end
 
-            size, export_progress = [0, 0]
-            encoding, type, full_filename = [nil, nil, nil]
-            if response.header["Content-Disposition"].present?
-              case response.header["Content-Disposition"]
-              when /.*; filename\*=.*/
-                full_filename ||= /.*; filename\*=(.*)''(.*)/.match(response.header["Content-Disposition"])[2].strip
-                encoding = /.*; filename\*=(.*)''(.*)/.match(response.header["Content-Disposition"])[1].strip
-              when /.*; filename=/
-                full_filename ||= /.*; filename=(.*)/.match(response.header["Content-Disposition"])[1].strip
-              else
-                raise "Can't parse Content-Disposition header: #{response.header["Content-Disposition"]}"
+              #If user supplied a filename use it, else default to content header filename, else default to uri pattern
+              file_ending ||= uri.path.end_with?(".csv.zip") ? ".csv.zip" : File.extname(uri.path)
+              filename ||= File.basename(uri.path, file_ending)
+
+              if response.header["Content-Type"].present?
+                case response.header["Content-Type"]
+                when /.*;charset=.*/
+                  type = /(.*);charset=(.*)/.match(response.header["Content-Type"])[1]
+                  encoding = /(.*);charset=(.*)/.match(response.header["Content-Type"])[2]
+                else
+                  type = response.header["Content-Type"]
+                  encoding ||= 'UTF-8'
+                end
               end
-              file_ending ||= full_filename.end_with?(".csv.zip") ? ".csv.zip" : File.extname(full_filename)
-              filename ||= File.basename(full_filename, file_ending)
-            end
+              Rails.logger.info("File: #{filename}#{file_ending}  #{encoding}  #{type}")
 
-            #If user supplied a filename use it, else default to content header filename, else default to uri pattern
-            file_ending ||= uri.path.end_with?(".csv.zip") ? ".csv.zip" : File.extname(uri.path)
-            filename ||= File.basename(uri.path, file_ending)
+              if response.header["Content-Length"].present?
+                export_size = response.header["Content-Length"].to_i
+              elsif response.header["ContentLength"].present?
+                export_size = response.header["ContentLength"].to_i
+              end
 
-            if response.header["Content-Type"].present?
-              case response.header["Content-Type"]
-              when /.*;charset=.*/
-                type = /(.*);charset=(.*)/.match(response.header["Content-Type"])[1]
-                encoding = /(.*);charset=(.*)/.match(response.header["Content-Type"])[2]
+              file_prefix = add_timestamp ? "#{filename}_#{Time.now.to_i}" : filename
+              if tempfile
+                require 'tempfile'
+                file_handle = ::Tempfile.new([file_prefix, "#{file_ending}"], file_path)
               else
-                type = response.header["Content-Type"]
-                encoding ||= 'UTF-8'
+                file_handle = File.new(file_path.join("#{file_prefix}#{file_ending}"), "w+")
               end
-            end
-            Rails.logger.info("File: #{filename}#{file_ending}  #{encoding}  #{type}")
-
-            if response.header["Content-Length"].present?
-              export_size = response.header["Content-Length"].to_i
-            elsif response.header["ContentLength"].present?
-              export_size = response.header["ContentLength"].to_i
-            end
-
-            file_prefix = add_timestamp ? "#{filename}_#{Time.now.to_i}" : filename
-            if tempfile
-              require 'tempfile'
-              file_handle = ::Tempfile.new([file_prefix, "#{file_ending}"], file_path)
-            else
-              file_handle = File.new(file_path.join("#{file_prefix}#{file_ending}"), "w+")
-            end
-            file_handle.binmode
-
-            response.read_body do |chunk|
-              file_handle << chunk.force_encoding(encoding)
-
-              if defined?(export_size) && export_size != 0  && export_size.class == Integer
-                size += chunk.size
-                new_progress = (size * 100) / export_size
-                unless new_progress == export_progress
-                  Rails.logger.debug("Login: Export Downloading %s (%3d%%)" % [filename, new_progress])
+              file_handle.binmode
+
+              response.read_body do |chunk|
+                file_handle << chunk.force_encoding(encoding)
+
+                if defined?(export_size) && export_size != 0  && export_size.class == Integer
+                  size += chunk.size
+                  new_progress = (size * 100) / export_size
+                  unless new_progress == export_progress
+                    Rails.logger.debug("Login: Export Downloading %s (%3d%%)" % [filename, new_progress])
+                  end
+                  export_progress = new_progress
                 end
-                export_progress = new_progress
               end
-            end
 
-            file_handle.close
-            Rails.logger.debug("Filepath: #{file_handle.path} Size: #{File.size(file_handle.path).to_f/1000000} mb")
+              file_handle.close
+              Rails.logger.debug("Filepath: #{file_handle.path} Size: #{File.size(file_handle.path).to_f/1000000} mb")
 
-            return file_handle
+              return file_handle
+            end
+          end
+        rescue *(CONNECTION_EXCEPTIONS).concat(CONNECTION_READ_EXCEPTIONS) => e
+          sleep(5)
+          if (timeout_retries -= 1) >= 0
+            Rails.logger.warn("Download Failed: #{e.class} : #{e.message}")
+            retry
+          else
+            raise
           end
         end
       rescue Exception => e

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.6.252"
+  VERSION = "1.6.253"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.6.252
+  version: 1.6.253
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-08 00:00:00.000000000 Z
+date: 2019-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler