brick 1.0.102 → 1.0.104

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 167e29431250efc9170ec3f174cce913584c700ce8405a0d275c63636d04cf81
-  data.tar.gz: 34826b000c093ab4fb8d63edd4509d8244f3d5e3712066489e00076f67ba9704
+  metadata.gz: 6d30161a8558282149a49e7eafbd43bb175ce95574178c65a75323eaacf96422
+  data.tar.gz: 6d56c5e77c2a0d120bc8e878bde9d33fdfa7d58bed690a21fea176d5d6b55d50
 SHA512:
-  metadata.gz: e0d8d82c98b918c2a6b61c06a636ce60e2c4eaaed32b9556b09984f0b778f624cfb887cf9d82d48042cb75057b1e3688be661c05fa9c79f90052da32d029e1b2
-  data.tar.gz: 53c296598e9bc85ca2afd5456ff02d3c56fde7f79cd6de9f4684c5fcef0ad1be489e6ccda37c26b81a109393de1a10fa70a08d352825e69437ffdcd8b2bb2bfe
+  metadata.gz: 14bfffec6fd768d4b3abff2b3ceaeb2a2dca29b167edd64c2e57a63c72eaa70bf46fc8056af25fca86812bfac63d3b793bdeaf7f13a8c2ba7834ac9e65f1fb16
+  data.tar.gz: 97f7c94051bb068c4d8bdb5e847e53576c8ebbe18d5c4c93e12d52566008ac612bb40f7088ba81fea21337a3c13c29f366fb993b77f2f88f9fbddea4ffb95982

data/lib/brick/extensions.rb

@@ -77,14 +77,13 @@ module ActiveRecord
     def self.brick_get_dsl
       # If there's no DSL yet specified, just try to find the first usable column on this model
       unless (dsl = ::Brick.config.model_descrips[name])
-        descrip_col = (columns.map(&:name) - _brick_get_fks -
-                      (::Brick.config.metadata_columns || []) -
-                      [primary_key]).first
-        dsl = ::Brick.config.model_descrips[name] = if descrip_col
-                                                      "[#{descrip_col}]"
-                                                    elsif (pk_parts = self.primary_key.is_a?(Array) ? self.primary_key : [self.primary_key])
-                                                      "#{name} ##{pk_parts.map { |pk_part| "[#{pk_part}]" }.join(', ')}"
-                                                    end
+        skip_columns = _brick_get_fks + (::Brick.config.metadata_columns || []) + [primary_key]
+        dsl = if (descrip_col = columns.find { |c| [:boolean, :binary, :xml].exclude?(c.type) && skip_columns.exclude?(c.name) })
+                "[#{descrip_col.name}]"
+              elsif (pk_parts = self.primary_key.is_a?(Array) ? self.primary_key : [self.primary_key])
+                "#{name} ##{pk_parts.map { |pk_part| "[#{pk_part}]" }.join(', ')}"
+              end
+        ::Brick.config.model_descrips[name] = dsl
       end
       dsl
     end
@@ -129,7 +128,7 @@ module ActiveRecord
                 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)
+                 (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
@@ -258,11 +257,11 @@ module ActiveRecord
       assoc_html_name ? "#{assoc_name}-#{link}".html_safe : link
     end
 
-    def self._brick_index(mode = nil)
+    def self._brick_index(mode = nil, separator = '_')
       tbl_parts = ((mode == :singular) ? table_name.singularize : table_name).split('.')
       tbl_parts.shift if ::Brick.apartment_multitenant && tbl_parts.length > 1 && tbl_parts.first == ::Brick.apartment_default_tenant
       tbl_parts.unshift(::Brick.config.path_prefix) if ::Brick.config.path_prefix
-      index = tbl_parts.map(&:underscore).join('_')
+      index = tbl_parts.map(&:underscore).join(separator)
       # Rails applies an _index suffix to that route when the resource name is singular
       index << '_index' if mode != :singular && index == index.singularize
       index
@@ -397,6 +396,8 @@ module ActiveRecord
   end
 
   class Relation
+    attr_accessor :_brick_page_num
+
     # Links from ActiveRecord association pathing names over to real table correlation names
     # that get chosen when the AREL AST tree is walked.
     def brick_links
@@ -786,8 +787,21 @@ JOIN (SELECT #{hm_selects.map { |s| "#{'br_t0.' if from_clause}#{s}" }.join(', '
         end
         self.order_values |= final_order_by # Same as:  order!(*final_order_by)
       end
-      # Don't want to get too carried away just yet
-      self.limit_value = 1000 # Same as:  limit!(1000)
+      if (page = params['_brick_page']&.to_i)
+        page = 1 if page < 1
+        limit = params['_brick_page_size'] || 1000
+        offset = (page - 1) * limit.to_i
+      else
+        offset = params['_brick_offset']
+        limit = params['_brick_limit']
+      end
+      if offset.is_a?(Numeric) || offset&.present?
+        offset = offset.to_i
+        self.offset_value = offset unless offset == 0
+        @_brick_page_num = (offset / limit.to_i) + 1 if limit&.!= 0 && (offset % limit.to_i) == 0
+      end
+      # By default just 1000 rows  (Like doing:  limit!(1000)  but this way is compatible with AR <= 4.2)
+      self.limit_value = limit&.to_i || 1000 unless limit.is_a?(String) && limit.empty?
       wheres unless wheres.empty? # Return the specific parameters that we did use
     end
 
@@ -805,7 +819,8 @@ 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.sti_models[type_name].fetch(:base, nil) || _brick_find_sti_class(type_name)
+          # Used to be:  ::Brick.sti_models[type_name].fetch(:base, nil) || _brick_find_sti_class(type_name)
+          _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

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

@@ -29,6 +29,54 @@ module Brick
   var finalParams = Object.keys(params).reduce(function (s, v) { if (params[v]) s.push(v + \"=\" + params[v]); return s; }, []).join(\"&\");
   return hrefParts[0] + (finalParams.length > 0 ? \"?\" + finalParams : \"\");
 }
+
+// This PageTransitionEvent fires when the page first loads, as well as after any other history
+// transition such as when using the browser's Back and Forward buttons.
+window.addEventListener(\"pageshow\", linkSchemas);
+var brickSchema;
+function linkSchemas() {
+  var schemaSelect = document.getElementById(\"schema\");
+  var tblSelect = document.getElementById(\"tbl\");
+  if (tblSelect) { // Always present
+    // Used to be:  var i = # {::Brick.config.path_prefix ? '0' : 'schemaSelect ? 1 : 0'},
+    var changeoutList = changeout(location.href);
+    for (var i = 0; i < changeoutList.length; ++i) {
+      tblSelect.value = changeoutList[i];
+      if (tblSelect.value !== \"\") break;
+    }
+
+    tblSelect.addEventListener(\"change\", function () {
+      var lhr = changeout(location.href, null, this.value);
+      if (brickSchema) lhr = changeout(lhr, \"_brick_schema\", schemaSelect.value);
+      location.href = lhr;
+    });
+  }
+
+  if (schemaSelect) { // First drop-down is only present if multitenant
+    if (brickSchema = changeout(location.href, \"_brick_schema\")) {
+      [... document.getElementsByTagName(\"A\")].forEach(function (a) { a.href = changeout(a.href, \"_brick_schema\", brickSchema); });
+    }
+    if (schemaSelect.options.length > 1) {
+      schemaSelect.value = brickSchema || \"public\";
+      schemaSelect.addEventListener(\"change\", function () {
+        // If there's an ID then remove it (trim after selected table)
+        location.href = changeout(location.href, \"_brick_schema\", this.value, tblSelect.value);
+      });
+    }
+  }
+  tblSelect.focus();
+
+  [... document.getElementsByTagName(\"FORM\")].forEach(function (form) {
+    if (brickSchema)
+      form.action = changeout(form.action, \"_brick_schema\", brickSchema);
+    form.addEventListener('submit', function (ev) {
+      [... ev.target.getElementsByTagName(\"SELECT\")].forEach(function (select) {
+        if (select.value === \"^^^brick_NULL^^^\") select.value = null;
+      });
+      return true;
+    });
+  });
+};
 "
 
       # paths['app/models'] << 'lib/brick/frameworks/active_record/models'
@@ -168,17 +216,9 @@ module Brick
                   end
 "<script>
 #{JS_CHANGEOUT}
-window.addEventListener(\"load\", linkSchemas);
 document.addEventListener(\"turbo:render\", linkSchemas);
 window.addEventListener(\"popstate\", linkSchemas);
 // [... document.getElementsByTagName('turbo-frame')].forEach(function (a) { a.addEventListener(\"turbo:frame-render\", linkSchemas); });
-function linkSchemas() {
-  brickSchema = changeout(location.href, \"_brick_schema\");
-  if (brickSchema) {
-    [... document.getElementsByTagName(\"A\")].forEach(function (a) { a.href = changeout(a.href, \"_brick_schema\", brickSchema); });
-    [... document.getElementsByTagName(\"FORM\")].forEach(function (form) { form.action = changeout(form.action, \"_brick_schema\", brickSchema); });
-  }
-}
 </script>
 #{_brick_content}".html_safe
                 end
@@ -188,8 +228,8 @@ function linkSchemas() {
             # When available, add a clickable brick icon to go to the Brick version of the page
             PanelComponent.class_exec do
               alias _brick_init initialize
-              def initialize(*args)
-                _brick_init(*args)
+              def initialize(*args, **kwargs)
+                _brick_init(*args, **kwargs)
                 @name = BrickTitle.new(@name, self)
               end
             end
@@ -223,6 +263,16 @@ function linkSchemas() {
                 _brick_resource_view_path
               end
             end
+
+            module Concerns::HasFields
+              class_methods do
+                alias _brick_field field
+                def field(name, *args, **kwargs, &block)
+                  kwargs.merge!(args.pop) if args.last.is_a?(Hash)
+                  _brick_field(name, **kwargs, &block)
+                end
+              end
+            end
           end # module Avo
 
           # Steer any Avo-related controller/action based URL lookups to the Avo RouteSet
@@ -288,7 +338,14 @@ function linkSchemas() {
                      else
                        [[fk_name, pk.length == 1 ? pk.first : pk.inspect]]
                      end
-              keys << [hm_assoc.inverse_of.foreign_type, hm_assoc.active_record.name] if hm_assoc.options.key?(:as)
+              if hm_assoc.options.key?(:as)
+                poly_type = if hm_assoc.active_record.column_names.include?(hm_assoc.active_record.inheritance_column)
+                              '[sti_type]'
+                            else
+                              hm_assoc.active_record.name
+                            end
+                keys << [hm_assoc.inverse_of.foreign_type, poly_type]
+              end
               keys.to_h
             end
 
@@ -362,9 +419,14 @@ function linkSchemas() {
                     end
                   when 'show', 'new', 'update'
                     hm_stuff << if hm_fk_name
-                                  if hm_assoc.klass.column_names.include?(hm_fk_name)
+                                  if hm_assoc.klass.column_names.include?(hm_fk_name) ||
+                                     (hm_fk_name.is_a?(String) && hm_fk_name.include?('.')) # HMT?  (Could do a better check for this)
                                     predicates = path_keys(hm_assoc, hm_fk_name, pk).map do |k, v|
-                                                   v.is_a?(String) ? "#{k}: '#{v}'" : "#{k}: @#{obj_name}.#{v}"
+                                                   if v == '[sti_type]'
+                                                     "'#{k}': @#{obj_name}.#{hm_assoc.active_record.inheritance_column}"
+                                                   else
+                                                     v.is_a?(String) ? "'#{k}': '#{v}'" : "'#{k}': @#{obj_name}.#{v}"
+                                                   end
                                                  end.join(', ')
                                     "<%= link_to '#{assoc_name}', #{hm_assoc.klass._brick_index}_path({ #{predicates} }) %>\n"
                                   else
@@ -402,6 +464,12 @@ function linkSchemas() {
               table_options << "<option value=\"#{prefix}brick_orphans\">(Orphans)</option>".html_safe if is_orphans
               table_options << "<option value=\"#{prefix}brick_orphans\">(Crosstab)</option>".html_safe if is_crosstab
               css = +"<style>
+#titleBox {
+  position: sticky;
+  display: inline-block;
+  left: 0;
+}
+
 h1, h3 {
   margin-bottom: 0;
 }
@@ -413,7 +481,6 @@ h1, h3 {
   cursor: pointer;
 }
 #mermaidErd {
-  position: relative;
   display: none;
 }
 #mermaidErd .exclude {
@@ -622,13 +689,24 @@ def hide_bcrypt(val, max_len = 200)
   end
 end
 def display_value(col_type, val)
+  is_mssql_geography = nil
+  # Some binary thing that really looks like a Microsoft-encoded WGS84 point?  (With the first two bytes, E6 10, indicating an EPSG code of 4326)
+  if col_type == :binary && val && val.length < 31 && (val.length - 6) % 8 == 0 && val[0..5].bytes == [230, 16, 0, 0, 1, 12]
+    col_type = 'geography'
+    is_mssql_geography = true
+  end
   case col_type
   when 'geometry', 'geography'
     if Object.const_defined?('RGeo')
       @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
+
+      if @is_mysql || (is_mssql_geography ||=
+                        (@is_mssql ||
+                          (val && val.length < 31 && (val.length - 6) % 8 == 0 && val[0..5].bytes == [230, 16, 0, 0, 1, 12])
+                        )
+                      )
         # MySQL's \"Internal Geometry Format\" and MSSQL's Geography are like WKB, but with an initial 4 bytes that indicates the SRID.
         if (srid = val&.[](0..3)&.unpack('I'))
           val = val.dup.force_encoding('BINARY')[4..-1].bytes
@@ -642,20 +720,25 @@ def display_value(col_type, val)
           # xx1x xxxx = IsWholeGlobe
           # Convert Microsoft's unique geography binary to standard WKB
           # (MSSQL point usually has two doubles, lng / lat, and can also have Z)
-          if @is_mssql
+          if is_mssql_geography
             if val[0] == 1 && (val[1] & 8 > 0) && # Single point?
-              (val.length - 2) % 8 == 0 && val.length < 27 # And containing up to three 8-byte values?
-              idx = 2
-              new_val = [0, 0, 0, 0, 1]
-              new_val.concat(val[idx - 8...idx].reverse) while (idx += 8) <= val.length
-              val = new_val
+               (val.length - 2) % 8 == 0 && val.length < 27 # And containing up to three 8-byte values?
+              val = [0, 0, 0, 0, 1] + val[2..-1].reverse
             else
               val_err = '(Microsoft internal SQL geography type)'
             end
           end
         end
       end
-      val_err || (val ? RGeo::WKRep::WKBParser.new.parse(val.pack('c*')) : nil)
+      unless val_err || val.nil?
+        if (geometry = RGeo::WKRep::WKBParser.new.parse(val.pack('c*'))).is_a?(RGeo::Cartesian::PointImpl) &&
+           !(geometry.y == 0.0 && geometry.x == 0.0)
+          # Create a POINT link to this style of Google maps URL:  https://www.google.com/maps/place/38.7071296+-121.2810649/@38.7071296,-121.2810649,12z
+          geometry = \"<a href=\\\"https://www.google.com/maps/place/#\{geometry.y}+#\{geometry.x}/@#\{geometry.y},#\{geometry.x},12z\\\" target=\\\"blank\\\">#\{geometry.to_s}</a>\"
+        end
+        val = geometry
+      end
+      val_err || val
     else
       '(Add RGeo gem to parse geometry detail)'
     end
@@ -671,13 +754,13 @@ def display_value(col_type, val)
 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',
+  @image_signatures ||= { \"\\xFF\\xD8\\xFF\\xEE\".force_encoding('ASCII-8BIT') => 'jpeg',
+                          \"\\xFF\\xD8\\xFF\\xE0\\x00\\x10\\x4A\\x46\\x49\\x46\\x00\\x01\".force_encoding('ASCII-8BIT') => 'jpeg',
+                          \"\\x89PNG\\r\\n\\x1A\\n\".force_encoding('ASCII-8BIT') => 'png',
                           '<svg' => 'svg+xml', # %%% Not yet very good detection for SVG
-                          'BM' => 'bmp',
-                          'GIF87a' => 'gif',
-                          'GIF89a' => 'gif' }
+                          'BM'.force_encoding('ASCII-8BIT') => 'bmp',
+                          'GIF87a'.force_encoding('ASCII-8BIT') => 'gif',
+                          'GIF89a'.force_encoding('ASCII-8BIT') => 'gif' }
 end
 def display_binary(val)
   if val[0..1] == \"\\x15\\x1C\" # One of those goofy Microsoft OLE containers?
@@ -741,56 +824,8 @@ callbacks = {} %>
 
               # %%% When doing schema select, if we're on a new page go to index
               script = "<script>
-var schemaSelect = document.getElementById(\"schema\");
-var tblSelect = document.getElementById(\"tbl\");
-var brickSchema;
 var #{table_name}HtColumns;
 
-// This PageTransitionEvent fires when the page first loads, as well as after any other history
-// transition such as when using the browser's Back and Forward buttons.
-window.addEventListener(\"pageshow\", function() {
-  if (tblSelect) { // Always present
-    var i = #{::Brick.config.path_prefix ? '0' : 'schemaSelect ? 1 : 0'},
-        changeoutList = changeout(location.href);
-    for (; i < changeoutList.length; ++i) {
-      tblSelect.value = changeoutList[i];
-      if (tblSelect.value !== \"\") break;
-    }
-
-    tblSelect.addEventListener(\"change\", function () {
-      var lhr = changeout(location.href, null, this.value);
-      if (brickSchema)
-        lhr = changeout(lhr, \"_brick_schema\", schemaSelect.value);
-      location.href = lhr;
-    });
-  }
-
-  if (schemaSelect && schemaSelect.options.length > 1) { // First drop-down is only present if multitenant
-    brickSchema = changeout(location.href, \"_brick_schema\");
-    if (brickSchema) {
-      [... document.getElementsByTagName(\"A\")].forEach(function (a) { a.href = changeout(a.href, \"_brick_schema\", brickSchema); });
-    }
-    schemaSelect.value = brickSchema || \"public\";
-    schemaSelect.focus();
-    schemaSelect.addEventListener(\"change\", function () {
-      // If there's an ID then remove it (trim after selected table)
-      location.href = changeout(location.href, \"_brick_schema\", this.value, tblSelect.value);
-    });
-  }
-
-  [... document.getElementsByTagName(\"FORM\")].forEach(function (form) {
-    if (brickSchema)
-      form.action = changeout(form.action, \"_brick_schema\", brickSchema);
-    form.addEventListener('submit', function (ev) {
-      [... ev.target.getElementsByTagName(\"SELECT\")].forEach(function (select) {
-        if (select.value === \"^^^brick_NULL^^^\")
-          select.value = null;
-      });
-      return true;
-    });
-  });
-});
-
 // Add \"Are you sure?\" behaviour to any data-confirm buttons out there
 document.querySelectorAll(\"input[type=submit][data-confirm]\").forEach(function (btn) {
   btn.addEventListener(\"click\", function (evt) {
@@ -1092,13 +1127,16 @@ erDiagram
 %></title>
 </head>
 <body>
+<div id=\"titleBox\">
 <p style=\"color: green\"><%= notice %></p>#{"
 #{schema_options}" if schema_options}
 <select id=\"tbl\">#{table_options}</select>
 <table id=\"resourceName\"><tr>
-  <td><h1><%= model.name %></h1></td>
+  <td><h1><%= td_count = 2
+              model.name %></h1></td>
   <td id=\"imgErd\" title=\"Show ERD\"></td>
-  <% if Object.const_defined?('Avo') && ::Avo.respond_to?(:railtie_namespace) %>
+  <% if Object.const_defined?('Avo') && ::Avo.respond_to?(:railtie_namespace)
+       td_count += 1 %>
     <td><%= link_to_brick(
         avo_svg,
         { index_proc: Proc.new do |avo_model|
@@ -1107,7 +1145,9 @@ erDiagram
           title: \"#\{model.name} in Avo\" }
       ) %></td>
   <% end %>
-</tr></table>#{template_link}<%
+</tr><%= if (page_num = @#{table_name}._brick_page_num)
+           \"<tr><td colspan=\\\"#\{td_count}\\\">Page #\{page_num}</td></tr>\".html_safe
+         end %></table>#{template_link}<%
    if description.present? %><%=
      description %><br><%
    end
@@ -1118,8 +1158,11 @@ erDiagram
        id = id.first if id.is_a?(Array) && id.length == 1
        origin = (key_parts = k.split('.')).length == 1 ? model : model.reflect_on_association(key_parts.first).klass
        if (destination_fk = Brick.relations[origin.table_name][:fks].values.find { |fk| fk[:fk] == key_parts.last }) &&
-          (obj = (destination = origin.reflect_on_association(destination_fk[:assoc_name])&.klass)&.find(id)) %>
-         <h3>for <%= link_to \"#{"#\{obj.brick_descrip\} (#\{destination.name\})\""}, send(\"#\{destination._brick_index(:singular)\}_path\".to_sym, id) %></h3><%
+          (objs = (destination = origin.reflect_on_association(destination_fk[:assoc_name])&.klass)&.find(id))
+         objs = [objs] unless objs.is_a?(Array) %>
+         <h3>for <% objs.each do |obj| %><%=
+                      link_to \"#{"#\{obj.brick_descrip\} (#\{destination.name\})\""}, send(\"#\{destination._brick_index(:singular)\}_path\".to_sym, id)
+               %><% end %></h3><%
        end
      end %>
   (<%= link_to \"See all #\{model.base_class.name.split('::').last.pluralize}\", #{@_brick_model._brick_index}_path %>)
@@ -1139,6 +1182,7 @@ erDiagram
     });
   </script>
 <% end %>
+</div>
 #{erd_markup}
 
 <%= # Consider getting the name from the association -- hm.first.name -- if a more \"friendly\" alias should be used for a screwy table name
@@ -1263,7 +1307,9 @@ erDiagram
 <head>
 #{css}
 <title><%=
-  page_title = (\"#{model_name}: #\{(obj = @#{obj_name})&.brick_descrip || controller_name}\")
+  model = (obj = @#{obj_name})&.class
+  model_name = @#{obj_name}.#{inh_col = @_brick_model.inheritance_column} if obj.respond_to?(:#{inh_col})
+  page_title = (\"#\{model_name ||= model.name}: #\{obj&.brick_descrip || controller_name}\")
 %></title>
 </head>
 <body>
@@ -1297,12 +1343,12 @@ end
 <% if obj
       # path_options = [obj.#{pk}]
       # path_options << { '_brick_schema':  } if
-      # url = send(:#\{model_name._brick_index(:singular)}_path, obj.#{pk})
+      # url = send(:#\{model._brick_index(:singular)}_path, obj.#{pk})
       options = {}
       options[:url] = send(\"#\{#{model_name}._brick_index(:singular)}_path\".to_sym, obj) if ::Brick.config.path_prefix
  %>
   <br><br>
-  <%= form_for(obj.becomes(#{model_name}), options) do |f| %>
+<%= form_for(obj.becomes(#{model_name}), options) do |f| %>
   <table class=\"shadow\">
   <% has_fields = false
     @#{obj_name}.attributes.each do |k, val|
@@ -1393,11 +1439,21 @@ end
           # In Postgres labels of data stored in a hierarchical tree-like structure
           # If it's not yet enabled then:  create extension ltree;
           val %>
-      <% when :binary, :primary_key
+      <% when :binary %>
+        <%= is_revert = false
+           if val
+             # %%% This same kind of geography check is done two other times above ... would be great to DRY it up.
+             if val.length < 31 && (val.length - 6) % 8 == 0 && val[0..5].bytes == [230, 16, 0, 0, 1, 12]
+               display_value('geography', val)
+             else
+               display_binary(val)
+             end.html_safe
+           end %>
+      <% when :primary_key
            is_revert = false %>
       <% else %>
         <%= is_revert = false
-           display_value(col_type, val) %>
+           display_value(col_type, val).html_safe %>
       <% end
        end
        if is_revert
@@ -1414,11 +1470,11 @@ end
     <tr><td colspan=\"2\">(No displayable fields)</td></tr>
   <% end %>
   </table>
-<%   end %>
+<%  end %>
 
 #{unless args.first == 'new'
-  # Was:  confirm_are_you_sure = ActionView.version < ::Gem::Version.new('7.0') ? "data: { confirm: 'Delete #{model_name} -- Are you sure?' }" : "form: { data: { turbo_confirm: 'Delete #{model_name} -- Are you sure?' } }"
-  confirm_are_you_sure = "data: { confirm: 'Delete #{model_name} -- Are you sure?' }"
+  # Was:  confirm_are_you_sure = ActionView.version < ::Gem::Version.new('7.0') ? "data: { confirm: 'Delete #\{model_name} -- Are you sure?' }" : "form: { data: { turbo_confirm: 'Delete #\{model_name} -- Are you sure?' } }"
+  confirm_are_you_sure = "data: { confirm: 'Delete #\{model_name} -- Are you sure?' }"
   hms_headers.each_with_object(+'') do |hm, s|
     # %%% Would be able to remove this when multiple foreign keys to same destination becomes bulletproof
     next if hm.first.options[:through] && !hm.first.through_reflection
@@ -1426,11 +1482,24 @@ end
     if (pk = hm.first.klass.primary_key)
       hm_singular_name = (hm_name = hm.first.name.to_s).singularize.underscore
       obj_pk = (pk.is_a?(Array) ? pk : [pk]).each_with_object([]) { |pk_part, s| s << "#{hm_singular_name}.#{pk_part}" }.join(', ')
+      poly_fix = if (poly_type = (hm.first.options[:as] && hm.first.type))
+                   "
+                       # Let's fix an unexpected \"feature\" of AR -- when going through a polymorphic has_many
+                       # association that points to an STI model then filtering for the __able_type column is done
+                       # with a .where(). And the polymorphic class name it points to is the base class name of
+                       # the STI model instead of its subclass.
+                       if (poly_type = #{poly_type.inspect}) &&
+                           @#{obj_name}.respond_to?(:#{@_brick_model.inheritance_column}) &&
+                           (base_type = collection.where_values_hash[poly_type])
+                         collection = collection.rewhere(poly_type => [base_type, @#{obj_name}.#{@_brick_model.inheritance_column}])
+                       end"
+      end
       s << "<table id=\"#{hm_name}\" class=\"shadow\">
-        <tr><th>#{hm[3]}</th></tr>
+        <tr><th>#{hm[1]}#{' poly' if hm[0].options[:as]} #{hm[3]}</th></tr>
         <% collection = @#{obj_name}.#{hm_name}
         collection = case collection
-                     when ActiveRecord::Associations::CollectionProxy
+                     when ActiveRecord::Associations::CollectionProxy#{
+                       poly_fix}
                        collection.order(#{pk.inspect})
                      when ActiveRecord::Base # Object from a has_one
                        [collection]
@@ -1490,7 +1559,7 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
   if (imgErd) imgErd.addEventListener(\"click\", showErd);
   function showErd() {
     imgErd.style.display = \"none\";
-    mermaidErd.style.display = \"inline-block\";
+    mermaidErd.style.display = \"block\";
     if (mermaidCode) return; // Cut it short if we've already rendered the diagram
 
     mermaidCode = document.createElement(\"SCRIPT\");

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

@@ -56,85 +56,85 @@ module Brick::Rails::FormTags
          end
     out << "</tr></thead>
   <tbody>"
-  # %%% Have once gotten this error with MSSQL referring to http://localhost:3000/warehouse/cold_room_temperatures__archive
-  #     ActiveRecord::StatementTimeout in Warehouse::ColdRoomTemperatures_Archive#index
-  #     TinyTds::Error: Adaptive Server connection timed out
-  #     (After restarting the server it worked fine again.)
-  relation.each do |obj|
-    out << "<tr>\n"
-    out << "<td>#{link_to('⇛', send("#{klass._brick_index(:singular)}_path".to_sym,
-                                    pk.map { |pk_part| obj.send(pk_part.to_sym) }), { class: 'big-arrow' })}</td>\n" if pk.present?
-    sequence.each do |col_name|
-      val = obj.attributes[col_name]
-      out << '<td'
-      out << ' class=\"dimmed\"' unless cols.key?(col_name) || (cust_col = cust_cols[col_name]) || 
-                                                 (col_name.is_a?(Symbol) && bts.key?(col_name)) # HOT
-      out << '>'
-      if (bt = bts[col_name])
-        if bt[2] # Polymorphic?
-          bt_class = obj.send("#{bt.first}_type")
-          base_class_underscored = (::Brick.existing_stis[bt_class] || bt_class).constantize.base_class._brick_index(:singular)
-          poly_id = obj.send("#{bt.first}_id")
-          out << link_to("#{bt_class} ##{poly_id}", send("#{base_class_underscored}_path".to_sym, poly_id)) if poly_id
-        else # BT or HOT
-          bt_class = bt[1].first.first
-          descrips = bt_descrip[bt.first][bt_class]
-          bt_id_col = if descrips.nil?
-                        puts "Caught it in the act for obj / #{col_name}!"
-                      elsif descrips.length == 1
-                        [obj.class.reflect_on_association(bt.first)&.foreign_key]
-                      else
-                        descrips.last
-                      end
-          bt_txt = bt_class.brick_descrip(
-            # 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 || '')
-        end
-      elsif (hms_col = hms_cols[col_name])
-        if hms_col.length == 1
-          out << hms_col.first
-        else
-          hm_klass = (col = cols[col_name])[1]
-          if col[2] == 'HO'
-            descrips = bt_descrip[col_name.to_sym][hm_klass]
-            if (ho_id = (ho_id_col = descrips.last).map { |id_col| obj.send(id_col.to_sym) })&.first
-              ho_txt = hm_klass.brick_descrip(obj, descrips[0..-2].map { |id| obj.send(id.last[0..62]) }, ho_id_col)
-              out << link_to(ho_txt, send("#{hm_klass.base_class._brick_index(:singular)}_path".to_sym, ho_id))
-            end
+    # %%% Have once gotten this error with MSSQL referring to http://localhost:3000/warehouse/cold_room_temperatures__archive
+    #     ActiveRecord::StatementTimeout in Warehouse::ColdRoomTemperatures_Archive#index
+    #     TinyTds::Error: Adaptive Server connection timed out
+    #     (After restarting the server it worked fine again.)
+    relation.each do |obj|
+      out << "<tr>\n"
+      out << "<td>#{link_to('⇛', send("#{klass._brick_index(:singular)}_path".to_sym,
+                                      pk.map { |pk_part| obj.send(pk_part.to_sym) }), { class: 'big-arrow' })}</td>\n" if pk.present?
+      sequence.each do |col_name|
+        val = obj.attributes[col_name]
+        out << '<td'
+        out << ' class=\"dimmed\"' unless cols.key?(col_name) || (cust_col = cust_cols[col_name]) ||
+                                          (col_name.is_a?(Symbol) && bts.key?(col_name)) # HOT
+        out << '>'
+        if (bt = bts[col_name])
+          if bt[2] # Polymorphic?
+            bt_class = obj.send("#{bt.first}_type")
+            base_class_underscored = (::Brick.existing_stis[bt_class] || bt_class).constantize.base_class._brick_index(:singular)
+            poly_id = obj.send("#{bt.first}_id")
+            out << link_to("#{bt_class} ##{poly_id}", send("#{base_class_underscored}_path".to_sym, poly_id)) if poly_id
+          else # BT or HOT
+            bt_class = bt[1].first.first
+            descrips = bt_descrip[bt.first][bt_class]
+            bt_id_col = if descrips.nil?
+                          puts "Caught it in the act for obj / #{col_name}!"
+                        elsif descrips.length == 1
+                          [obj.class.reflect_on_association(bt.first)&.foreign_key]
+                        else
+                          descrips.last
+                        end
+            bt_txt = bt_class.brick_descrip(
+              # 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 || '')
+          end
+        elsif (hms_col = hms_cols[col_name])
+          if hms_col.length == 1
+            out << hms_col.first
           else
-            if (ct = obj.send(hms_col[1].to_sym)&.to_i)&.positive?
-              out << "#{link_to("#{ct || 'View'} #{hms_col.first}",
-                                   send("#{hm_klass._brick_index}_path".to_sym,
-                                        hms_col[2].each_with_object({}) { |v, s| s[v.first] = v.last.is_a?(String) ? v.last : obj.send(v.last) })
-                               )}\n"
+            hm_klass = (col = cols[col_name])[1]
+            if col[2] == 'HO'
+              descrips = bt_descrip[col_name.to_sym][hm_klass]
+              if (ho_id = (ho_id_col = descrips.last).map { |id_col| obj.send(id_col.to_sym) })&.first
+                ho_txt = hm_klass.brick_descrip(obj, descrips[0..-2].map { |id| obj.send(id.last[0..62]) }, ho_id_col)
+                out << link_to(ho_txt, send("#{hm_klass.base_class._brick_index(:singular)}_path".to_sym, ho_id))
+              end
+            else
+              if (ct = obj.send(hms_col[1].to_sym)&.to_i)&.positive?
+                out << "#{link_to("#{ct || 'View'} #{hms_col.first}",
+                                  send("#{hm_klass._brick_index}_path".to_sym,
+                                       hms_col[2].each_with_object({}) { |v, s| s[v.first] = v.last.is_a?(String) ? v.last : obj.send(v.last) })
+                                 )}\n"
+              end
             end
           end
+        elsif (col = cols[col_name]).is_a?(ActiveRecord::ConnectionAdapters::Column)
+          binding.pry if col.is_a?(Array)
+          col_type = col&.sql_type == 'geography' ? col.sql_type : col&.type
+          out << display_value(col_type || col&.sql_type, val).to_s
+        elsif cust_col
+          data = cust_col.first.map { |cc_part| obj.send(cc_part.last) }
+          cust_txt = klass.brick_descrip(cust_col[-2], data)
+          if (link_id = obj.send(cust_col.last[1]) if cust_col.last)
+            out << link_to(cust_txt, send("#{cust_col.last.first._brick_index(:singular)}_path", link_id))
+          else
+            out << (cust_txt || '')
+          end
+        else # Bad column name!
+          out << '?'
         end
-      elsif (col = cols[col_name]).is_a?(ActiveRecord::ConnectionAdapters::Column)
-        binding.pry if col.is_a?(Array)
-        col_type = col&.sql_type == 'geography' ? col.sql_type : col&.type
-        out << display_value(col_type || col&.sql_type, val).to_s
-      elsif cust_col
-        data = cust_col.first.map { |cc_part| obj.send(cc_part.last) }
-        cust_txt = klass.brick_descrip(cust_col[-2], data)
-        if (link_id = obj.send(cust_col.last[1]) if cust_col.last)
-          out << link_to(cust_txt, send("#{cust_col.last.first._brick_index(:singular)}_path", link_id))
-        else
-          out << (cust_txt || '')
-        end
-      else # Bad column name!
-        out << '?'
+        out << '</td>'
       end
-      out << '</td>'
+      out << '</tr>'
     end
-  out << '</tr>'
-  end
-  out << "  </tbody>
+    out << "  </tbody>
 </table>
 "
     out.html_safe
@@ -143,6 +143,16 @@ module Brick::Rails::FormTags
   def link_to_brick(*args, **kwargs)
     return unless ::Brick.config.mode == :on
 
+    kwargs.merge!(args.pop) if args.last.is_a?(Hash)
+    # Avoid infinite recursion
+    if (visited = kwargs.fetch(:visited, nil))
+      return if visited.key?(object_id)
+
+      kwargs[:visited][object_id] = nil
+    else
+      kwargs[:visited] = {}
+    end
+
     text = ((args.first.is_a?(String) || args.first.is_a?(Proc)) && args.shift) || args[1]
     text = text.call if text.is_a?(Proc)
     klass_or_obj = ((args.first.is_a?(ActiveRecord::Relation) ||
@@ -192,13 +202,14 @@ module Brick::Rails::FormTags
       app_routes = Rails.application.routes # In case we're operating in another engine, reference the application since Brick routes are placed there.
       if (klass_or_obj&.is_a?(Class) && klass_or_obj < ActiveRecord::Base) ||
          (klass_or_obj&.is_a?(ActiveRecord::Base) && klass_or_obj.new_record? && (klass_or_obj = klass_or_obj.class))
-        path = (proc = kwargs[:index_proc]) ? proc.call(klass_or_obj) : "#{app_routes.path_for(controller: klass_or_obj.base_class._brick_index, action: :index)}#{filter}"
+        path = (proc = kwargs[:index_proc]) ? proc.call(klass_or_obj) : "#{app_routes.path_for(controller: klass_or_obj.base_class._brick_index(nil, '/'), action: :index)}#{filter}"
         lt_args = [text || "Index for #{klass_or_obj.name.pluralize}", path]
       else
         # If there are multiple incoming parameters then last one is probably the actual ID, and first few might be some nested tree of stuff leading up to it
-        path = (proc = kwargs[:show_proc]) ? proc.call(klass_or_obj) : "#{app_routes.path_for(controller: klass_or_obj.class.base_class._brick_index, action: :show, id: klass_or_obj)}#{filter}"
+        path = (proc = kwargs[:show_proc]) ? proc.call(klass_or_obj) : "#{app_routes.path_for(controller: klass_or_obj.class.base_class._brick_index(nil, '/'), action: :show, id: klass_or_obj)}#{filter}"
         lt_args = [text || "Show this #{klass_or_obj.class.name}", path]
       end
+      kwargs.delete(:visited)
       link_to(*lt_args, **kwargs)
     else
       # puts "Warning:  link_to_brick could not find a class for \"#{controller_path}\" -- consider setting @_brick_model within that controller."
@@ -215,7 +226,7 @@ module Brick::Rails::FormTags
       if links.length == 1 # If there's only one match then use any text that was supplied
         link_to_brick(text || links.first.last.join('/'), links.first.first, **kwargs)
       else
-        links.map { |k, v| link_to_brick(v.join('/'), v, **kwargs) }.join(' &nbsp; ').html_safe
+        links.each_with_object([]) { |v, s| s << link if link = link_to_brick(v.join('/'), v, **kwargs) }.join(' &nbsp; ').html_safe
       end
     end
   end # link_to_brick

data/lib/brick/version_number.rb

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

data/lib/generators/brick/install_generator.rb

@@ -288,16 +288,18 @@ if ActiveRecord::Base.respond_to?(:brick_select)
 
   # # POLYMORPHIC ASSOCIATIONS
 
-  # # Database schema to use when analysing existing data, such as deriving a list of polymorphic classes in the case that
-  # # it wasn't originally specified.
+  # # Polymorphic associations are set up by providing a model name and polymorphic association name#{poly}
+
+  # # For multi-tenant databases that use a separate schema for each tenant, a single representative database schema
+  # # can be analysed to determine the range of polymorphic classes that can be used for each association.  Hopefully
+  # # the schema chosen is one loaded with existing data that is representative of all possible polymorphic
+  # # associations.
   # Brick.schema_behavior = :namespaced
 #{Brick.config.schema_behavior.present? ? "  Brick.schema_behavior = { multitenant: { schema_to_analyse: #{
   Brick.config.schema_behavior[:multitenant]&.fetch(:schema_to_analyse, nil).inspect}" :
 "  # Brick.schema_behavior = { multitenant: { schema_to_analyse: 'engineering'"
 } } }
 
-  # # Polymorphic associations are set up by providing a model name and polymorphic association name#{poly}
-
   # # DEFAULT ROOT ROUTE
 
   # # If a default route is not supplied, Brick attempts to find the most \"central\" table and wires up the default

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.102
+  version: 1.0.104
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-03 00:00:00.000000000 Z
+date: 2023-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -164,20 +164,6 @@ 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