zuora_connect 3.0.2.pre.q → 3.1.0.pre.b

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01f35a8df0d99f5782e2a488d77986dfef279609aac6d88dc0687cb61ca2bc96
-  data.tar.gz: dc67e0d6e8557534ebadc62943e9746f7f6d53397b995b8d9c8708ce88233ba5
+  metadata.gz: 1ab5ac57e2b7a00d075bbc96d9ab724f4bdc6c5ca457469f857eab9db1a7f876
+  data.tar.gz: c4ff526e3ec38ae3bff4a6d3ed1faaf94f45523ec0b59cb46bcfaada4b9aaaca
 SHA512:
-  metadata.gz: '082eef57746ff61b3dcf38b3ab9737c3f96c0e1437698e5e8d47cdcea34e29e3e6bee0e68d3529e073699747b2db2b9cff3fd4ccb9a00ee70c6a4c8ee9922777'
-  data.tar.gz: e44388593aff7b52334dfcc35a1876ba689d66a84defed23b7d5e9f52e55c6d932b35433fe9f8b5b94617e91d435337a6a9bfd48ed03ec5334ac0a2088afe7eb
+  metadata.gz: 150b9b6d81620dbf8005f878ceac204b199009723462e449a8ef7f5498a78244178ddd34cd4ec6a6f6d64b3806e177451f2816576ebfe849ea411b344d1c7c0e
+  data.tar.gz: f7aaa7a5b6cd2e86aa109615c46964268ed3b7e598512ea7f3cbf4f24ddbee6a714b47f7c631aae02d83e16d8219e2b6c3672370ffe49323dfed5169cb3f4456

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,7 +97,12 @@ 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))
+                if additional_types.is_a?(Array)
+                  additional_types.each { |additional_type| initializer.run(additional_type) }
+                else
+                  initializer.run(additional_types)
+                end
                 return true
               end
             rescue => ex
@@ -92,8 +125,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/controllers/helpers.rb

@@ -430,6 +430,7 @@ module ZuoraConnect
             end
 
             if appinstances.size == 1
+              ZuoraConnect.logger.debug("Instance is #{appinstances.to_h.keys.first}")
               @appinstance = ZuoraConnect::AppInstance.find(appinstances.to_h.keys.first)
               session["appInstance"] = @appinstance.id
               ZuoraConnect::ZuoraUser.current_user_id = zuora_user_id

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-q"
+  VERSION = "3.1.0-b"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.0.2.pre.q
+  version: 3.1.0.pre.b
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-06-01 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