zuora_api 1.3.996 → 1.3.997

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ab9b53d9882b003663bc5deaebac6d5e8116c25
-  data.tar.gz: 51214067943da97e6147c650d786a6e2cded3157
+  metadata.gz: 244b6ef47daa9d5f30620630e70e9b2917670213
+  data.tar.gz: 4591349f6ac4f7ffaca7fdf9d9f1399655b167d4
 SHA512:
-  metadata.gz: b985373ecb91daa6c62b3d7439a4bdcd3cf0ed4063d6435904dcebf8151b4300bc2dac33416919a086577b87811e6c923696dc8c11d2d7235da0b0ce2cd069dd
-  data.tar.gz: 91e7c7e2f11766bc94ef6890797212178ccd3ab8c7739970842cf1cf0aa19a783e76e928601bf9af49b20f01e6ff9552b3c0b9e7f69f1576fa78bd7f0205c1ec
+  metadata.gz: 457dfca43748e6817c814dcec4d7dac354a4a8f041f770a902a1c275c9cf85bfbcc87f934fa5f84bce8194495dcb0e491c0f9fffe19ab6373affecfb610c6482
+  data.tar.gz: 0a4cfe45d894b0abad532d6858e52ec8428c4db8690b45afea76661cb2ea2f595c1adc217afb2effb7ae473aeba434aeb68de6db667887755c5a8e04a83aad25

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zuora_api (1.3.996)
+    zuora_api (1.3.997)
       httparty
       nokogiri (~> 1.6.8)
       railties (>= 4.1.0, < 5.1)

data/lib/zuora_api/login.rb

@@ -421,7 +421,7 @@ module ZuoraAPI
       return products, catalog_map
     end
 
-    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'))
+    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'), **execute_params)
       raise "file_path must be of class Pathname" if file_path.class != Pathname
 
       #Make sure directory exists
@@ -455,26 +455,30 @@ module ZuoraAPI
             raise response
 
           when Net::HTTPOK
-            Rails.logger.debug("Headers: #{response}")
+            headers = {}
+            response.each_header do |k,v|
+              headers[k] = v
+            end
+            Rails.logger.debug("Headers: #{headers.to_s}")
 
             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
+              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
               end
-              file_ending = file_type.present? ? ".#{file_type}" : /.*(\..*)$/.match(full_filename)[-1]
+              file_ending = file_type.present? ? ".#{file_type}" : ".#{full_filename.partition(".").last}"
             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?
               case response.header["Content-Type"]
-              when /.*;charset=.*/.match("application/zip")
+              when /.*;charset=.*/
                 type = /(.*);charset=(.*)/.match(response.header["Content-Type"])[1]
                 encoding = /(.*);charset=(.*)/.match(response.header["Content-Type"])[2]
               else
@@ -519,6 +523,7 @@ module ZuoraAPI
         end
       rescue Exception => e
         Rails.logger.fatal('GetFile') {"Download Failed: #{response_save} - #{e.message}"}
+        Rails.logger.fatal('GetFile') {"Download Failed: #{e.backtrace.join("\n")}"}
         raise
       end
     end
@@ -578,13 +583,13 @@ module ZuoraAPI
       end
       file_id = output_xml.xpath('//ns2:FileId',  'ns2' =>'http://object.api.zuora.com/').text
       Rails.logger.info('Export') {'=====> Export finished'}
-      zip_file = get_file(:file_name => "#{file_id}.zip" ,:url => "#{self.fileURL}#{file_id}?file-id=#{file_id}")
+      zip_file = get_file(:url => "#{self.fileURL}#{file_id}?file-id=#{file_id}")
       if extract && zip
         location = extract_zip(zip_file.path, "#{file_id}")
         File.delete(zip_file.path)
         return location
       elsif !zip
-        file = get_file(:file_name => "#{file_id}.gpg" ,:url => "#{self.fileURL}#{file_id}?file-id=#{file_id}", headers: {"Authorization" => "ZSession " + self.current_session})
+        file = get_file(:url => "#{self.fileURL}#{file_id}?file-id=#{file_id}", headers: {"Authorization" => "ZSession " + self.current_session})
         puts file.path
         return file.path
       else

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.3.996"
+  VERSION = "1.3.997"
 end

metadata

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