zuora_connect 3.0.2.pre.r → 3.1.0.pre.c

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ecdf8f8f9c3944d22e09dd3a485a9f48c753c31bc36b50f75dcb3e6595c31cc
-  data.tar.gz: 3e831ee5ab33f33359c8f8f24e74807ceb3d7892a2ba790f180bd1a4e86cec2f
+  metadata.gz: 97665e840ec7fc2825cecb5a32829f13f6424e7d69aabffefce2826f8107ce4d
+  data.tar.gz: 9667455c3c021995b8037b3dbccffb988fb70c0f4dfebfae852313f0b9a6fdaf
 SHA512:
-  metadata.gz: d74ce6e6d797f98b893dc1d31e7f94e73078e79d450091006a683d57622d696cfd2ba3671f20b43326b88536a32715390079abd6ca3f76c654a60eb19dd795d5
-  data.tar.gz: 8123cfa9855feab65958728fc843bee6c2bee11f931172069a92f33e2e969d57c68bef5013e5628daeb0575ccf6fbbd9552735b7166e0ef4e49ab6634939f964
+  metadata.gz: 3eec1dd133e3274fd09f0817d1aea463a3fbf0a266b51a320273a8fc5628fda91c4fd365647909691e32b062f389522db63400ebc56e73c4aaa4e0d9a7bb2f2b
+  data.tar.gz: 52ddcd7e7cbcb39adebe2f718306d7acb75ca3269221e4bff80524a15d9ab58a03ec4a51cccaec5e659d7672a2e39829353f9a31c120323b4b5bc4abba4576e9

data/app/models/zuora_connect/app_instance_base.rb

@@ -5,7 +5,7 @@ module ZuoraConnect
   require 'aws-sdk-ses'
   require 'aws-sdk-kms'
   class AppInstanceBase < ActiveRecord::Base
-    default_scope {select(ZuoraConnect::AppInstance.column_names.delete_if {|x| ["catalog_mapping", "catalog"].include?(x) }) }
+    default_scope { select(ZuoraConnect::AppInstance.column_names.reject { |x| ["catalog_mapping", "catalog"].include?(x) }) }
     after_initialize :init
     after_create :initialize_redis_placeholders
     before_destroy :prune_data

data/config/initializers/postgresql_adapter.rb

@@ -5,7 +5,35 @@ module ActiveRecord
       SCHEMA_ADDITIONAL_TYPES = 'SchemaAdditionalTypes'.freeze
 
       private
-        def load_additional_types_latest(oids = nil)
+        def load_additional_types_rails_7_0(oids = nil)
+          initializer = OID::TypeMapInitializer.new(type_map)
+          return if loaded_from_cache?(initializer)
+          additional_types = []
+          load_types_queries(initializer, oids) do |query|
+            execute_and_clear(query, "SCHEMA", []) do |records|
+              additional_types.push(records.to_a)
+              initializer.run(records)
+            end
+          end
+          cache_additional_types(additional_types)
+        end
+
+        def load_types_queries(initializer, oids)
+          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
+              LEFT JOIN pg_range as r ON oid = rngtypid
+          SQL
+          if oids
+            yield query + "WHERE t.oid IN (%s)" % oids.join(", ")
+          else
+            yield query + initializer.query_conditions_for_known_type_names
+            yield query + initializer.query_conditions_for_known_type_types
+            yield query + initializer.query_conditions_for_array_types
+          end
+        end
+
+        def load_additional_types_rails_5_2(oids = nil)
           initializer = OID::TypeMapInitializer.new(type_map)
 
           return if loaded_from_cache?(initializer)
@@ -69,10 +97,28 @@ module ActiveRecord
           if defined?(Redis.current)
             begin
               if Redis.current.exists(SCHEMA_ADDITIONAL_TYPES)
-                initializer.run(JSON.parse(Redis.current.get(SCHEMA_ADDITIONAL_TYPES)))
+                additional_types = JSON.parse(Redis.current.get(SCHEMA_ADDITIONAL_TYPES))
+
+                rails_version = Rails.version.split('.').map { |x| x.to_i }
+                if (rails_version <=> [7, 0, 0]) >= 1
+                  if additional_types.is_a?(Array) && !additional_types.first.is_a?(Array)
+                    raise 'incompatible cache version'
+                  end
+                elsif (rails_version <=> [5, 2, 0]) >= 1
+                  if additional_types.is_a?(Array) && additional_types.first.is_a?(Array)
+                    raise 'incompatible cache version'
+                  end
+                end
+
+                if additional_types.is_a?(Array) && additional_types.first.is_a?(Array)
+                  additional_types.each { |additional_type| initializer.run(additional_type) }
+                else
+                  initializer.run(additional_types)
+                end
                 return true
               end
             rescue => ex
+              Redis.current.del(SCHEMA_ADDITIONAL_TYPES)
               Rails.logger.warn('Exception occurred while loading additional types', ex)
             end
           end
@@ -92,8 +138,10 @@ module ActiveRecord
 
 
         rails_version = Rails.version.split('.').map { |x| x.to_i }
-        if (rails_version <=> [5, 2, 0]) >= 1
-          alias :load_additional_types :load_additional_types_latest
+        if (rails_version <=> [7, 0, 0]) >= 1
+          alias :load_additional_types :load_additional_types_rails_7_0
+        elsif(rails_version <=> [5, 2, 0]) >= 1
+          alias :load_additional_types :load_additional_types_rails_5_2
         else
           alias :load_additional_types :load_additional_types_deprecated
         end

data/lib/zuora_connect/engine.rb

@@ -28,12 +28,10 @@ module ZuoraConnect
       end
     end
 
-    initializer "connect.helpers" do
-      ActiveSupport.on_load(:action_controller) do
-        include ZuoraConnect::Controllers::Helpers
-        include ZuoraConnect::Authenticate
-        helper ZuoraConnect::ApplicationHelper
-      end
+    config.to_prepare do
+      ActionController::Base.send(:include, ZuoraConnect::Controllers::Helpers)
+      ActionController::Base.send(:include, ZuoraConnect::Authenticate)
+      ActionController::Base.send(:helper, ZuoraConnect::ApplicationHelper)
     end
   end
 end

data/lib/zuora_connect/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZuoraConnect
-  VERSION = "3.0.2-r"
+  VERSION = "3.1.0-c"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.0.2.pre.r
+  version: 3.1.0.pre.c
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-19 00:00:00.000000000 Z
+date: 2022-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -121,9 +121,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -131,9 +128,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: raindrops
   requirement: !ruby/object:Gem::Requirement