brick 1.0.125 → 1.0.127

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc3caefac264427d0a4a7efa11160fc3b7c1cc6c82afa01bf7340941dbab18e1
-  data.tar.gz: 7d9aebd13fe256d43ee3ec24f94065a64ab4955e3ee379023352013db59fe3ba
+  metadata.gz: 7a424ad95046c33fae8463661b1fb53d770e44e37b503cb68b30fce5725c5ebd
+  data.tar.gz: 2fc4b004e49497b1b15c864a646717c162e7d7d55edf6913e916fab86ebbcbb7
 SHA512:
-  metadata.gz: c02e8bdceca8f726d24a8f7eddb6057427d2e31c3db3934bd72da0393509aaf2d5e7246ba65e8bdd773fc3d995c538567137dec729eb2d062ba0f7e006ace7c6
-  data.tar.gz: c6061b00b761638ebd0f9750423643615c08dffb9c62bec423d1bf5c047dcfa82c9b2bccaea1491d9f7a4c23932b9299be1254e708e26ca624165a5695557c63
+  metadata.gz: 5ebf6939ba66e746baf8c84b347630ec4e68951b23dc1efcd72bff47b3b6550c3c8d3444194489aa227a3be153b387552951fdd0fec03dc66a73306df6d6f0d4
+  data.tar.gz: e3a90e24d98d3bcb47d09e628df9958b101f8dfb9998c97307b791664e8a8b429d12febe73a1e3e322ef3aab054a9e0a103614f2053f58f1b0d2d3e580c9c083

data/lib/brick/compatibility.rb

@@ -19,19 +19,17 @@ unless ActiveSupport.respond_to?(:version)
     end
   end
 end
-if Object.const_defined?('ActionPack')
-  unless ActionPack.respond_to?(:version)
-    module ActionPack
-      def self.version
-        ::Gem::Version.new(ActionPack::VERSION::STRING)
-      end
+if Object.const_defined?('ActionPack') && !ActionPack.respond_to?(:version)
+  module ActionPack
+    def self.version
+      ::Gem::Version.new(ActionPack::VERSION::STRING)
     end
   end
-  if Object.const_defined?('ActionView') && !ActionView.respond_to?(:version)
-    module ActionView
-      def self.version
-        ActionPack.version
-      end
+end
+if Object.const_defined?('ActionView') && !ActionView.respond_to?(:version)
+  module ActionView
+    def self.version
+      ActionPack.version
     end
   end
 end

data/lib/brick/extensions.rb

@@ -231,6 +231,9 @@ module ActiveRecord
                         if this_obj.is_a?(ActiveRecord::Base) && (obj_descrip = this_obj.class.brick_descrip(this_obj))
                           this_obj = obj_descrip
                         end
+                        if this_obj.is_a?(ActiveStorage::Filename) && this_obj.instance_variable_get(:@filename).nil?
+                          this_obj.instance_variable_set(:@filename, '')
+                        end
                         this_obj&.to_s || ''
                       end
               is_brackets_have_content = true unless datum.blank?
@@ -914,8 +917,23 @@ end
 
 if Object.const_defined?('ActionView')
   require 'brick/frameworks/rails/form_tags'
-  module ActionView::Helpers::FormTagHelper
-    include ::Brick::Rails::FormTags
+  require 'brick/frameworks/rails/form_builder'
+  module ActionView::Helpers
+    module FormTagHelper
+      include ::Brick::Rails::FormTags
+    end
+    FormBuilder.class_exec do
+      include ::Brick::Rails::FormBuilder
+    end
+  end
+
+  # FormBuilder#field_id isn't available in Rails < 7.0.  This is a rudimentary version with no `index`.
+  unless ActionView::Helpers::FormBuilder.methods.include?(:field_id)
+    ActionView::Helpers::FormBuilder.class_exec do
+      def field_id(method)
+        [object_name, method.to_s].join('_')
+      end
+    end
   end
 end
 
@@ -1817,7 +1835,13 @@ class Object
           code << "  end\n"
           self.define_method :new do
             _schema, @_is_show_schema_list = ::Brick.set_db_schema(params)
-            instance_variable_set("@#{singular_table_name}".to_sym, model.new)
+            if (new_obj = model.new).respond_to?(:serializable_hash)
+              # Convert any Filename objects with nil into an empty string so that #encode can be called on them
+              new_obj.serializable_hash.each do |k, v|
+                new_obj.send("#{k}=", ActiveStorage::Filename.new('')) if v.is_a?(ActiveStorage::Filename) && !v.instance_variable_get(:@filename)
+              end
+            end
+            instance_variable_set("@#{singular_table_name}".to_sym, new_obj)
           end
 
           params_name_sym = (params_name = "#{singular_table_name}_params").to_sym
@@ -2113,7 +2137,6 @@ end.class_exec do
           load apartment_initializer
           @_apartment_loaded = true
         end
-        apartment_excluded = Apartment.excluded_models
       end
       # Only for Postgres  (Doesn't work in sqlite3 or MySQL)
       # puts ActiveRecord::Base.execute_sql("SELECT current_setting('SEARCH_PATH')").to_a.inspect
@@ -2203,7 +2226,7 @@ end.class_exec do
           # If Apartment gem lists the table as being associated with a non-tenanted model then use whatever it thinks
           # is the default schema, usually 'public'.
           schema_name = if ::Brick.config.schema_behavior[:multitenant]
-                          ::Brick.apartment_default_tenant if apartment_excluded&.include?(r['relation_name'].singularize.camelize)
+                          ::Brick.apartment_default_tenant if ::Brick.is_apartment_excluded_table(r['relation_name'])
                         elsif ![schema, 'public'].include?(r['schema'])
                           r['schema']
                         end
@@ -2353,7 +2376,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
       fk_references&.each do |fk|
         fk = fk.values unless fk.is_a?(Array)
         # Multitenancy makes things a little more general overall, except for non-tenanted tables
-        if apartment_excluded&.include?(::Brick.namify(fk[1]).singularize.camelize)
+        if ::Brick.is_apartment_excluded_table(::Brick.namify(fk[1]))
           fk[0] = ::Brick.apartment_default_tenant
         elsif (is_postgres && (fk[0] == 'public' || (multitenancy && fk[0] == schema))) ||
               (::Brick.is_oracle && fk[0] == schema) ||
@@ -2361,7 +2384,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
               (!is_postgres && !::Brick.is_oracle && !is_mssql && ['mysql', 'performance_schema', 'sys'].exclude?(fk[0]))
           fk[0] = nil
         end
-        if apartment_excluded&.include?(fk[4].singularize.camelize)
+        if ::Brick.is_apartment_excluded_table(fk[4])
           fk[3] = ::Brick.apartment_default_tenant
         elsif (is_postgres && (fk[3] == 'public' || (multitenancy && fk[3] == schema))) ||
               (::Brick.is_oracle && fk[3] == schema) ||
@@ -2537,8 +2560,7 @@ module Brick
       # %%% Temporary schema patch
       for_tbl = fk[1]
       fk_namified = ::Brick.namify(fk[1])
-      apartment = Object.const_defined?('Apartment') && Apartment
-      fk[0] = ::Brick.apartment_default_tenant if apartment && apartment.excluded_models.include?(fk_namified.singularize.camelize)
+      fk[0] = ::Brick.apartment_default_tenant if ::Brick.is_apartment_excluded_table(fk_namified)
       fk[1] = "#{fk[0]}.#{fk[1]}" if fk[0] # && fk[0] != ::Brick.default_schema
       bts = (relation = relations.fetch(fk[1], nil))&.fetch(:fks) { relation[:fks] = {} }
 
@@ -2553,7 +2575,7 @@ module Brick
                         is_schema = if ::Brick.config.schema_behavior[:multitenant]
                                       # If Apartment gem lists the primary table as being associated with a non-tenanted model
                                       # then use 'public' schema for the primary table
-                                      if apartment && apartment&.excluded_models.include?(fk[4].singularize.camelize)
+                                      if ::Brick.is_apartment_excluded_table(fk[4])
                                         fk[3] = ::Brick.apartment_default_tenant
                                         true
                                       end
@@ -2630,7 +2652,7 @@ module Brick
         end
         assoc_hm[:alternate_name] = "#{assoc_hm[:alternate_name]}_#{bt_assoc_name}" unless assoc_hm[:alternate_name] == bt_assoc_name
       else
-        inv_tbl = if ::Brick.config.schema_behavior[:multitenant] && apartment && fk[0] == ::Brick.apartment_default_tenant
+        inv_tbl = if ::Brick.config.schema_behavior[:multitenant] && Object.const_defined?('Apartment') && fk[0] == ::Brick.apartment_default_tenant
                     for_tbl
                   else
                     fk[1]
@@ -2800,5 +2822,13 @@ module Brick
     def _class_pk(dotted_name, multitenant)
       Object.const_get((multitenant ? [dotted_name.split('.').last] : dotted_name.split('.')).map { |nm| "::#{nm.singularize.camelize}" }.join).primary_key
     end
+
+    def is_apartment_excluded_table(tbl)
+      if Object.const_defined?('Apartment')
+        tbl_klass = (tnp = ::Brick.config.table_name_prefixes&.find { |k, _v| tbl.start_with?(k) }) ? +"#{tnp.last}::" : +''
+        tbl_klass << tbl[tnp&.first&.length || 0..-1].singularize.camelize
+        Apartment.excluded_models&.include?(tbl_klass)
+      end
+    end
   end
 end

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

@@ -2,36 +2,103 @@
 
 module Brick
   module Rails
-    def self.display_binary(val)
-      @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').force_encoding('ASCII-8BIT') => 'bmp',
-                              (+'GIF87a').force_encoding('ASCII-8BIT') => 'gif',
-                              (+'GIF89a').force_encoding('ASCII-8BIT') => 'gif' }
-
-      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]
+    class << self
+      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_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
+
+                # MSSQL spatial bitwise flags, often 0C for a point:
+                # xxxx xxx1 = HasZValues
+                # xxxx xx1x = HasMValues
+                # xxxx x1xx = IsValid
+                # xxxx 1xxx = IsSinglePoint
+                # xxx1 xxxx = IsSingleLineSegment
+                # 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_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?
+                    val = [0, 0, 0, 0, 1] + val[2..-1].reverse
+                  else
+                    val_err = '(Microsoft internal SQL geography type)'
+                  end
+                end
+              end
+            end
+            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
+        when :binary
+          ::Brick::Rails.display_binary(val) if val
+        else
+          if col_type
+            ::Brick::Rails::FormBuilder.hide_bcrypt(val, col_type == :xml)
+          else
+            '?'
+          end
+        end
       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)}\">"
+      def display_binary(val)
+        @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').force_encoding('ASCII-8BIT') => 'bmp',
+                                (+'GIF87a').force_encoding('ASCII-8BIT') => 'gif',
+                                (+'GIF89a').force_encoding('ASCII-8BIT') => 'gif' }
+
+        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;#{signature.last} image, #{val.length} bytes&nbsp;>"
+          "&lt;&nbsp;Binary, #{val.length} bytes&nbsp;>"
         end
-      else
-        "&lt;&nbsp;Binary, #{val.length} bytes&nbsp;>"
       end
     end
 
@@ -878,138 +945,7 @@ input+svg.revert {
     window.addEventListener(\"popstate\", function () { location.reload(true); });
 </script>
 
-<% is_includes_dates = nil
-   is_includes_json = nil
-   is_includes_text = nil
-def is_bcrypt?(val)
-  val.is_a?(String) && val.length == 60 && val.start_with?('$2a$')
-end
-def hide_bcrypt(val, is_xml = nil, max_len = 200)
-  if is_bcrypt?(val)
-    '(hidden)'
-  else
-    if val.is_a?(String)
-      val = val.dup.force_encoding('UTF-8').strip
-      return CGI.escapeHTML(val) if is_xml
-
-      if val.length > max_len
-        if val[0] == '<' # Seems to be HTML?
-          cur_len = 0
-          cur_idx = 0
-          # Find which HTML tags we might be inside so we can apply ending tags to balance
-          element_name = nil
-          in_closing = nil
-          elements = []
-          val.each_char do |ch|
-            case ch
-            when '<'
-              element_name = +''
-            when '/' # First character of tag is '/'?
-              in_closing = true if element_name == ''
-            when '>'
-              if element_name
-                if in_closing
-                  if (idx = elements.index { |tag| tag.downcase == element_name.downcase })
-                    elements.delete_at(idx)
-                  end
-                elsif (tag_name = element_name.split.first).present?
-                  elements.unshift(tag_name)
-                end
-                element_name = nil
-                in_closing = nil
-              end
-            else
-              element_name << ch if element_name
-            end
-            cur_idx += 1
-            # Unless it's inside wickets then this is real text content, and see if we're at the limit
-            break if element_name.nil? && ((cur_len += 1) > max_len)
-          end
-          val = val[0..cur_idx]
-          # Somehow still in the middle of an opening tag right at the end? (Should never happen)
-          if !in_closing && (tag_name = element_name&.split&.first)&.present?
-            elements.unshift(tag_name)
-            val << '>'
-          end
-          elements.each do |closing_tag|
-            val << \"</#\{closing_tag}>\"
-          end
-        else # Not HTML, just cut it at the length
-          val = val[0...max_len]
-        end
-        val = \"#\{val}...\"
-      end
-      val
-    else
-      val.to_s
-    end
-  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_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
-
-          # MSSQL spatial bitwise flags, often 0C for a point:
-          # xxxx xxx1 = HasZValues
-          # xxxx xx1x = HasMValues
-          # xxxx x1xx = IsValid
-          # xxxx 1xxx = IsSinglePoint
-          # xxx1 xxxx = IsSingleLineSegment
-          # 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_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?
-              val = [0, 0, 0, 0, 1] + val[2..-1].reverse
-            else
-              val_err = '(Microsoft internal SQL geography type)'
-            end
-          end
-        end
-      end
-      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
-  when :binary
-    ::Brick::Rails.display_binary(val) if val
-  else
-    if col_type
-      hide_bcrypt(val, col_type == :xml)
-    else
-      '?'
-    end
-  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 }
@@ -1569,10 +1505,10 @@ end
 <title><%=
   base_model = (model = (obj = @#{obj_name})&.class).base_class
   see_all_path = send(\"#\{base_model._brick_index}_path\")
-  if obj.respond_to?(:#{inh_col = @_brick_model.inheritance_column}) &&
-     (model_name = @#{obj_name}.#{inh_col}) != base_model.name
+#{(inh_col = @_brick_model.inheritance_column).present? &&
+"  if obj.respond_to?(:#{inh_col}) && (model_name = @#{obj_name}.#{inh_col}) != base_model.name
     see_all_path << \"?#{inh_col}=#\{model_name}\"
-  end
+  end"}
   page_title = (\"#\{model_name ||= model.name}: #\{obj&.brick_descrip || controller_name}\")
 %></title>
 </head>
@@ -1674,103 +1610,7 @@ end
     <% end %>
     </th>
     <td>
-    <table><tr><td>
-    <% dt_pickers = { datetime: 'datetimepicker', timestamp: 'datetimepicker', time: 'timepicker', date: 'datepicker' }
-       html_options = {}
-       html_options[:class] = 'dimmed' unless val
-       is_revert = true
-       if bt
-         html_options[:prompt] = \"Select #\{bt_name\}\" %>
-     <%= f.select k.to_sym, bt[3], { value: val || '^^^brick_NULL^^^' }, html_options %>
-     <%= if (bt_obj = bt_class&.find_by(bt_pair[1] => val))
-           link_to('⇛', send(\"#\{bt_class.base_class._brick_index(:singular)\}_path\".to_sym, bt_obj.send(bt_class.primary_key.to_sym)), { class: 'show-arrow' })
-         elsif val
-           \"<span class=\\\"orphan\\\">Orphaned ID: #\{val}</span>\".html_safe
-         end %>
-    <% elsif @_brick_monetized_attributes&.include?(k)
-    %><%= f.text_field(k.to_sym, html_options.merge({ value: Money.new(val.to_i).format })) %><%
-       else
-         col_type = if model.json_column?(col)
-                      :json
-                    elsif col&.sql_type == 'geography'
-                      col.sql_type
-                    else
-                      col&.type
-                    end
-         case (col_type ||= col&.sql_type)
-         when :string, :text
-           if is_bcrypt?(val) # || .readonly?
-             is_revert = false %>
-          <%= hide_bcrypt(val, nil, 1000) %>
-        <% elsif col_type == :string
-             if model.respond_to?(:enumerized_attributes) && (attr = model.enumerized_attributes[k])&.options.present?
-               enum_html_options = attr.kind_of?(Enumerize::Multiple) ? html_options.merge({ multiple: true, size: (opts = attr.options)&.length + 1 }) : html_options %>
-               <%= f.select(k.to_sym, [[\"(No #\{k} chosen)\", '^^^brick_NULL^^^']] + opts, { value: val || '^^^brick_NULL^^^' }, enum_html_options) %><%
-             else %>
-               <%= f.text_field(k.to_sym, html_options) %><%
-             end
-           else
-             is_includes_text = true %>
-          <%= f.hidden_field(k.to_sym, html_options) %>
-          <trix-editor input=\"<%= f.field_id(k) %>\"></trix-editor>
-        <% end %>
-      <% when :boolean %>
-        <%= f.check_box k.to_sym %>
-      <% when :integer, :decimal, :float %>
-        <%= digit_pattern = col_type == :integer ? '\\d*' : '\\d*(?:\\.\\d*|)'
-            # Used to do this for float / decimal:  f.number_field k.to_sym
-            f.text_field k.to_sym, { pattern: digit_pattern, class: 'check-validity' } %>
-      <% when *dt_pickers.keys
-           is_includes_dates = true %>
-        <%= f.text_field k.to_sym, { class: dt_pickers[col_type] } %>
-      <% when :uuid
-           is_revert = false %>
-        <%=
-          # Postgres naturally uses the +uuid_generate_v4()+ function from the uuid-ossp extension
-          # If it's not yet enabled then:  create extension \"uuid-ossp\";
-          # ActiveUUID gem created a new :uuid type
-          val %>
-      <% when :ltree %>
-        <%=
-          # 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 %>
-        <%= 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
-               ::Brick::Rails.display_binary(val)
-             end.html_safe
-           end %>
-      <% when :primary_key
-           is_revert = false %>
-      <% when :json
-           is_includes_json = true
-           if val.is_a?(String)
-             val_str = val
-           else
-             eheij = ActiveSupport::JSON::Encoding.escape_html_entities_in_json
-             ActiveSupport::JSON::Encoding.escape_html_entities_in_json = false if eheij
-             val_str = val.to_json
-             ActiveSupport::JSON::Encoding.escape_html_entities_in_json = eheij
-           end %>
-        <%= # Because there are so danged many quotes in JSON, escape them specially by converting to backticks.
-            # (and previous to this, escape backticks with our own goofy code of ^^br_btick__ )
-            json_field = f.hidden_field k.to_sym, { class: 'jsonpicker', value: val_str.gsub('`', '^^br_btick__').tr('\"', '`').html_safe } %>
-        <div id=\"_br_json_<%= f.field_id(k) %>\"></div>
-      <% else %>
-        <%= is_revert = false
-           display_value(col_type, val).html_safe %>
-      <% end
-       end
-       if is_revert
-         %></td>
-         <td><svg class=\"revert\" width=\"1.5em\" viewBox=\"0 0 512 512\"><use xlink:href=\"#revertPath\" /></svg>
-      <% end %>
-      </td></tr></table>
+      <%= f.brick_field(k, html_options = {}, val, col, bt, bt_class, bt_name, bt_pair) %>
     </td>
     </tr>
   <% end
@@ -1799,11 +1639,12 @@ end
                        # with a .where(). And the polymorphic class name it points to is the base class name of
                        # the STI model instead of its subclass.
                        poly_type = #{poly_type.inspect}
-                       if poly_type && @#{obj_name}.respond_to?(:#{@_brick_model.inheritance_column}) &&
+#{                     (inh_col = @_brick_model.inheritance_column).present? &&
+"                      if poly_type && @#{obj_name}.respond_to?(:#{inh_col}) &&
                           (base_type = collection.where_values_hash[poly_type])
-                         collection = collection.rewhere(poly_type => [base_type, @#{obj_name}.#{@_brick_model.inheritance_column}])
-                       end"
-      end
+                         collection = collection.rewhere(poly_type => [base_type, @#{obj_name}.#{inh_col}])
+                       end"}"
+                 end
       s << "<table id=\"#{hm_name}\" class=\"shadow\">
         <tr><th>#{hm[1]}#{' poly' if hm[0].options[:as]} #{hm[3]}</th></tr>
         <% collection = @#{obj_name}.#{hm_name}
@@ -1844,7 +1685,7 @@ end}
                        end
               unless is_crosstab
                 inline << "
-<% if is_includes_dates %>
+<% if @_date_fields_present %>
 <link rel=\"stylesheet\" type=\"text/css\" href=\"https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css\">
 <style>
 .flatpickr-calendar {
@@ -1859,18 +1700,18 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
 </script>
 <% end %>
 
-<% if false # is_includes_dropdowns %>
+<% if false # @_dropdown_fields_present %>
 <script src=\"https://cdnjs.cloudflare.com/ajax/libs/slim-select/1.27.1/slimselect.min.js\"></script>
 <link rel=\"stylesheet\" type=\"text/css\" href=\"https://cdnjs.cloudflare.com/ajax/libs/slim-select/1.27.1/slimselect.min.css\">
 <% end %>
 
-<% if is_includes_text %>
+<% if @_text_fields_present %>
 <script src=\"https://cdn.jsdelivr.net/npm/trix@2.0/dist/trix.umd.min.js\"></script>
 <link rel=\"stylesheet\" type=\"text/css\" href=\"https://cdn.jsdelivr.net/npm/trix@2.0/dist/trix.min.css\">
 <% end %>
 
 <% # Started with v0.14.4 of vanilla-jsoneditor
-   if is_includes_json %>
+   if @_json_fields_present %>
 <link rel=\"stylesheet\" type=\"text/css\" href=\"https://cdn.jsdelivr.net/npm/vanilla-jsoneditor/themes/jse-theme-default.min.css\">
 <script type=\"module\">
   import { JSONEditor } from \"https://cdn.jsdelivr.net/npm/vanilla-jsoneditor/index.min.js\";

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

@@ -0,0 +1,187 @@
+module Brick::Rails::FormBuilder
+  DT_PICKERS = { datetime: 'datetimepicker', timestamp: 'datetimepicker', time: 'timepicker', date: 'datepicker' }
+
+  # When this field is one of the appropriate types, will set one of these instance variables accordingly:
+  #   @_text_fields_present - To include trix editor
+  #   @_date_fields_present - To include flatpickr date / time editor
+  #   @_json_fields_present - To include JSONEditor
+  def brick_field(method, html_options = {}, val = nil, col = nil,
+                  bt = nil, bt_class = nil, bt_name = nil, bt_pair = nil)
+    model = self.object.class
+    col ||= model.columns_hash[method]
+    out = +'<table><tr><td>'
+    html_options[:class] = 'dimmed' unless val
+    is_revert = true
+    template = instance_variable_get(:@template)
+    if bt
+      bt_class ||= bt[1].first.first
+      bt_name ||= bt[1].map { |x| x.first.name }.join('/')
+      bt_pair ||= bt[1].first
+
+      html_options[:prompt] = "Select #{bt_name}"
+      out << self.select(method.to_sym, bt[3], { value: val || '^^^brick_NULL^^^' }, html_options)
+      bt_link = if (bt_obj = bt_class&.find_by(bt_pair[1] => val))
+                  bt_path = template.send(
+                              "#{bt_class.base_class._brick_index(:singular)}_path".to_sym,
+                              bt_obj.send(bt_class.primary_key.to_sym)
+                            )
+                  template.link_to('⇛', bt_path, { class: 'show-arrow' })
+                elsif val
+                  "<span class=\"orphan\">Orphaned ID: #{val}</span>".html_safe
+                end
+      out << bt_link if bt_link
+    elsif @_brick_monetized_attributes&.include?(method)
+      out << self.text_field(method.to_sym, html_options.merge({ value: Money.new(val.to_i).format }))
+    else
+      col_type = if model.json_column?(col) || val.is_a?(Array)
+                   :json
+                 elsif col&.sql_type == 'geography'
+                   col.sql_type
+                 else
+                   col&.type
+                 end
+      case (col_type ||= col&.sql_type)
+      when :string, :text
+        if ::Brick::Rails::FormBuilder.is_bcrypt?(val) # || .readonly?
+          is_revert = false
+          out << ::Brick::Rails::FormBuilder.hide_bcrypt(val, nil, 1000)
+        elsif col_type == :string
+          if model.respond_to?(:enumerized_attributes) && (opts = (attr = model.enumerized_attributes[method])&.options).present?
+            enum_html_options = attr.kind_of?(Enumerize::Multiple) ? html_options.merge({ multiple: true, size: opts.length + 1 }) : html_options
+            out << self.select(method.to_sym, [["(No #{method} chosen)", '^^^brick_NULL^^^']] + opts, { value: val || '^^^brick_NULL^^^' }, enum_html_options)
+          else
+            out << self.text_field(method.to_sym, html_options)
+          end
+        else
+          template.instance_variable_set(:@_text_fields_present, true)
+          out << self.hidden_field(method.to_sym, html_options)
+          out << "<trix-editor input=\"#{self.field_id(method)}\"></trix-editor>"
+        end
+      when :boolean
+        out << self.check_box(method.to_sym)
+      when :integer, :decimal, :float
+        digit_pattern = col_type == :integer ? '\d*' : '\d*(?:\.\d*|)'
+        # Used to do this for float / decimal:  self.number_field method.to_sym
+        out << self.text_field(method.to_sym, { pattern: digit_pattern, class: 'check-validity' })
+      when *DT_PICKERS.keys
+        template.instance_variable_set(:@_date_fields_present, true)
+        out << self.text_field(method.to_sym, { class: DT_PICKERS[col_type] })
+      when :uuid
+        is_revert = false
+        # Postgres naturally uses the +uuid_generate_v4()+ function from the uuid-ossp extension
+        # If it's not yet enabled then:  create extension \"uuid-ossp\";
+        # ActiveUUID gem created a new :uuid type
+        out << val
+      when :ltree
+        # In Postgres labels of data stored in a hierarchical tree-like structure
+        # If it's not yet enabled then:  create extension ltree;
+        out << val
+      when :binary
+        is_revert = false
+        if val
+          # %%% This same kind of geography check is done two other times in engine.rb ... would be great to DRY it up.
+          out << if val.length < 31 && (val.length - 6) % 8 == 0 && val[0..5].bytes == [230, 16, 0, 0, 1, 12]
+                   ::Brick::Rails.display_value('geography', val)
+                 else
+                   ::Brick::Rails.display_binary(val)
+                 end
+        end
+      when :primary_key
+        is_revert = false
+      when :json
+        template.instance_variable_set(:@_json_fields_present, true)
+        if val.is_a?(String)
+          val_str = val
+        else
+          eheij = ActiveSupport::JSON::Encoding.escape_html_entities_in_json
+          ActiveSupport::JSON::Encoding.escape_html_entities_in_json = false if eheij
+          val_str = val.to_json
+          ActiveSupport::JSON::Encoding.escape_html_entities_in_json = eheij
+        end
+        # Because there are so danged many quotes in JSON, escape them specially by converting to backticks.
+        # (and previous to this, escape backticks with our own goofy code of ^^br_btick__ )
+        out << (json_field = self.hidden_field(method.to_sym, { class: 'jsonpicker', value: val_str.gsub('`', '^^br_btick__').tr('\"', '`').html_safe }))
+        out << "<div id=\"_br_json_#{self.field_id(method)}\"></div>"
+      else
+        is_revert = false
+        out << ::Brick::Rails.display_value(col_type, val).html_safe
+      end
+    end
+    if is_revert
+      out << "</td>
+"
+      out << '<td><svg class="revert" width="1.5em" viewBox="0 0 512 512"><use xlink:href="#revertPath" /></svg>'
+    end
+    out << "</td></tr></table>
+"
+    out.html_safe
+  end # brick_field
+
+  # --- CLASS METHODS ---
+
+  def self.is_bcrypt?(val)
+    val.is_a?(String) && val.length == 60 && val.start_with?('$2a$')
+  end
+
+  def self.hide_bcrypt(val, is_xml = nil, max_len = 200)
+    if ::Brick::Rails::FormBuilder.is_bcrypt?(val)
+      '(hidden)'
+    else
+      if val.is_a?(String)
+        val = val.dup.force_encoding('UTF-8').strip
+        return CGI.escapeHTML(val) if is_xml
+  
+        if val.length > max_len
+          if val[0] == '<' # Seems to be HTML?
+            cur_len = 0
+            cur_idx = 0
+            # Find which HTML tags we might be inside so we can apply ending tags to balance
+            element_name = nil
+            in_closing = nil
+            elements = []
+            val.each_char do |ch|
+              case ch
+              when '<'
+                element_name = +''
+              when '/' # First character of tag is '/'?
+                in_closing = true if element_name == ''
+              when '>'
+                if element_name
+                  if in_closing
+                    if (idx = elements.index { |tag| tag.downcase == element_name.downcase })
+                      elements.delete_at(idx)
+                    end
+                  elsif (tag_name = element_name.split.first).present?
+                    elements.unshift(tag_name)
+                  end
+                  element_name = nil
+                  in_closing = nil
+                end
+              else
+                element_name << ch if element_name
+              end
+              cur_idx += 1
+              # Unless it's inside wickets then this is real text content, and see if we're at the limit
+              break if element_name.nil? && ((cur_len += 1) > max_len)
+            end
+            val = val[0..cur_idx]
+            # Somehow still in the middle of an opening tag right at the end? (Should never happen)
+            if !in_closing && (tag_name = element_name&.split&.first)&.present?
+              elements.unshift(tag_name)
+              val << '>'
+            end
+            elements.each do |closing_tag|
+              val << "</#{closing_tag}>"
+            end
+          else # Not HTML, just cut it at the length
+            val = val[0...max_len]
+          end
+          val = "#{val}..."
+        end
+        val
+      else
+        val.to_s
+      end
+    end
+  end  
+end

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

@@ -133,7 +133,7 @@ module Brick::Rails::FormTags
                    val ? Money.new(val.to_i).format : ''
                  else
                    col_type = col&.sql_type == 'geography' ? col.sql_type : col&.type
-                   display_value(col_type || col&.sql_type, val).to_s
+                   ::Brick::Rails.display_value(col_type || col&.sql_type, val).to_s
                  end
         elsif cust_col
           data = cust_col.first.map { |cc_part| obj.send(cc_part.last) }

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 125
+    TINY = 127
 
     # 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.125
+  version: 1.0.127
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-02 00:00:00.000000000 Z
+date: 2023-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -244,6 +244,7 @@ files:
 - lib/brick/frameworks/rails/controller.rb
 - lib/brick/frameworks/rails/crosstab.brk
 - lib/brick/frameworks/rails/engine.rb
+- lib/brick/frameworks/rails/form_builder.rb
 - lib/brick/frameworks/rails/form_tags.rb
 - lib/brick/frameworks/rspec.rb
 - lib/brick/join_array.rb
@@ -270,7 +271,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.5
+      version: 2.3.8
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="