zuora_api 1.6.254 → 1.6.255

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6128f5dcd59c8e19f685147b06d6868a4dc8c1f1
-  data.tar.gz: 40d87abab8c18aacadbfacdff0881ecc067a01e3
+  metadata.gz: 5e6a8e9ae21ef49ef02ea0c4f68a568d5e0e8bb8
+  data.tar.gz: 29eb9ef8d16d22b41e0b446d89f86e416c03fb21
 SHA512:
-  metadata.gz: 26edd6cdeaf34cb552b9b158f86f3108cc6396ff949e8e0246dcfea79f22b5bf6f1ff1a1e2d7d1f109ef2a34e624e03268fb5b6494c693f9ede2afe54c496083
-  data.tar.gz: eb82465f57e28ea368c03ff47be3d82fd5211375b7253f06890241ff05d4638151b1e3ac817477b83f0252a66ab28ca9552230516e78b9e4c9980a615dfbc262
+  metadata.gz: 53b80cc5f612a4b59fc80280fd1e9b8a694de301aa43f481ab5af4f33647ae65188e51399d9be59c161d8d7dfb7eeecbcc6667e5f0ab195cb56c3de91c2ced15
+  data.tar.gz: b955ba0161c862c0a7b96ab5b29e282548ace81f23b8df999710d1647c5e1e66ff5898781454df41b9f7cc6905c4ad95353c0c75c10cd7f1c6d6a8d582d72809

data/CHANGELOG.md

@@ -1,18 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## [1.6.16] - 2018-12-09
+## [1.6.28] - 2018-3-12
 ### Added
-- Example
-
-### Changed
-- Example
-
-### Removed
-- Example
+- Way to avoid force encoding for filedownload
 
 ## [1.6.22] - 2019-01-03
-
 ### Changed
 - get_identity method - supports ZSession auth now
 - updated rspecs accordingly

data/lib/zuora_api/login.rb

@@ -845,7 +845,7 @@ 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: {}, 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, force_encoding: true, **execute_params)
       raise "file_path must be of class Pathname" if file_path.class != Pathname
 
       #Make sure directory exists
@@ -884,7 +884,7 @@ module ZuoraAPI
               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)
+              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, :force_encoding => force_encoding)
 
             when Net::HTTPClientError
               raise
@@ -895,7 +895,6 @@ module ZuoraAPI
                 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)
@@ -931,7 +930,6 @@ module ZuoraAPI
                   encoding ||= 'UTF-8'
                 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
@@ -939,6 +937,8 @@ module ZuoraAPI
                 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'
@@ -949,7 +949,11 @@ module ZuoraAPI
               file_handle.binmode
 
               response.read_body do |chunk|
-                file_handle << chunk.force_encoding(encoding)
+                if force_encoding
+                  file_handle << chunk.force_encoding(encoding)
+                else 
+                  file_handle << chunk
+                end
 
                 if defined?(export_size) && export_size != 0  && export_size.class == Integer
                   size += chunk.size
@@ -967,7 +971,7 @@ module ZuoraAPI
               return file_handle
             end
           end
-        rescue *(CONNECTION_EXCEPTIONS).concat(CONNECTION_READ_EXCEPTIONS) => e
+        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}")

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.6.254"
+  VERSION = "1.6.255"
 end

metadata

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