zuora_api 1.7.00 → 1.7.01

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecec87283f238f546be12e3fadb16e9fabbee7aec1129d47401876359271f868
-  data.tar.gz: 98d980959dcf672fad54bdc87fa89061f6aee4627eebb4ef89da8573c204419b
+  metadata.gz: 98ada8f975604d10b0cb60b4b58eacef95a917f2509c3ee578b44cb9ae00dac2
+  data.tar.gz: f114390047aeec864c19a1b04e9e8ab93cdf2a4c8c46c84fc471593d893651fe
 SHA512:
-  metadata.gz: 0f18782b6e2bc5d2433c4f0b632fe931205392db8b334edf524accec0e17821394a064f82cb45983d0a0ae7cbbc106b8ae8911b90c35651445e139bf94d261d7
-  data.tar.gz: 56555f10ce5434a30a54d4cad556170987a033f1cbfef34dc0b246fd935878ae4e7bd989e4c7ba7f3f95a73d291c25983d39260b41a8c91a1dcb9a019e879eab
+  metadata.gz: 85c08a97f372728e3d40ab433bf18d30ad58dddd1297e9cb241b8b031ce3baa1cd60f21405c4f8909fc350177fb8294897aee0baba06194d54365e0fa987d0ed
+  data.tar.gz: 50f70103f0984d99a1e2ca3df4889c58c3c2c5387db2ffbc37b56db3e46fb7cb02ccfa25071a4820184ff62b1909b88106eda2d665e9ec7ddd2f9b6bc991eea0

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.7.01] - 2018-8-06
+### Changed
+- Changed library used to determine host
+- Added retry for 504 timouts in file download
+
 ## [1.7.00] - 2018-8-05
 ### Changed
 - Raise proper exception when oauth client is from deactivated user.

data/lib/zuora_api/login.rb

@@ -352,8 +352,7 @@ module ZuoraAPI
     end
 
     def rest_domain
-      require 'addressable/uri'
-      return ::Addressable::URI.parse(self.rest_endpoint).host      
+      return URI(self.rest_endpoint).host      
     end
 
     def fileURL(url="")
@@ -890,137 +889,128 @@ module ZuoraAPI
       return products, catalog_map
     end
 
-    def get_file(url: nil, headers: {}, count: 3, 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: 2, timeout: 120, session_type: :basic, **execute_params)
+    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)
       raise "file_path must be of class Pathname" if file_path.class != Pathname
 
       #Make sure directory exists
       require 'fileutils'
       FileUtils.mkdir_p(file_path) unless File.exists?(file_path)
 
-      begin
-        status_code = nil
-        uri = URI.parse(url)
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.read_timeout = timeout #Seconds
-        http.use_ssl = true  if !uri.scheme.nil? && uri.scheme.downcase == 'https'
-        if z_session
-          headers = headers.merge({"Authorization" => self.get_session(prefix: true)})
-          headers = headers.merge({"Zuora-Entity-Ids" => self.entity_id}) if !self.entity_id.blank?
-        end
+      status_code = nil
+      uri = URI.parse(url)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.read_timeout = timeout #Seconds
+      http.use_ssl = true  if !uri.scheme.nil? && uri.scheme.downcase == 'https'
+      if z_session
+        headers = headers.merge({"Authorization" => self.get_session(prefix: true)})
+        headers = headers.merge({"Zuora-Entity-Ids" => self.entity_id}) if !self.entity_id.blank?
+      end
 
-        response_save = nil
-        begin
-          http.request_get(uri.request_uri, headers) do |response|
-            response_save = response
-            status_code = response.code if response
-
-            case response
-            when Net::HTTPNotFound
-              raise
-
-            when Net::HTTPUnauthorized
-              if count <= 0
-                if z_session
-                  raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error)
-                else
-                  raise
-                end
-              end
-              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)
+      response_save = nil
+      retry_count ||= timeout_retries
+      http.request_get(uri.request_uri, headers) do |response|
+        response_save = response
+        status_code = response.code if response
+        case response
+        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
 
-            when Net::HTTPClientError
-              raise
+          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
 
-            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 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)
 
-              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
+          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
 
-              #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
+          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-Length"].present?
-                export_size = response.header["Content-Length"].to_i
-              elsif response.header["ContentLength"].present?
-                export_size = response.header["ContentLength"].to_i
-              end
+          Rails.logger.info("File: #{filename}#{file_ending}  #{encoding}  #{type} #{export_size}")
+
+          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
 
-              Rails.logger.info("File: #{filename}#{file_ending}  #{encoding}  #{type} #{export_size}")
+          response.read_body do |chunk|
+            file_handle << chunk
 
-              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
-
-                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
+            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
+          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
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Downloaded file is not a file: #{file_handle.class}") if !["Tempfile", "File"].include?(file_handle.class.to_s)
+          return file_handle
+        when Net::HTTPUnauthorized
+          if z_session
+            if !(retry_count -= 1).zero?
+              self.new_session
+              raise response.class
+            else
+              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error)
             end
-          end
-        rescue *(CONNECTION_EXCEPTIONS).concat(CONNECTION_READ_EXCEPTIONS).concat([Net::HTTPBadResponse]) => e
-          sleep(5)
-          if (timeout_retries -= 1) >= 0
-            Rails.logger.warn("Download Failed: #{e.class} : #{e.message}")
-            retry
           else
             raise
           end
+        else
+          raise StandardError.new("File Download Failed #{response.class}")
         end
-      rescue => ex
-        Rails.logger.fatal(ex)
+      end
+          
+    rescue => ex 
+      sleep(5)
+      if (retry_count -= 1) >= 0
+        retry
+      else
+        Rails.logger.error("File Download Failed")
         raise
       end
     end

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.7.00"
+  VERSION = "1.7.01"
 end

metadata

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