zuora_api 1.8.21 → 1.8.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44a650019155981d2075062e2d4de0d8feff5c5e89b7d3ba9e4540f81de803dc
-  data.tar.gz: 6db8be3cfaa2905300c7b3d91b7b7d4f8b5aa5eb8306d24116dac7f1035dd3b0
+  metadata.gz: 5546a62ebcd1e41ab71c6e8555c49a9c8de4e627b69c2d6c3ee658e32a773a81
+  data.tar.gz: 75c008dec5f8652cfcdcd86d3e0503ddab0d6fe26789bd17a8b87551fdce7b3f
 SHA512:
-  metadata.gz: 704fd52ba264db7e1937f6307d0c761d72f615495d15097b1e5ceb14bc31b3b07b8b71ef99b87d74c95706399a822008bf654e06e6e4f8e4e6637187ab993446
-  data.tar.gz: 0be344718465df6d0bbb69d7fca93263c9bcc299a20ad9a70498f9d56e09eb5b708d9d474984c42f183220eff62ba145b486fbae5be73202e7c7a210b740c9a5
+  metadata.gz: e8ee6cc80db3980eff77b60f94d8ce97a08fdabc5ed013a927c1ae8e8f40bc76fbaabcd95fae270dba1e7c813127aa526791e146d4838a610c29c4b56bc4e154
+  data.tar.gz: dc8cfcca12a83c6c0103e908c77b9f6838f9cb426a7762cd34998015e8f94d35ae756691b42527780204a65a22cea47502f057df48028551a5395271e7300c7a

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-# Changelog
+# Changelog 
 All notable changes to this project will be documented in this file.
 
 ## [1.7.07] - 2018-9-10

data/lib/zuora_api/login.rb

@@ -1395,68 +1395,35 @@ module ZuoraAPI
 
     def getDataSourceExport(query, extract: true, encrypted: false, zip: true, z_track_id: "")
       tries ||= 3
-      request = Nokogiri::XML::Builder.new do |xml|
-        xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' => "http://schemas.xmlsoap.org/soap/envelope/", 'xmlns:ns2' => "http://object.api.zuora.com/", 'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance", 'xmlns:ns1' => "http://api.zuora.com/") do
-          xml['SOAP-ENV'].Header do
-            xml['ns1'].SessionHeader do
-              xml['ns1'].session self.get_session(prefix: false, auth_type: :basic, zuora_track_id: z_track_id)
-            end
-          end
-          xml['SOAP-ENV'].Body do
-            xml['ns1'].create do
-              xml['ns1'].zObjects('xsi:type' => "ns2:Export") do
-                xml['ns2'].Format 'csv'
-                xml['ns2'].Zip zip
-                xml['ns2'].Name 'googman'
-                xml['ns2'].Query query
-                xml['ns2'].Encrypted encrypted
-              end
-            end
+
+      output_xml, input_xml = self.soap_call(debug: false, timeout_retry: true, zuora_track_id: z_track_id) do |xml|
+        xml['ns1'].create do
+          xml['ns1'].zObjects('xsi:type' => "ns2:Export") do
+            xml['ns2'].Format 'csv'
+            xml['ns2'].Zip zip
+            xml['ns2'].Name 'googman'
+            xml['ns2'].Query query
+            xml['ns2'].Encrypted encrypted
           end
         end
       end
-
-      response_query = HTTParty.post(self.url, body: request.to_xml(:save_with => XML_SAVE_OPTIONS).strip, headers: {'Content-Type' => "application/json; charset=utf-8", "Z-Track-Id" => z_track_id}, :timeout => 130)
-
-      output_xml = Nokogiri::XML(response_query.body)
-      raise_errors(type: :SOAP, body: output_xml, response: response_query) if output_xml.xpath('//ns1:Success', 'ns1' =>'http://api.zuora.com/').text != "true"
-
-      # raise "Export Creation Unsuccessful : #{response_query.code}: #{response_query.parsed_response}" if  output_xml.xpath('//ns1:Success', 'ns1' =>'http://api.zuora.com/').text != "true"
       
       id = output_xml.xpath('//ns1:Id', 'ns1' =>'http://api.zuora.com/').text
 
-      confirmRequest = Nokogiri::XML::Builder.new do |xml|
-        xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' => "http://schemas.xmlsoap.org/soap/envelope/", 'xmlns:ns2' => "http://object.api.zuora.com/", 'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance", 'xmlns:ns1' => "http://api.zuora.com/") do
-          xml['SOAP-ENV'].Header do
-            xml['ns1'].SessionHeader do
-              xml['ns1'].session self.get_session(prefix: false, auth_type: :basic, zuora_track_id: z_track_id)
-            end
-          end
-          xml['SOAP-ENV'].Body do
-            xml['ns1'].query do
-              xml['ns1'].queryString "SELECT  Id, CreatedById, CreatedDate, Encrypted, FileId, Format, Name, Query, Size, Status, StatusReason, UpdatedById, UpdatedDate, Zip From Export where Id = '#{id}'"
-            end
-          end
-        end
-      end
       result = 'Waiting'
-
       while result != "Completed"
         sleep 3
-        response_query = HTTParty.post(self.url, body: confirmRequest.to_xml(:save_with => XML_SAVE_OPTIONS).strip, headers: {'Content-Type' => "application/json; charset=utf-8", "Z-Track-Id" => z_track_id}, :timeout => 130)
-
-        output_xml = Nokogiri::XML(response_query.body)
+        output_xml, input_xml = self.soap_call(debug: false, timeout_retry: true, zuora_track_id: z_track_id) do |xml|
+          xml['ns1'].query do
+            xml['ns1'].queryString "SELECT Id, CreatedById, CreatedDate, Encrypted, FileId, Format, Name, Query, Size, Status, StatusReason, UpdatedById, UpdatedDate, Zip From Export where Id = '#{id}'"
+          end
+        end
         result = output_xml.xpath('//ns2:Status',  'ns2' =>'http://object.api.zuora.com/').text
-        status_code = response_query.code if response_query
-
-        raise_errors(type: :SOAP, body: output_xml, response: response_query) if result.blank? || result == "Failed"
-        # raise "Export Creation Unsuccessful : #{response_query.code}: #{response_query.parsed_response}" if result.blank? || result == "Failed"
       end
 
       file_id = output_xml.xpath('//ns2:FileId',  'ns2' =>'http://object.api.zuora.com/').text
       export_file = get_file(:url => self.fileURL(file_id))
       export_file_path = export_file.path
-      Rails.logger.debug("=====> Export path #{export_file.path}")
 
       if extract && zip
         require "zip"
@@ -1480,24 +1447,18 @@ module ZuoraAPI
     rescue ZuoraAPI::Exceptions::ZuoraUnexpectedError => ex
       if !(tries -= 1).zero?
         Rails.logger.info("Trace ID: #{z_track_id} UnexpectedError, will retry after 10 seconds")
-        sleep 10
+        sleep(self.timeout_sleep)
         retry
       end
       raise ex
-
-    rescue *ZUORA_API_ERRORS => ex
-      raise ex
-
+      
     rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
       if !(tries -= 1).zero?
         Rails.logger.info("Trace ID: #{z_track_id} Timed out will retry after 5 seconds")
-        sleep 5
+        sleep(self.timeout_sleep)
         retry
       end
       raise ex
-
-    rescue ZuoraAPI::Exceptions::BadEntityError => ex
-      raise ex
     end
 
     def query(query, parse = false)

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.8.21"
+  VERSION = "1.8.22"
 end

metadata

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