zuora_api 1.3.9995 → 1.3.9996

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 977aadb4acfad8e681ee65cbb3db4c9e76452937
-  data.tar.gz: 2b20f81f5bc12bc26df1400ce5006d5c5c60c093
+  metadata.gz: 11f4bee338118875cf516ba7524cec1dc5ff58a1
+  data.tar.gz: 6481f2c77413e352feb88d609407434798974e8d
 SHA512:
-  metadata.gz: f2e55e273071f6e9b69fe44f4533d7e578762a1a74b05d806cde46f3fb449e164a250a42d41a187b7c36ea65e685522e6627b1ce12c0e924624708796a9e964c
-  data.tar.gz: 3484ab7d7c4e53c589c7b5222cc958f41872536f2dc5faeb3dc79cbda604b355e7b68a75e152ab1b05345ede1885120d75e5ee0abb32605755d34d63dac1b2de
+  metadata.gz: abbbbf6d83952c8d14d1912d3970ffb17f87d5e41de0086f1b65455c472346300dbf1615c85ee9bf918a41862119f90063d784b41b2024c0de28a79040d177d5
+  data.tar.gz: bdf76a459f1317d6f76e9013f07417d78612f44b4378fb9b3892adec9cf8efc3f6ed5d481bba0826e91c38c0c6606f1aed9bd037fbc1ef722d6cb8a13f96f4fb

data/Gemfile.lock

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

data/README.md

@@ -1,6 +1,6 @@
 # Zuora Gem
 
-[![Gem Version](https://badge.fury.io/rb/zuora_api.svg)](https://badge.fury.io/rb/zuora_api)
+[![Gem Version](https://badge.fury.io/rb/zuora_api.svg)](https://badge.fury.io/rb/zuora_api) [![coverage report](https://gitlab.zuora.com/Connect/zuora-gem/badges/master/coverage.svg)](https://gitlab.zuora.com/Connect/zuora-gem/commits/master)
 
 ## Installation
 Add this line to your application's Gemfile:

data/lib/zuora_api/login.rb

@@ -179,9 +179,9 @@ module ZuoraAPI
         self.status            = 'Active'
       end
       return self.status
-    rescue Net::OpenTimeout
+    rescue Net::ReadTimeout, Net::OpenTimeout => ex
       if !(tries -= 1).zero?
-        Rails.logger.debug {"Timed out will retry after 5 seconds"}
+        Rails.logger.debug {"#{ex.class} Timed out will retry after 5 seconds"}
         sleep(5)
         retry
       else
@@ -198,7 +198,7 @@ module ZuoraAPI
       return self.current_session
     end
 
-    def soap_call(ns1: 'ns1', ns2: 'ns2', batch_size: nil, single_transaction: false, debug: true, errors: [ZuoraAPI::Exceptions::ZuoraAPISessionError, ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition], z_session: true, **keyword_args)
+    def soap_call(ns1: 'ns1', ns2: 'ns2', batch_size: nil, single_transaction: false, debug: true, errors: [ZuoraAPI::Exceptions::ZuoraAPISessionError, ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition], z_session: true, timeout_retry: false, timeout: 120,**keyword_args)
       tries ||= 2
       xml = Nokogiri::XML::Builder.new do |xml|
         xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' => "http://schemas.xmlsoap.org/soap/envelope/",
@@ -230,7 +230,7 @@ module ZuoraAPI
       input_xml = Nokogiri::XML(xml.to_xml(:save_with => Nokogiri::XML::Node::SaveOptions::AS_XML | Nokogiri::XML::Node::SaveOptions::NO_DECLARATION).strip)
       input_xml.xpath('//ns1:session', 'ns1' =>'http://api.zuora.com/').children.remove
       Rails.logger.debug('Connect') {"Request SOAP XML: #{input_xml.to_xml(:save_with => Nokogiri::XML::Node::SaveOptions::AS_XML | Nokogiri::XML::Node::SaveOptions::NO_DECLARATION).strip}"} if debug
-      response = HTTParty.post(self.url,:body => xml.doc.to_xml, :headers => {'Content-Type' => "text/xml; charset=utf-8"}, :timeout => 120)
+      response = HTTParty.post(self.url,:body => xml.doc.to_xml, :headers => {'Content-Type' => "text/xml; charset=utf-8"}, :timeout => timeout)
       output_xml = Nokogiri::XML(response.body)
       Rails.logger.debug('Connect') {"Response SOAP XML: #{output_xml.to_xml(:save_with => Nokogiri::XML::Node::SaveOptions::AS_XML | Nokogiri::XML::Node::SaveOptions::NO_DECLARATION).strip}"} if debug
 
@@ -254,6 +254,12 @@ module ZuoraAPI
       else
         return [output_xml, input_xml]
       end
+    rescue Net::ReadTimeout, Net::OpenTimeout => ex
+      if !(tries -= 1).zero? && timeout_retry
+        retry
+      else
+        raise ex
+      end
     rescue => ex
       raise ex
     else
@@ -405,11 +411,11 @@ module ZuoraAPI
       return des_hash
     end
 
-    def rest_call(method: :get, body: {},headers: {}, url: rest_endpoint("catalog/products?pageSize=4"), debug: true, errors: [ZuoraAPI::Exceptions::ZuoraAPISessionError, ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition], z_session: true,  **keyword_args)
+    def rest_call(method: :get, body: {},headers: {}, url: rest_endpoint("catalog/products?pageSize=4"), debug: true, errors: [ZuoraAPI::Exceptions::ZuoraAPISessionError, ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition], z_session: true, timeout_retry: false, timeout: 120, **keyword_args)
       tries ||= 2
       headers["entityId"] = self.entity_id if !self.entity_id.blank?
       raise "Method not supported, supported methods include: :get, :post, :put, :delete, :patch, :head, :options" if ![:get, :post, :put, :delete, :patch, :head, :options].include?(method)
-      response = HTTParty::Request.new("Net::HTTP::#{method.to_s.capitalize}".constantize, url, body: body, headers: {'Content-Type' => "application/json; charset=utf-8"}.merge(z_session ? {"Authorization" => "ZSession #{self.get_session}"} : {}).merge(headers), timeout: 120).perform
+      response = HTTParty::Request.new("Net::HTTP::#{method.to_s.capitalize}".constantize, url, body: body, headers: {'Content-Type' => "application/json; charset=utf-8"}.merge(z_session ? {"Authorization" => "ZSession #{self.get_session}"} : {}).merge(headers), timeout: timeout).perform
 
       Rails.logger.debug('Connect') {"Response Code: #{response.code}" } if debug
       begin
@@ -439,6 +445,12 @@ module ZuoraAPI
       else
         return [output_json, response]
       end
+    rescue Net::ReadTimeout, Net::OpenTimeout => ex
+      if !(tries -= 1).zero? && timeout_retry
+        retry
+      else
+        raise ex
+      end
     rescue => ex
       raise ex
     else
@@ -464,7 +476,7 @@ module ZuoraAPI
       while !response["nextPage"].blank?
         url = self.rest_endpoint(response["nextPage"].split('/v1/').last)
         Rails.logger.debug("Fetch Catalog URL #{url}")
-        output_json, response = self.rest_call(:debug => false, :url => url, :errors => [ZuoraAPI::Exceptions::ZuoraAPISessionError])
+        output_json, response = self.rest_call(:debug => false, :url => url, :errors => [ZuoraAPI::Exceptions::ZuoraAPISessionError], :timeout_retry => true )
         if !output_json['success'] =~ (/(true|t|yes|y|1)$/i) || output_json['success'].class != TrueClass
           raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Error Getting Catalog: #{output_json}")
         end
@@ -491,7 +503,7 @@ module ZuoraAPI
       return products, catalog_map
     end
 
-    def get_file(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'), timeout_retries: 2, timeout: 120, **execute_params)
       raise "file_path must be of class Pathname" if file_path.class != Pathname
 
       #Make sure directory exists
@@ -502,7 +514,7 @@ module ZuoraAPI
         uri = URI.parse(url)
 
         http = Net::HTTP.new(uri.host, uri.port)
-        http.read_timeout = 120 #Seconds
+        http.read_timeout = timeout #Seconds
         http.use_ssl = true  if uri.scheme.downcase == 'https'
         headers = headers.merge({"Authorization" => "ZSession #{self.get_session}"}) if z_session
 
@@ -518,7 +530,11 @@ 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, :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, :timeout_retries => timeout_retries, :timeout => timeout)
+
+          when Net::ReadTimeout, Net::OpenTimeout
+            Rails.logger.fatal("Timeout: Retry")
+            return get_file(:url => url, :headers => headers, :count => count, :z_session => z_session, :tempfile => tempfile, :file_path => file_path, :timeout_retries => timeout_retries - 1, :timeout => timeout)
 
           when Net::HTTPClientError
             Rails.logger.debug("Login: #{self.username} Export")

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.3.9995"
+  VERSION = "1.3.9996"
 end

metadata

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