zuora_api 1.6.08 → 1.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b38288329a6baa01e730f395f812b078a0c88e7c
-  data.tar.gz: bd7586d214743d2015f36ac8fc94d26a86673662
+  metadata.gz: 6ab1f61ed70054d159fa7b9b8835d6706be1c2e3
+  data.tar.gz: 765e41e2106129176e32224ff448ad6134a39b61
 SHA512:
-  metadata.gz: 49ed5ff1b37a43a3fea62807501c33e6d1752f0b1caab30756ffc181521f86ac8e451b85530e0669ee8ee08afe5744f02ef7b8c6995c7458d859d6ba0609dee8
-  data.tar.gz: 07946a9b121dbeb80985b831d58ffd7b65ed95bfd2a8578bad63d40d4e2eaa5a646303e422b942ebbb7a8197ed173ef8f558c9f86dcbcc74fc702575a9dd9be2
+  metadata.gz: 4adb062487388da25439e813dfc8e5301e1ec6c3f56a229ca5acb10904f2ece0a088d6a30d0a2ba11d35eb74368a5eebbd007dd17c0c972339fa8198ce085754
+  data.tar.gz: d7663dbccd7a31ae63cc694caf1c66c12fa0dd8f4bd7e7f262e06d20b06724518db9c07d490fefd35705be08f8838e3787858effec00a70f9ed00d41843c1d9c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zuora_api (1.6.08)
+    zuora_api (1.6.10)
       httparty
       nokogiri
       railties (>= 4.1.0, < 5.2)

data/lib/zuora_api/login.rb

@@ -549,7 +549,7 @@ module ZuoraAPI
       return products, catalog_map
     end
 
-    def get_file(url: nil, headers: {}, count: 3, z_session: true, tempfile: 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, **execute_params)
       raise "file_path must be of class Pathname" if file_path.class != Pathname
 
       #Make sure directory exists
@@ -562,7 +562,10 @@ module ZuoraAPI
         http = Net::HTTP.new(uri.host, uri.port)
         http.read_timeout = timeout #Seconds
         http.use_ssl = true  if uri.scheme.downcase == 'https'
-        headers = headers.merge({"Authorization" => self.get_session(prefix: true, auth_type: session_type)}) if z_session
+        if z_session
+          headers = headers.merge({"Authorization" => self.get_session(prefix: true)})
+          headers = headers.merge({"entityId" => self.entity_id}) if !self.entity_id.blank?
+        end
 
         response_save = nil
         http.request_get(uri.request_uri, headers) do |response|
@@ -575,13 +578,15 @@ module ZuoraAPI
             raise
 
           when Net::HTTPUnauthorized
+            if count <= 0
+              if z_session
+                raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error) 
+              else
+                raise
+              end
+            end
             Rails.logger.fatal("Unauthorized: Retry")
-            if z_session
-              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error) if count <= 0
-              self.new_session
-            else
-              raise if count <= 0
-            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)
 
           when Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, OpenSSL::SSL::SSLError, Errno::ECONNREFUSED, SocketError
@@ -598,20 +603,30 @@ module ZuoraAPI
             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
+
             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
+                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
+                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.partition(".").last}"
+              file_ending ||= full_filename.end_with?(".csv.zip") ? ".csv.zip" : File.extname(full_filename)
+              filename ||= File.basename(full_filename, file_ending)
             end
+
             #If user supplied a filename use it, else default to content header filename, else default to uri pattern
-            filename =  full_filename.present? ? full_filename.split(file_ending).first : File.basename(uri.path).rpartition('.').first
+            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"]
@@ -631,16 +646,14 @@ module ZuoraAPI
               export_size = response.header["ContentLength"].to_i
             end
 
-            file_handle = nil
-            timestamp =  Time.now.to_i
+            file_prefix = add_timestamp ? "#{filename}_#{Time.now.to_i}" : filename
             if tempfile
               require 'tempfile'
-              file_handle = ::Tempfile.new(["#{filename}_#{timestamp}", "#{file_ending}"], file_path)
-              file_handle.binmode
+              file_handle = ::Tempfile.new([file_prefix, "#{file_ending}"], file_path)
             else
-              file_handle = File.new(file_path.join("#{filename}_#{timestamp}#{file_ending}"), "w+")
-              file_handle.binmode
+              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)

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.6.08"
+  VERSION = "1.6.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.6.08
+  version: 1.6.10
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2018-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler