zuora_connect 3.0.0.pre.t → 3.0.0.pre.y

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81197d2fca3e19e8602342a820948d21963735397119b0c992cb316452e25bba
-  data.tar.gz: 43466f6d39c34bb60fa13e63a57c70dc23b9466c0a15a21b9f404a368e4efef1
+  metadata.gz: 84a8e3703c93dd6101a516df7b21df42ccc2e3ffcd9e3452c9554eb797a80dfa
+  data.tar.gz: b63dcc260cac82901a95cb53d5146fa1e89609a7ecb0277bb72af590d67a4ee8
 SHA512:
-  metadata.gz: 6265d548693f0ff43e39ea5cbec79db9245023f4bc0891ab9c6f7772b795927ef071fd06cadc67043effc0fdab05ecbca7c8dec6064004fa28723617521593f8
-  data.tar.gz: e1ab4768c5037e459b0111ae1a711c04f0163d061c2460e6e5a6c14e383f5f27ed5eb188d6b891ceb6942784d2e73c03f384896a81799d0e1252ebdfb00a34cd
+  metadata.gz: 53c256ae2635f5a0f502351978c2dd70d2781fbc3daa0b09f0c0d45820d45f3f47eafbde3c6ab9be0bb3841e27a3d4d8c3f27dfb9f901f602db10beefff1d01c
+  data.tar.gz: db3bbb11f4ad1cdc5f5a9dbbd3ddf3a8ea16266f97ab386e8295af3374a95d805aaa594bdb1364c8963d9d681e52edc26fcfe16e784cc91fe027e4967a58191b

data/config/initializers/postgresql_adapter.rb

@@ -10,7 +10,7 @@ module ActiveRecord
 
           return if loaded_from_cache?(initializer)
 
-          if supports_ranges?
+          if Rails::VERSION::MAJOR >= 6 || supports_ranges?
             query = <<-SQL
               SELECT DISTINCT on (t.typname) t.oid, t.typname, t.typelem, t.typdelim, t.typinput, r.rngsubtype, t.typtype, t.typbasetype
               FROM pg_type as t

data/config/initializers/zuora_observability.rb

@@ -1,21 +1,24 @@
+# frozen_string_literal: true
+
 ZuoraObservability.configure do |config|
   config.zecs_service_hook = lambda do |controller|
     custom_payload = {}
-    if controller.instance_variable_defined?(:@appinstance)
-      appinstance = controller.instance_variable_get(:@appinstance)
-      if appinstance.logitems.present? && appinstance.logitems.class == Hash
-        ActiveSupport::Deprecation.warn("logitems is deprecated, please use zecs_service_hook. See 'https://gitlab.zeta.tools/extension-products/incubating-projects/zuora_observability/-/blob/master/doc/logging.md' for more details.")
-        custom_payload.merge!(appinstance.logitems)
-      end
+    appinstance = controller.instance_variable_get(:@appinstance)
+
+    if appinstance&.logitems.present? && appinstance.logitems.class == Hash
+      ActiveSupport::Deprecation.warn("logitems is deprecated, please use zecs_service_hook. See 'https://gitlab.zeta.tools/extension-products/incubating-projects/zuora_observability/-/blob/master/doc/logging.md' for more details.")
+      custom_payload.merge!(appinstance.logitems)
     end
+
     custom_payload
   end
+
   config.add_custom_payload_hook do |controller|
     custom_payload = {}
-    if controller.instance_variable_defined?(:@appinstance)
-      appinstance = controller.instance_variable_get(:@appinstance)
-      custom_payload.merge!({ email: appinstance.connect_user })
-    end
+    appinstance = controller.instance_variable_get(:@appinstance)
+
+    custom_payload.merge!({ email: appinstance.connect_user }) if appinstance
+
     custom_payload
   end
 end

data/lib/zuora_connect.rb

@@ -31,6 +31,14 @@ module ZuoraConnect
         @logger ||= ZuoraObservability::Logger.custom_logger(name: "Connect", level: Rails.logger.level)
       end
     end
+
+    def app_name
+      if Rails::VERSION::MAJOR >= 6
+        Rails.application.class.module_parent_name
+      else
+        Rails.application.class.parent_name
+      end
+    end
   end
 
   module Controllers
@@ -86,7 +94,7 @@ module ZuoraConnect
       ignore_url_patterns: ['^\/admin\/resque.*', '^\/admin\/redis.*', '^\/admin\/peek.*', '^\/peek.*'],
       verify_server_cert: false,
       log_level: Logger::INFO,
-      service_name: ENV['DEIS_APP'].present? ? ENV['DEIS_APP'] : Rails.application.class.parent_name,
+      service_name: ENV['DEIS_APP'].present? ? ENV['DEIS_APP'] : ZuoraConnect.app_name,
       logger: ZuoraObservability::Logger.custom_logger(name: "ElasticAPM", level: Logger::WARN)
     })
     defaults.merge!({disable_send: true}) if defined?(Rails::Console)

data/lib/zuora_connect/configuration.rb

@@ -43,7 +43,7 @@ module ZuoraConnect
       @dev_mode_access_key_id = nil
       @aws_region = "us-west-2"
       @s3_bucket_name = "rbm-apps"
-      @s3_folder_name = Rails.application.class.parent_name
+      @s3_folder_name = ZuoraConnect.app_name
     end
 
     def private_key

data/lib/zuora_connect/controllers/helpers.rb

@@ -550,11 +550,11 @@ module ZuoraConnect
             final_error = output_xml.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text
             session.clear
             if final_error.blank?
-              ZuoraConnect.logger.warn("UI Authorization Error", ex, zuora: zuora_details.merge({:error => response.body}))
+              ZuoraConnect.logger.warn("UI Authorization Error", ex, response: { params: response.body })
             elsif final_error != "INVALID_SESSION"
-              ZuoraConnect.logger.warn("UI Authorization Error", ex, zuora: zuora_details.merge({:error => final_error}))
+              ZuoraConnect.logger.warn("UI Authorization Error", ex, response: { params: final_error })
             else
-              ZuoraConnect.logger.info("UI Authorization Error", ex, zuora: zuora_details.merge({:error => final_error}))
+              ZuoraConnect.logger.info("UI Authorization Error", ex, response: { params: final_error })
             end
             redirect_to "https://#{zuora_host}/apps/newlogin.do?retURL=#{request.fullpath}"
             return

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "3.0.0-t"
+  VERSION = "3.0.0-y"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.t
+  version: 3.0.0.pre.y
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-07 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -109,7 +109,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: raindrops
   requirement: !ruby/object:Gem::Requirement