zuora_api 1.10.3 → 1.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb8a07811203b9141471afb4cb85bc7b3c62b6e2ce6c9254985d3ad7683f2540
-  data.tar.gz: 58fefaba666d1999c169fcc02208b6df7fca95aa0bc9b219d7aa1fb8c02e1599
+  metadata.gz: bcc70f9f6dc5b44374be1a328a8b278371f258c16f87a13ca454163eb48a2e61
+  data.tar.gz: 5044aa7d15bb20e4d137c6f9ddead29543fb0f83198ceac9c4db4eede7650e63
 SHA512:
-  metadata.gz: 1c3c2d7503e8afb612edf442105d6c78d8feb6b480d625dc119ce2cd49645bbd2ad60e9090c93489e56af2921cc97921178c31aa0384a966fb3ed74efb5d2d32
-  data.tar.gz: ec1bc529dba10ef46600ae676fe693d63a3852ee466acd10332cdfb611beb4bee52d3c909a2b4d39d4b303f42782391fd0e32c63ecd54d5006c3cd1cbea8ca5f
+  metadata.gz: 0d1a69613a273ef0105a4f0565f63fc653e4a811320890ef50d7be1e4727b1437764742c9c07dbca21806a4c5636cf0434a4169ca794afc351411e8f94eeed58
+  data.tar.gz: 5dd1e52dc4ddf48b921ea11cf948b362867723278a93ec39114aadd5c9e12c6d9d4847159bc94e1c310eeb507004affc9149951280dcdc2f44c7cca240261ef6

data/lib/zuora_api/exceptions.rb

@@ -125,12 +125,6 @@ module ZuoraAPI
       end
     end
 
-    class ZuoraAPIRequestConcurrentLimit < ZuoraAPIRequestLimit
-    end
-
-    class ZuoraAPIRequestRateLimit < ZuoraAPIRequestLimit
-    end
-
     class ZuoraAPIUnkownError < Error
       attr_reader :code, :response
       attr_writer :default_message

data/lib/zuora_api/login.rb

@@ -30,8 +30,6 @@ module ZuoraAPI
     ZUORA_API_ERRORS = [
       ZuoraAPI::Exceptions::ZuoraAPIError,
       ZuoraAPI::Exceptions::ZuoraAPIRequestLimit,
-      ZuoraAPI::Exceptions::ZuoraAPIRequestConcurrentLimit,
-      ZuoraAPI::Exceptions::ZuoraAPIRequestRateLimit,
       ZuoraAPI::Exceptions::ZuoraAPILockCompetition,
       ZuoraAPI::Exceptions::ZuoraAPITemporaryError,
       ZuoraAPI::Exceptions::ZuoraDataIntegrity,
@@ -459,7 +457,6 @@ module ZuoraAPI
       headers.merge!({ 'Content-Type' => "text/xml; charset=utf-8", 'Accept' => 'text/xml'})
       headers['Zuora-Track-Id'] = zuora_track_id if zuora_track_id.present?
       headers['X-Amzn-Trace-Id'] = zuora_track_id if zuora_track_id.present?
-
       headers["User-Agent"] = USER_AGENT
 
       request = HTTParty::Request.new(
@@ -620,7 +617,10 @@ module ZuoraAPI
       case response.code
       when 504
         raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received 504 from 'https://#{rest_domain(endpoint: request_uri)}'", response)
-      when 401, 429
+      when 429
+        raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("The total number of concurrent requests has exceeded the limit allowed by the system. Please resubmit your request later.", response)
+      when 401
+
       else
         if body.class == Hash
           case request_path
@@ -637,21 +637,6 @@ module ZuoraAPI
       when :SOAP
         error, success, message = get_soap_error_and_message(body)
 
-        if response.code == 429
-          if message.to_s.downcase.include?('concurrent')
-            raise ZuoraAPI::Exceptions::ZuoraAPIRequestConcurrentLimit.new(
-              "The total number of concurrent requests has exceeded the limit allowed by the system. " \
-              "Please resubmit your request later.",
-              response
-            )
-          else
-            raise ZuoraAPI::Exceptions::ZuoraAPIRequestRateLimit.new(
-              "Rate limiting. Please resubmit your request later.",
-              response
-            )
-          end
-        end
-
         if body.xpath('//fns:LoginFault', 'fns' =>'http://fault.api.zuora.com/').present?
           raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(message, response)
         end
@@ -744,12 +729,7 @@ module ZuoraAPI
             codes_array = codes_array.push(body.dig("error", 'code')).compact
           end
 
-          body_message = body.fetch('message', '').downcase
-          if body_message.include?('rate limit exceeded')
-            raise ZuoraAPI::Exceptions::ZuoraAPIRequestRateLimit.new("The total number of requests has exceeded the rate limit allowed by the system. Please resubmit your request later.", response)
-          end
-
-          if body_message.include?('request exceeded limit')
+          if body['message'] == 'request exceeded limit'
             raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("The total number of concurrent requests has exceeded the limit allowed by the system. Please resubmit your request later.", response)
           end
 
@@ -821,7 +801,7 @@ module ZuoraAPI
 
           #Request exceeded limit
           if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(70)
-            raise ZuoraAPI::Exceptions::ZuoraAPIRequestConcurrentLimit.new("#{messages_array.join(', ')}", response)
+            raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{messages_array.join(', ')}", response)
           end
 
           #All Errors catch
@@ -829,10 +809,6 @@ module ZuoraAPI
             raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{messages_array.join(', ')}", response)
           end
 
-          if response.code == 429
-            raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("The total number of concurrent requests has exceeded the limit allowed by the system. Please resubmit your request later.", response)
-          end
-
           #Zuora REST Query Errors
           if body["faultcode"].present?
             raise_errors_helper(error:  body["faultcode"], message: body["faultstring"], response: response)
@@ -968,11 +944,7 @@ module ZuoraAPI
       when /.*INVALID_SESSION/
         raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(message, response, errors, success)
       when /.*REQUEST_EXCEEDED_LIMIT/
-        if message.to_s.downcase.include?('concurrent')
-          raise ZuoraAPI::Exceptions::ZuoraAPIRequestConcurrentLimit.new(message, response, errors, success)
-        else
-          raise ZuoraAPI::Exceptions::ZuoraAPIRequestRateLimit.new(message, response, errors, success)
-        end
+        raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new(message, response, errors, success)
       when /.*LOCK_COMPETITION/
         raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new(message, response, errors, success)
       when /.*BATCH_FAIL_ERROR/
@@ -1083,14 +1055,11 @@ module ZuoraAPI
 
     def describe_call(object = nil, log_errors = true)
       tries ||= 2
-
       base = self.url.include?(".com") ? self.url.split(".com")[0].concat(".com") : self.url.split(".eu")[0].concat(".eu")
-
       version = self.url.scan(/(\d+\.\d)$/).dig(0,0).to_f
       url = object ? "#{base}/apps/api/#{version}/describe/#{object}" : "#{base}/apps/api/#{version}/describe/"
 
       headers = { "Content-Type" => "text/xml; charset=utf-8" }.merge(self.entity_header)
-
       response = HTTParty.get(url,  headers: {"Authorization" => self.get_session(prefix: true, auth_type: :basic), "User-Agent" => USER_AGENT}.merge(headers), :timeout => 130)
 
       raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error.present? ? self.current_error : 'Describe call 401', response) if response.code == 401
@@ -1182,7 +1151,6 @@ module ZuoraAPI
       end
       headers['Zuora-Track-Id'] = zuora_track_id if zuora_track_id.present?
       headers['X-Amzn-Trace-Id'] = zuora_track_id if zuora_track_id.present?
-
       headers['User-Agent'] = USER_AGENT
 
       modified_headers = {'Content-Type' => "application/json; charset=utf-8"}.merge(authentication_headers).merge(headers)
@@ -1351,7 +1319,6 @@ module ZuoraAPI
 
       headers['Zuora-Track-Id'] = zuora_track_id if zuora_track_id.present?
       headers['X-Amzn-Trace-Id'] = zuora_track_id if zuora_track_id.present?
-
       headers["User-Agent"] = USER_AGENT
 
       response_save = nil
@@ -1467,56 +1434,6 @@ module ZuoraAPI
       raise
     end
 
-    def create_data_source_export(query: "", encrypted: false, zip: true, z_track_id: "")
-      begin
-        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
-
-        return output_xml.xpath('//ns1:Id', 'ns1' =>'http://api.zuora.com/').text
-      rescue Exception => ex
-        raise ex.class.new("#{z_track_id} #{ex.message}")
-      end
-    end
-
-    def check_export_status(export_id: "")
-      begin
-        response, full_response = self.rest_call(method: :get,url: self.rest_endpoint("object/export/#{export_id}"))
-
-        return full_response.parsed_response
-      rescue Exception => ex
-        raise ex
-      end
-    end
-
-    def get_export_file(file_id: "", extract: true, zip: true)
-      begin
-        export_file_path = self.get_file(:url => self.rest_endpoint("files/#{file_id}")).path
-
-        if extract && zip
-          require "zip"
-          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 export_file_path
-        end
-      rescue Exception => ex
-        raise ex
-      end
-    end
-
     def getDataSourceExport(query, extract: true, encrypted: false, zip: true, z_track_id: "")
       tries ||= 3
 

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.10.3"
+  VERSION = "1.10.4"
 end

metadata

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