zuora_api 1.3.997 → 1.3.999

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 244b6ef47daa9d5f30620630e70e9b2917670213
-  data.tar.gz: 4591349f6ac4f7ffaca7fdf9d9f1399655b167d4
+  metadata.gz: b138340746df0535ad03c3e1f69e9ccc74a7c9f1
+  data.tar.gz: 1921d1fa811273a169b53e090dc080c44d9902cb
 SHA512:
-  metadata.gz: 457dfca43748e6817c814dcec4d7dac354a4a8f041f770a902a1c275c9cf85bfbcc87f934fa5f84bce8194495dcb0e491c0f9fffe19ab6373affecfb610c6482
-  data.tar.gz: 0a4cfe45d894b0abad532d6858e52ec8428c4db8690b45afea76661cb2ea2f595c1adc217afb2effb7ae473aeba434aeb68de6db667887755c5a8e04a83aad25
+  metadata.gz: 2ae9cf95d5f69554653542e388a9e85add970e6584c3a3fec5aedae8de6bc913fe466d17604c0c5830252e041280cb10ae5940a21605111fe13d355e41b5ecce
+  data.tar.gz: d9b99dff207ab9ea38707b4d49bfcb87d12424caaafae989045248d1d6a73fdedcc888bc217df9ba9f6bb8cc4a1137ed49a612f88493478b62d3972078c3a168

data/lib/zuora_api/login.rb

@@ -79,8 +79,8 @@ module ZuoraAPI
       end
     end
 
-    def fileURL
-      return self.url.split(".com").first.concat(".com/apps/api/file/")
+    def fileURL(url="")
+      return self.url.split(".com").first.concat(".com/apps/api/file/").concat(url)
     end
 
     def dateFormat
@@ -275,7 +275,7 @@ module ZuoraAPI
       return getFileById(id: response[0]["id"])
     end
 
-    def getFileById(id: "")
+    def getFileById(id: "2c92c0f85e7f88ff015e86b8f8f4517f")
       response = nil
       result = "new"
       while result != "completed" do
@@ -288,10 +288,9 @@ module ZuoraAPI
         end
       end
       fileId = response["batches"][0]["fileId"]
-      return self.get_file(file_name: "#{fileId}.csv", url: self.aqua_endpoint("file/#{fileId}"), headers: {"Authorization" => "ZSession " + self.current_session, 'Content-Type' => "application/json; charset=utf-8"},file_type: "csv")
+      return self.get_file(url: self.aqua_endpoint("file/#{fileId}"))
     end
 
-
     def describe_call(object = nil)
       self.get_session
       base = self.url.include?(".com") ? self.url.split(".com")[0].concat(".com") : self.url.split(".eu")[0].concat(".eu")
@@ -389,8 +388,8 @@ module ZuoraAPI
       return self
     end
 
-    def get_catalog
-      products, catalog_map, response = [{}, {}, {'nextPage' => self.rest_endpoint('catalog/products?pageSize=40') }]
+    def get_catalog(page_size: 40)
+      products, catalog_map, response = [{}, {}, {'nextPage' => self.rest_endpoint("catalog/products?pageSize=#{page_size}") }]
       while !response["nextPage"].blank?
         url = self.rest_endpoint(response["nextPage"].split('/v1/').last)
         Rails.logger.debug("Fetch Catalog URL #{url}")
@@ -421,7 +420,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'), **execute_params)
+    def get_file(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
@@ -448,7 +447,7 @@ module ZuoraAPI
             raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error) if count <= 0
             Rails.logger.fatal("Unauthorized: Retry")
             self.new_session
-            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)
+            return get_file(: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")
@@ -471,10 +470,10 @@ module ZuoraAPI
               when /.*; filename=/
                 full_filename = /.*; filename=(.*)/.match(response.header["Content-Disposition"])[1].strip
               end
-              file_ending = file_type.present? ? ".#{file_type}" : ".#{full_filename.partition(".").last}"
+              file_ending = ".#{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
+            filename =  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"]
@@ -517,6 +516,7 @@ module ZuoraAPI
               end
             end
 
+            Rails.logger.debug("Filepath: #{file_handle.path}")
             file_handle.close
             return file_handle
           end
@@ -528,8 +528,6 @@ module ZuoraAPI
       end
     end
 
-
-
     def getDataSourceExport(query, extract: true, encrypted: false, zip: true)
       Rails.logger.info('Export') {"Build export"}
       Rails.logger.info('Export query') {"#{query}"}
@@ -583,31 +581,20 @@ 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(:url => "#{self.fileURL}#{file_id}?file-id=#{file_id}")
+      export_file = get_file(:url => self.fileURL(file_id))
+      export_file_path = export_file.path
+      Rails.logger.info('Export') {"=====> Export path #{export_file.path}"}
+
       if extract && zip
-        location = extract_zip(zip_file.path, "#{file_id}")
-        File.delete(zip_file.path)
-        return location
-      elsif !zip
-        file = get_file(:url => "#{self.fileURL}#{file_id}?file-id=#{file_id}", headers: {"Authorization" => "ZSession " + self.current_session})
-        puts file.path
-        return file.path
+        new_path = export_file_path.partition('.zip').first
+        zipped = Zip::File.open(export_file_path)
+        file_handle = zipped.entries.first
+        file_handle.extract(new_path)
+        File.delete(export_file_path)
+        return new_path
       else
-        return zip_file.path
-      end
-    end
-
-    def extract_zip(file,filename)
-      files = Array.new
-      FileUtils.mkdir_p("#{Rails.root}/tmp/#{filename}")
-      ::Zip::File.open(file) do |zip_file|
-        zip_file.each do |f|
-          files << "#{Rails.root}/tmp/#{filename}/#{f.name}"
-          fpath = File.join("#{Rails.root}/tmp/#{filename}", f.name)
-          zip_file.extract(f, fpath) unless File.exist?(fpath)
-        end
+        return export_file_path
       end
-      return files
     end
 
     def query(query)

data/lib/zuora_api/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.3.997
+  version: 1.3.999
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group