zuora_api 1.3.98 → 1.3.99

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d47d656016783801cd54d232ca5e9ab8e64cf4ea
-  data.tar.gz: 0bcab79dc371b242b927f5ede0f10c494819f0be
+  metadata.gz: 8981ecd148fac5717a22a5b90cce3802094ef926
+  data.tar.gz: ae14c625556803728169189a2db657a98c8422a9
 SHA512:
-  metadata.gz: b65c05cda34dd4d8a260bbb318087e61ba9d433311c57ec0e4f7120de14f13fc7001b3ea36e9bbd982ab9d1c5bddbb984464345d61ac7d8ec9d803be295adb46
-  data.tar.gz: 5c7e68c48a562c7c351c3160d34f01b5de41106059d3b256d97646383d6e81e4d88af944a640892cb5ede6958801d10a08cca99a04cb0ccd74278d2ff4b2604f
+  metadata.gz: 71c0ce69b97507a8156ffdc8890d24aff1360ddeeabe831bf4badc91d2f49cad397e4607a6e9fe6abf48a6f589c7c532fc7ed1e8b0a0e5ab0ee3a8268a4504aa
+  data.tar.gz: 46fdd7c68d9ef8bde2713741646acf01cfa4117fa0d259c941d5fa5a3ed869c7cfba395cbdb8c034c406da2c827c0a78f0390a36e16d4ff7df050acc7ebf1a22

data/lib/zuora_api/login.rb

@@ -421,10 +421,11 @@ module ZuoraAPI
       return products, catalog_map
     end
 
-    def get_file(file_name: nil, url: nil, headers: {}, count: 3, file_type: "zip", z_session: true)
+    def get_file(file_name: nil, file_type: nil, url: nil, headers: {}, count: 3, z_session: true, tempfile: true, file_path: Rails.root.join('tmp'))
+      raise "file_path must be of class Pathname" if file_path.class != Pathname
+
       begin
         uri = URI.parse(url)
-        filename = !file_name.blank? ? file_name : File.basename(uri.path).rpartition('.').first
 
         http = Net::HTTP.new(uri.host, uri.port)
         http.read_timeout = 120 #Seconds
@@ -443,25 +444,54 @@ module ZuoraAPI
             raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error) if count <= 0
             Rails.logger.fatal("Unauthorized: Retry")
             self.new_session
-            return get_file(:url => url, :count => count - 1, :headers => headers)
+            return get_file(:file_name => file_name, :file_type => file_type, :url => url, :headers => headers, :count => count - 1, :z_session => z_session, :tempfile => tempfile. :file_path => file_path)
 
           when Net::HTTPClientError
             Rails.logger.debug("Login: #{self.username} Export")
             raise response
 
           when Net::HTTPOK
-            temp_file = Tempfile.new([filename, ".#{file_type}"], "#{Rails.root}/tmp")
-            temp_file.binmode
+            Rails.logger.debug("Headers: #{response}")
 
             size, export_progress = [0, 0]
+            encoding, type, full_filename = [nil, nil, nil]
+            if response.header["Content-Disposition"].present?
+              case response.header["Content-Disposition"]
+              when /attachment; filename\*=.*/
+                full_filename = /attachment; filename\*=(.*)''(.*)/.match(response.header["Content-Disposition"])[2].strip
+                encoding = /attachment; filename\*=(.*)''(.*)/.match(response.header["Content-Disposition"])[1].strip
+              when /attachment; filename=/
+                full_filename = /attachment; filename=(.*)/.match(response.header["Content-Disposition"])[1].strip
+              end
+              file_ending = file_type.present? ? ".#{file_type}" : /.*(\..*)$/.match(full_filename)[-1]
+            end
+            #If user supplied a filename use it, else default to content header filename, else default to uri pattern
+            filename = file_name.present? ? file_name : full_filename.present? ? full_filename.split(file_ending).first : File.basename(uri.path).rpartition('.').first
+
+            if response.header["Content-Type"].present?
+              type = /(.*);charset=(.*)/.match(response.header["Content-Type"])[1]
+              encoding =  /(.*);charset=(.*)/.match(response.header["Content-Type"])[2]
+            end
+            Rails.logger.debug("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_handle = nil
+            timestamp =  Time.now.to_i
+            if tempfile
+              file_handle = Tempfile.new(["#{filename}_#{timestamp}", "#{file_ending}"], file_path)
+              file_handle.binmode
+            else
+              file_handle = File.new(file_path.join("#{filename}_#{timestamp}#{file_ending}"), "w+")
+              file_handle.binmode
+            end
+
             response.read_body do |chunk|
-              temp_file << chunk.force_encoding("UTF-8")
+              file_handle << chunk.force_encoding(encoding)
 
               if defined?(export_size) && export_size != 0  && export_size.class == Integer
                 size += chunk.size
@@ -473,8 +503,8 @@ module ZuoraAPI
               end
             end
 
-            temp_file.close
-            return temp_file
+            file_handle.close
+            return file_handle
           end
         end
       rescue Exception => e

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.3.98"
+  VERSION = "1.3.99"
 end

metadata

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