brick 1.0.102 → 1.0.103

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 167e29431250efc9170ec3f174cce913584c700ce8405a0d275c63636d04cf81
-  data.tar.gz: 34826b000c093ab4fb8d63edd4509d8244f3d5e3712066489e00076f67ba9704
+  metadata.gz: 74743982216a9827513b4aaa68fe0887c9ba3e7b78c45ff52f0a2f2b99dc7b88
+  data.tar.gz: 3857a95e891e7561d285dd3ecbdeb6c4c16cc9a8205e7b733b55867ed7a69f64
 SHA512:
-  metadata.gz: e0d8d82c98b918c2a6b61c06a636ce60e2c4eaaed32b9556b09984f0b778f624cfb887cf9d82d48042cb75057b1e3688be661c05fa9c79f90052da32d029e1b2
-  data.tar.gz: 53c296598e9bc85ca2afd5456ff02d3c56fde7f79cd6de9f4684c5fcef0ad1be489e6ccda37c26b81a109393de1a10fa70a08d352825e69437ffdcd8b2bb2bfe
+  metadata.gz: 8b71aa5b1d4da8c4aa1ce88af6d0767c12bdf72b2457594575795d4b9b3f36d1bfb2adef82413a3bc80e041813e7bc6c05768016c5e4cfc197e3bbb730113934
+  data.tar.gz: 6399e040cb4b54eac4d7a09b907cfba11037a4b3391dd3a86b4845e79bd0c4d4e169586c095fdaaaa8506f346628072c9c4c9b6d2ed60c3306a58866e6f9d030

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
@@ -805,7 +804,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
@@ -288,7 +328,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 +409,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
@@ -622,13 +674,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 +705,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 +739,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 +809,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) {
@@ -1118,8 +1138,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 %>)
@@ -1263,7 +1286,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,7 +1322,7 @@ 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
  %>
@@ -1393,7 +1418,17 @@ 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
@@ -1417,8 +1452,8 @@ 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 +1461,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]

data/lib/brick/version_number.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.102
+  version: 1.0.103
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-03 00:00:00.000000000 Z
+date: 2023-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord