brick 1.0.101 → 1.0.102

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eba38d653370b0cc3e98f2adc82d8c475854440745bd35caab9a9a4253fc152c
-  data.tar.gz: 18ca517b90266cf5db711040a7f40c8e848600135ef0a39ad91da9cd2a0b1c89
+  metadata.gz: 167e29431250efc9170ec3f174cce913584c700ce8405a0d275c63636d04cf81
+  data.tar.gz: 34826b000c093ab4fb8d63edd4509d8244f3d5e3712066489e00076f67ba9704
 SHA512:
-  metadata.gz: 859f48999fb0e8d1010a701e29c9f0275f716b20f54b4348576f4dbff7f68da1eb83709a51a1a7acd7debaf4dc1f82e863048ef16cda6b5f59862246e0c50787
-  data.tar.gz: d93c3db79715f62705c0b8f2f5bd2640a2756e1fbcb6aa6a7cf017a18bc31fa5e98496ea41539611c149f84870f24596c105d146484519b7f040d2f36b25ce45
+  metadata.gz: e0d8d82c98b918c2a6b61c06a636ce60e2c4eaaed32b9556b09984f0b778f624cfb887cf9d82d48042cb75057b1e3688be661c05fa9c79f90052da32d029e1b2
+  data.tar.gz: 53c296598e9bc85ca2afd5456ff02d3c56fde7f79cd6de9f4684c5fcef0ad1be489e6ccda37c26b81a109393de1a10fa70a08d352825e69437ffdcd8b2bb2bfe

data/lib/brick/extensions.rb

@@ -119,30 +119,32 @@ module ActiveRecord
               end
               s << part_sym
             end
-            if (parts = prefix + first_parts + [parts[-1]]).length > 1 && klass
-              unless is_polymorphic
-                s = build_array
-                parts[0..-3].each { |v| s = s[v.to_sym] }
-                s[parts[-2]] = nil # unless parts[-2].empty? # Using []= will "hydrate" any missing part(s) in our whole series
-              end
-              translations[parts[0..-2].join('.')] = klass
-            end
-            if klass&.column_names.exclude?(parts.last) &&
-               (klass = (orig_class = klass).reflect_on_association(possible_dsl = parts.pop.to_sym)&.klass)
-              if prefix.empty? # Custom columns start with an empty prefix
-                prefix << parts.shift until parts.empty?
+            if first_parts
+              if (parts = prefix + first_parts + [parts[-1]]).length > 1 && klass
+                unless is_polymorphic
+                  s = build_array
+                  parts[0..-3].each { |v| s = s[v.to_sym] }
+                  s[parts[-2]] = nil # unless parts[-2].empty? # Using []= will "hydrate" any missing part(s) in our whole series
+                end
+                translations[parts[0..-2].join('.')] = klass
               end
-              # Expand this entry which refers to an association name
-              members2, dsl2a = klass.brick_parse_dsl(build_array, prefix + [possible_dsl], translations, is_polymorphic, nil, true)
-              members += members2
-              dsl2 << dsl2a
-              dsl3 << dsl2a
-            else
-              dsl2 << "[#{bracket_name}]"
-              if emit_dsl
-                dsl3 << "[#{prefix[1..-1].map { |p| "#{p.to_s}." }.join if prefix.length > 1}#{bracket_name}]"
+              if klass&.column_names.exclude?(parts.last) &&
+                (klass = (orig_class = klass).reflect_on_association(possible_dsl = parts.pop.to_sym)&.klass)
+                if prefix.empty? # Custom columns start with an empty prefix
+                  prefix << parts.shift until parts.empty?
+                end
+                # Expand this entry which refers to an association name
+                members2, dsl2a = klass.brick_parse_dsl(build_array, prefix + [possible_dsl], translations, is_polymorphic, nil, true)
+                members += members2
+                dsl2 << dsl2a
+                dsl3 << dsl2a
+              else
+                dsl2 << "[#{bracket_name}]"
+                if emit_dsl
+                  dsl3 << "[#{prefix[1..-1].map { |p| "#{p.to_s}." }.join if prefix.length > 1}#{bracket_name}]"
+                end
+                members << parts
               end
-              members << parts
             end
             bracket_name = nil
           else
@@ -409,7 +411,7 @@ module ActiveRecord
       model._brick_calculate_bts_hms(translations, join_array) if is_add_bts || is_add_hms
 
       is_postgres = ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
-      is_mysql = ActiveRecord::Base.connection.adapter_name == 'Mysql2'
+      is_mysql = ['Mysql2', 'Trilogy'].include?(ActiveRecord::Base.connection.adapter_name)
       is_mssql = ActiveRecord::Base.connection.adapter_name == 'SQLServer'
       is_distinct = nil
       wheres = {}
@@ -557,7 +559,7 @@ module ActiveRecord
               brick_link = rel_dupe.brick_links[sel_col.first]
               field_tbl_name = brick_link&.split('.')&.last ||
                 # ... so here's a best-effort guess for what the table name might be.
-                rel_dupe.klass.reflect_on_association(sel_col.first).klass.table_name
+                rel_dupe.klass.reflect_on_association(sel_col.first)&.klass&.table_name
               # If it's Oracle, quote any AREL aliases that had been applied
               field_tbl_name = "\"#{field_tbl_name}\"" if ::Brick.is_oracle && rel_dupe.brick_links.values.include?(field_tbl_name)
 
@@ -803,7 +805,7 @@ JOIN (SELECT #{hm_selects.map { |s| "#{'br_t0.' if from_clause}#{s}" }.join(', '
       alias _brick_find_sti_class find_sti_class
       def find_sti_class(type_name)
         if ::Brick.sti_models.key?(type_name ||= name)
-          _brick_find_sti_class(type_name)
+          ::Brick.sti_models[type_name].fetch(:base, nil) || _brick_find_sti_class(type_name)
         else
           # This auto-STI is more of a brute-force approach, building modules where needed
           # The more graceful alternative is the overload of ActiveSupport::Dependencies#autoload_module! found below
@@ -1407,7 +1409,7 @@ class Object
       singular_table_name = ActiveSupport::Inflector.singularize(ActiveSupport::Inflector.underscore(plural_class_name))
       pk = model&._brick_primary_key(relations.fetch(table_name, nil))
       is_postgres = ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
-      is_mysql = ActiveRecord::Base.connection.adapter_name == 'Mysql2'
+      is_mysql = ['Mysql2', 'Trilogy'].include?(ActiveRecord::Base.connection.adapter_name)
 
       code = +"class #{class_name} < #{controller_base&.name || 'ApplicationController'}\n"
       built_controller = Class.new(controller_base || ActionController::Base) do |new_controller_class|
@@ -1622,6 +1624,18 @@ class Object
         end
 
         unless is_openapi || is_avo
+          # Skip showing Bullet gem optimisation messages
+          if Object.const_defined?('Bullet') && Bullet.respond_to?(:enable?)
+            around_action :skip_bullet
+            def skip_bullet
+              bullet_enabled = Bullet.enable?
+              Bullet.enable = false
+              yield
+            ensure
+              Bullet.enable = bullet_enabled
+            end
+          end
+
           _, order_by_txt = model._brick_calculate_ordering(default_ordering(table_name, pk)) if pk
           code << "  def index\n"
           code << "    @#{table_name.pluralize} = #{model.name}#{pk&.present? ? ".order(#{order_by_txt.join(', ')})" : '.all'}\n"
@@ -1935,7 +1949,7 @@ end.class_exec do
             puts "*** In the brick.rb initializer the line \"::Brick.schema_behavior = ...\" refers to schema(s) called #{possible_schemas.map { |s| "\"#{s}\"" }.join(', ')}.  No mentioned schema exists. ***"
           end
         end
-      when 'Mysql2'
+      when 'Mysql2', 'Trilogy'
         ::Brick.default_schema = schema = ActiveRecord::Base.connection.current_database
       when 'OracleEnhanced'
         # ActiveRecord::Base.connection.current_database will be something like "XEPDB1"
@@ -2070,7 +2084,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
       # end
       # schema = ::Brick.default_schema # Reset back for this next round of fun
       case ActiveRecord::Base.connection.adapter_name
-      when 'PostgreSQL', 'Mysql2', 'SQLServer'
+      when 'PostgreSQL', 'Mysql2', 'Trilogy', 'SQLServer'
         sql = "SELECT kcu1.CONSTRAINT_SCHEMA, kcu1.TABLE_NAME, kcu1.COLUMN_NAME,
             kcu2.CONSTRAINT_SCHEMA AS primary_schema, kcu2.TABLE_NAME AS primary_table, kcu1.CONSTRAINT_NAME AS CONSTRAINT_SCHEMA_FK
           FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS AS rc

data/lib/brick/frameworks/rails/engine.rb

@@ -625,7 +625,7 @@ def display_value(col_type, val)
   case col_type
   when 'geometry', 'geography'
     if Object.const_defined?('RGeo')
-      @is_mysql = ActiveRecord::Base.connection.adapter_name == 'Mysql2' if @is_mysql.nil?
+      @is_mysql = ['Mysql2', 'Trilogy'].include?(ActiveRecord::Base.connection.adapter_name) if @is_mysql.nil?
       @is_mssql = ActiveRecord::Base.connection.adapter_name == 'SQLServer' if @is_mssql.nil?
       val_err = nil
       if @is_mysql || @is_mssql
@@ -659,6 +659,8 @@ def display_value(col_type, val)
     else
       '(Add RGeo gem to parse geometry detail)'
     end
+  when :binary
+    display_binary(val) if val
   else
     if col_type
       hide_bcrypt(val)
@@ -667,6 +669,40 @@ def display_value(col_type, val)
     end
   end
 end
+
+def image_signatures
+  @image_signatures ||= { \"\\xFF\\xD8\\xFF\\xEE\" => 'jpeg',
+                          \"\\xFF\\xD8\\xFF\\xE0\\x00\\x10\\x4A\\x46\\x49\\x46\\x00\\x01\" => 'jpeg',
+                          \"\\x89PNG\\r\\n\\x1A\\n\" => 'png',
+                          '<svg' => 'svg+xml', # %%% Not yet very good detection for SVG
+                          'BM' => 'bmp',
+                          'GIF87a' => 'gif',
+                          'GIF89a' => 'gif' }
+end
+def display_binary(val)
+  if val[0..1] == \"\\x15\\x1C\" # One of those goofy Microsoft OLE containers?
+    package_header_length = val[2..3].bytes.reverse.inject(0) {|m, b| (m << 8) + b }
+    # This will often be just FF FF FF FF
+    # object_size = val[16..19].bytes.reverse.inject(0) {|m, b| (m << 8) + b }
+    friendly_and_class_names = val[20...package_header_length].split(\"\\0\")
+    object_type_name_length = val[package_header_length + 8..package_header_length+11].bytes.reverse.inject(0) {|m, b| (m << 8) + b }
+    friendly_and_class_names << val[package_header_length + 12...package_header_length + 12 + object_type_name_length].strip
+    # friendly_and_class_names will now be something like:  ['Bitmap Image', 'Paint.Picture', 'PBrush']
+    real_object_size = val[package_header_length + 20 + object_type_name_length..package_header_length + 23 + object_type_name_length].bytes.reverse.inject(0) {|m, b| (m << 8) + b }
+    object_start = package_header_length + 24 + object_type_name_length
+    val = val[object_start...object_start + real_object_size]
+  end
+  if (signature = image_signatures.find { |k, _v| val[0...k.length] == k })
+    if val.length < 500_000
+      \"<img src=\\\"data:image/#\{signature.last};base64,#\{Base64.encode64(val)}\\\">\"
+    else
+      \"&lt;&nbsp;#\{signature.last} image, #\{val.length} bytes&nbsp;>\"
+    end
+  else
+    \"&lt;&nbsp;Binary, #\{val.length} bytes&nbsp;>\"
+  end
+end
+
 # Accommodate composite primary keys that include strings with forward-slash characters
 def slashify(*vals)
   vals.map { |val_part| val_part.is_a?(String) ? val_part.gsub('/', '^^sl^^') : val_part }
@@ -1576,11 +1612,10 @@ document.querySelectorAll(\"input, select\").forEach(function (inp) {
             private
 
               alias _brick_render_template render_template
-              def render_template(view, template, *args)
-                result = _brick_render_template(view, template, *args)
-                if template.instance_variable_get(:@is_brick)
-                  Apartment::Tenant.switch!(::Brick.apartment_default_tenant) if ::Brick.apartment_multitenant
-                end
+              def render_template(view, template, layout_name, *args)
+                layout_name = nil if (is_brick = template.instance_variable_get(:@is_brick)) && layout_name.is_a?(Proc)
+                result = _brick_render_template(view, template, layout_name, *args)
+                Apartment::Tenant.switch!(::Brick.apartment_default_tenant) if is_brick && ::Brick.apartment_multitenant
                 result
               end
           end # TemplateRenderer

data/lib/brick/frameworks/rails/form_tags.rb

@@ -3,7 +3,7 @@ module Brick::Rails::FormTags
   def brick_grid(relation, bt_descrip, sequence = nil, inclusions, exclusions,
                  cols, poly_cols, bts, hms_keys, hms_cols)
     out = "<table id=\"headerTop\"></table>
-<table id=\"#{relation.table_name}\" class=\"shadow\">
+<table id=\"#{relation.table_name.split('.').last}\" class=\"shadow\">
   <thead><tr>"
     pk = (klass = relation.klass).primary_key || []
     pk = [pk] unless pk.is_a?(Array)
@@ -90,6 +90,7 @@ module Brick::Rails::FormTags
             # 0..62 because Postgres column names are limited to 63 characters
             obj, descrips[0..-2].map { |id| obj.send(id.last[0..62]) }, bt_id_col
           )
+          bt_txt = display_binary(bt_txt).html_safe if bt_txt&.encoding&.name == 'ASCII-8BIT'
           bt_txt ||= "<span class=\"orphan\">&lt;&lt; Orphaned ID: #{val} >></span>" if val
           bt_id = bt_id_col&.map { |id_col| obj.respond_to?(id_sym = id_col.to_sym) ? obj.send(id_sym) : id_col }
           out << (bt_id&.first ? link_to(bt_txt, send("#{bt_class.base_class._brick_index(:singular)}_path".to_sym, bt_id)) : bt_txt || '')

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 101
+    TINY = 102
 
     # PRE is nil unless it's a pre-release (beta, RC, etc.)
     PRE = nil

data/lib/brick.rb

@@ -26,7 +26,7 @@ end
 require 'brick/util'
 
 # Allow ActiveRecord < 3.2 to work with Ruby 2.7 and later
-if (ruby_version = ::Gem::Version.new(RUBY_VERSION)) >= ::Gem::Version.new('2.7')
+if (is_ruby_2_7 = (ruby_version = ::Gem::Version.new(RUBY_VERSION)) >= ::Gem::Version.new('2.7'))
   if ActiveRecord.version < ::Gem::Version.new('3.2')
     # Remove circular reference for "now"
     ::Brick::Util._patch_require(
@@ -1043,6 +1043,18 @@ ActiveSupport.on_load(:active_record) do
   end
   # rubocop:enable Lint/ConstantDefinitionInBlock
 
+  arsc = ::ActiveRecord::StatementCache
+  if is_ruby_2_7 && (params = arsc.method(:create).parameters).length == 2 && params.last == [:opt, :block]
+    arsc.class_exec do
+      def self.create(connection, callable = nil, &block)
+        relation = (callable || block).call ::ActiveRecord::StatementCache::Params.new
+        bind_map = ::ActiveRecord::StatementCache::BindMap.new relation.bound_attributes
+        query_builder = connection.cacheable_query(self, relation.arel)
+        new query_builder, bind_map
+      end
+    end
+  end
+
   # Rails < 4.2 is not innately compatible with Ruby 2.4 and later, and comes up with:
   # "TypeError: Cannot visit Integer" unless we patch like this:
   if ruby_version >= ::Gem::Version.new('2.4') &&
@@ -1081,11 +1093,54 @@ ActiveSupport.on_load(:active_record) do
     end
   end
 
+  if Psych.respond_to?(:unsafe_load) && ActiveRecord.version < ::Gem::Version.new('6.1')
+    Psych.class_exec do
+      class << self
+        alias _original_load load
+        def load(yaml, *args, **kwargs)
+          if caller.first.end_with?("`database_configuration'") && kwargs[:aliases].nil?
+            kwargs[:aliases] = true
+          end
+          _original_load(yaml, *args, **kwargs)
+        end
+      end
+    end
+  end
+
+  # def aliased_table_for(arel_table, table_name = nil)
+  #   table_name ||= arel_table.name
+
+  #   if aliases[table_name] == 0
+  #     # If it's zero, we can have our table_name
+  #     aliases[table_name] = 1
+  #     arel_table = arel_table.alias(table_name) if arel_table.name != table_name
+  #   else
+  #     # Otherwise, we need to use an alias
+  #     aliased_name = @connection.table_alias_for(yield)
+
+  #     # Update the count
+  #     count = aliases[aliased_name] += 1
+
+  #     aliased_name = "#{truncate(aliased_name)}_#{count}" if count > 1
+
+  #     arel_table = arel_table.alias(aliased_name)
+  #   end
+
+  #   arel_table
+  # end
+  # def aliased_table_for(table_name, aliased_name, type_caster)
+
   class ActiveRecord::Associations::JoinDependency
-    if JoinBase.instance_method(:initialize).arity == 2 # Older ActiveRecord 4.x?
-      def initialize(base, associations, joins)
-        @alias_tracker = ::ActiveRecord::Associations::AliasTracker.create(base.connection, joins)
-        @alias_tracker.aliased_table_for(base.table_name, base.table_name) # Updates the count for base.table_name to 1
+    if JoinBase.instance_method(:initialize).arity == 2 # Older ActiveRecord <= 5.1?
+      def initialize(base, associations, joins, eager_loading: true)
+        araat = ::ActiveRecord::Associations::AliasTracker
+        if araat.respond_to?(:create_with_joins) # Rails 5.0 and 5.1
+          @alias_tracker = araat.create_with_joins(base.connection, base.table_name, joins)
+          @eager_loading = eager_loading # (Unused in Rails 5.0)
+        else # Rails 4.2
+          @alias_tracker = araat.create(base.connection, joins)
+          @alias_tracker.aliased_table_for(base, base.table_name) # Updates the count for base.table_name to 1
+        end
         tree = self.class.make_tree associations
 
         # Provide a way to find the original relation that this tree is being used for
@@ -1098,7 +1153,7 @@ ActiveSupport.on_load(:active_record) do
         @join_root.children.each { |child| construct_tables! @join_root, child }
       end
 
-    else # For ActiveRecord 5.0 - 7.1
+    else # For ActiveRecord 5.2 - 7.1
 
       def initialize(base, table, associations, join_type = nil)
         tree = self.class.make_tree associations
@@ -1245,13 +1300,13 @@ module ActiveRecord
 
     if private_instance_methods.include?(:build_join_query)
       alias _brick_build_join_query build_join_query
-      def build_join_query(manager, buckets, *args)
+      def build_join_query(manager, buckets, *args) # , **kwargs)
         # %%% Better way to bring relation into the mix
         if (aj = buckets.fetch(:association_join, nil))
           aj.instance_variable_set(:@relation, self)
         end
 
-        _brick_build_join_query(manager, buckets, *args)
+        _brick_build_join_query(manager, buckets, *args) # , **kwargs)
       end
 
     else
@@ -1433,4 +1488,85 @@ if Gem::Specification.all_names.any? { |g| g.start_with?('ransack-') }
   end
 end
 
+# Keyword arguments updates for Rails <= 5.2.x and Ruby >= 3.0
+if ActiveRecord.version < ::Gem::Version.new('6.0') && ruby_version >= ::Gem::Version.new('3.0')
+  admsm = ActionDispatch::MiddlewareStack::Middleware
+  admsm.class_exec do
+    # redefine #build
+    def build(app, **kwargs)
+      # puts klass.name
+      if args.length > 1 && args.last.is_a?(Hash)
+        kwargs.merge!(args.pop)
+      end
+      # binding.pry if klass == ActionDispatch::Static # ActionDispatch::Reloader
+      klass.new(app, *args, **kwargs, &block)
+    end
+  end
+
+  require 'active_model'
+  require 'active_model/type'
+  require 'active_model/type/value'
+  class ActiveModel::Type::Value
+    def initialize(*args, precision: nil, limit: nil, scale: nil)
+      @precision = precision
+      @scale = scale
+      @limit = limit
+    end
+  end
+
+  if Object.const_defined?('I18n')
+    module I18n::Base
+      alias _brick_translate translate
+      def translate(key = nil, *args, throw: false, raise: false, locale: nil, **options)
+        options.merge!(args.pop) if args.length > 0 && args.last.is_a?(Hash)
+        _brick_translate(key = nil, throw: false, raise: false, locale: nil, **options)
+      end
+    end
+  end
+
+  module ActionController::RequestForgeryProtection
+  private
+
+    # Creates the authenticity token for the current request.
+    def form_authenticity_token(*args, form_options: {}) # :doc:
+      form_options.merge!(args.pop) if args.length > 0 && args.last.is_a?(Hash)
+      masked_authenticity_token(session, form_options: form_options)
+    end
+  end
+
+  module ActiveSupport
+    class MessageEncryptor
+      def encrypt_and_sign(value, *args, expires_at: nil, expires_in: nil, purpose: nil)
+        encrypted = if method(:_encrypt).arity == 1
+                      _encrypt(value) # Rails <= 5.1
+                    else
+                      if args.length > 0 && args.last.is_a?(Hash)
+                        expires_at ||= args.last[:expires_at]
+                        expires_in ||= args.last[:expires_in]
+                        purpose ||= args.last[:purpose]
+                      end
+                      _encrypt(value, expires_at: expires_at, expires_in: expires_in, purpose: purpose)
+                    end
+        verifier.generate(encrypted)
+      end
+    end
+    if const_defined?('Messages')
+      class Messages::Metadata
+        def self.wrap(message, *args, expires_at: nil, expires_in: nil, purpose: nil)
+          if args.length > 0 && args.last.is_a?(Hash)
+            expires_at ||= args.last[:expires_at]
+            expires_in ||= args.last[:expires_in]
+            purpose ||= args.last[:purpose]
+          end
+          if expires_at || expires_in || purpose
+            JSON.encode new(encode(message), pick_expiry(expires_at, expires_in), purpose)
+          else
+            message
+          end
+        end
+      end
+    end
+  end
+end
+
 require 'brick/extensions'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.101
+  version: 1.0.102
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-17 00:00:00.000000000 Z
+date: 2023-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.42.0
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement