zuora_api 1.6.31 → 1.6.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acfa3e7e0f3a11749e634decc914b3c68a4181ff95fb4857c5d0181e9034d4ed
-  data.tar.gz: 16c584970adc6d1715533d9cc2cec7af2db6c1fc03c0ad795507194c1e37211b
+  metadata.gz: 9fd3df0e6eb30121ce6d8ff8e53ad31fb997a79b41a06830683408f47c2ec4eb
+  data.tar.gz: 9cc7684caf0a1406d71d752c50cae162440a1ac27e2c1585c3fe8c252e6b9ea5
 SHA512:
-  metadata.gz: d75de3d0585c02eb4a7bae1a4a597c4d64eba90adf11c1374e2b5f392f965cc12f417def1a2b2fc17b7c68967d24cbfe6b2bc577b43205b4b8431961df55cb51
-  data.tar.gz: 589505bc63eecc6929e62261e7f32b26b1d0b768a9953c344d08b0b56d548646897371ece804dae19735b6e00c0dd818d978ebac32009399d814fc0ce0216ecc
+  metadata.gz: 7ea0e1f9f88569d546520cf170f8685ec8c0b73df8f63dc9051324e556541ecb650aa166ca0c704da4f83e7766d96fbebbc29b19ca7f786195e28b8a612cb321
+  data.tar.gz: 97d137fb6ccf8c65d12f2dd994736a25156b3e4f6cb0237a827bdbde1a32ad1a82b17e9309fd28a34e44f981d0e968cf29266623678202391f9095d37eb667b9

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.6.32] - 2018-5-14
+### Changed
+- Don't log fatal errors, allow application to decide for file download
+- Don't change api url if the user set a high api url
+
+###Removed
+- Force encoding
+
+## [1.6.28] - 2018-3-12
+### Added
+- Way to avoid force encoding for filedownload
+
 ## [1.6.28] - 2018-3-12
 ### Added
 - Way to avoid force encoding for filedownload

data/lib/zuora_api/login.rb

@@ -6,7 +6,7 @@ module ZuoraAPI
   class Login
     ENVIRONMENTS = [SANDBOX = 'Sandbox', PRODUCTION = 'Production', PREFORMANCE = 'Preformance', SERVICES = 'Services', UNKNOWN = 'Unknown', STAGING = 'Staging' ]
     REGIONS = [EU = 'EU', US = 'US', NA = 'NA' ]
-    MIN_Endpoint = '91.0'
+    MIN_Endpoint = '96.0'
     XML_SAVE_OPTIONS = Nokogiri::XML::Node::SaveOptions::AS_XML | Nokogiri::XML::Node::SaveOptions::NO_DECLARATION
     CONNECTION_EXCEPTIONS = [Net::OpenTimeout, OpenSSL::SSL::SSLError, Errno::ECONNREFUSED, SocketError]
     CONNECTION_READ_EXCEPTIONS = [Net::ReadTimeout, Errno::ECONNRESET, Errno::EPIPE]
@@ -16,7 +16,7 @@ module ZuoraAPI
     def initialize(url: nil, entity_id: nil, session: nil, status: nil, **keyword_args)
       raise "URL is nil or empty, but URL is required" if url.nil? || url.empty?
       # raise "URL is improper. URL must contain zuora.com, zuora.eu, or zuora.na" if /zuora.com|zuora.eu|zuora.na/ === url
-      @url = url.gsub(/(\d{2}\.\d)$/, MIN_Endpoint)
+      @url = url.gsub(/(\d{2}\.\d)$/, MIN_Endpoint) if MIN_Endpoint.to_f > url.scan(/(\d{2}\.\d)$/).dig(0,0).to_f 
       @hostname = /(?<=https:\/\/|http:\/\/)(.*?)(?=\/|$)/.match(url)[0] if !/(?<=https:\/\/|http:\/\/)(.*?)(?=\/|$)/.match(url).nil?
       @entity_id = get_entity_id(entity_id: entity_id)
       @errors = Hash.new
@@ -844,7 +844,7 @@ module ZuoraAPI
       return products, catalog_map
     end
 
-    def get_file(url: nil, headers: {}, count: 3, z_session: true, tempfile: true, output_file_name: nil, add_timestamp: true, file_path: defined?(Rails.root.join('tmp')) ? Rails.root.join('tmp') : Pathname.new(Dir.pwd), timeout_retries: 2, timeout: 120, session_type: :basic, force_encoding: true, **execute_params)
+    def get_file(url: nil, headers: {}, count: 3, z_session: true, tempfile: true, output_file_name: nil, add_timestamp: true, file_path: defined?(Rails.root.join('tmp')) ? Rails.root.join('tmp') : Pathname.new(Dir.pwd), timeout_retries: 2, timeout: 120, session_type: :basic, **execute_params)
       raise "file_path must be of class Pathname" if file_path.class != Pathname
 
       #Make sure directory exists
@@ -870,7 +870,6 @@ module ZuoraAPI
 
             case response
             when Net::HTTPNotFound
-              Rails.logger.fatal("404 - Not Found")
               raise
 
             when Net::HTTPUnauthorized
@@ -881,9 +880,8 @@ module ZuoraAPI
                   raise
                 end
               end
-              Rails.logger.fatal("Unauthorized: Retry")
               self.new_session if z_session
-              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, :force_encoding => force_encoding)
+              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::HTTPClientError
               raise
@@ -948,11 +946,7 @@ module ZuoraAPI
               file_handle.binmode
 
               response.read_body do |chunk|
-                if force_encoding
-                  file_handle << chunk.force_encoding(encoding)
-                else 
-                  file_handle << chunk
-                end
+                file_handle << chunk
 
                 if defined?(export_size) && export_size != 0  && export_size.class == Integer
                   size += chunk.size
@@ -979,9 +973,8 @@ module ZuoraAPI
             raise
           end
         end
-      rescue Exception => e
-        Rails.logger.fatal("Download Failed: #{response_save} - #{e.class} : #{e.message}")
-        Rails.logger.fatal("Download Failed: #{e.backtrace.join("\n")}")
+      rescue => ex
+        Rails.logger.fatal(ex)
         raise
       end
     end

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.6.31"
+  VERSION = "1.6.32"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.6.31
+  version: 1.6.32
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-04 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler