brick 1.0.119 → 1.0.121

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dfec2ebe501c46c17a7466bd98a9fb510ce6676f74c9b914da52e789e279036
-  data.tar.gz: 803598a5b59f73e81ed94079dd2b7dd55328c5c12de6d6968937b6518b68cef7
+  metadata.gz: 142adfa751be46ca1115b6e6f6945ab25ad10148e55c7584eba6f91be62c6cf0
+  data.tar.gz: a20a11f7fc6c864fbf9c5d9b4c6f80f29c0d26380e0aa110b63183f6e0c2e3e0
 SHA512:
-  metadata.gz: 1618ef1ff14f0198d45aa0aafc5ee9e0272c82a886b0129e14cfe6c47fea1cbb55c76f32cf2a98eb93915c68a62275ad53e5ab32621da45b9a7397e2d1f95f3f
-  data.tar.gz: f34063a9ebc164bf352d96b1149f1ed501a351c3e786219a29593be13359162c9bb140cf822d9ce1494be9ea43b655afb0422008d6fcc64f59ee7050a1e84072
+  metadata.gz: 84c6880fcb0c2aa00ee7484053c40afc61e2f9e66af38bb677408f762002c8a990a2f68bd3f17443916e02ed1a08b1db605bc28a7e913b2841bbb1318a3dcca0
+  data.tar.gz: 377decd3c088a4ddc6034de54aed3885e99b10e54a5336885a4b8ed1c611e52947af99728b48ffa6bb0b5ec29babf971dea580bcfca053deb4f5fb3f60fd1877

data/lib/brick/extensions.rb

@@ -2613,18 +2613,25 @@ module Brick
                    end
       abstract_activerecord_bases = ::Brick.eager_load_classes(true)
       models = if Dir.exist?(model_path = "#{rails_root}/app/models")
-                 Dir["#{model_path}/**/*.rb"].each_with_object({}) do |v, s|
-                   File.read(v).split("\n").each do |line|
+                 Dir["#{model_path}/**/*.rb"].each_with_object({}) do |path, s|
+                   modules = []
+                   File.read(path).split("\n").each do |line|
+                     # Capture a list of modules leading up to this class
+                     if line.lstrip.start_with?('module ') && (idx = line.index('module'))
+                       modules << line[idx + 6..-1].match(/[\s:]+([\w:]+)/)&.captures&.first
+                     end
                      # For all non-commented lines, look for any that start with "class " and also "< ApplicationRecord"
-                     if line.lstrip.start_with?('class') && (idx = line.index('class'))
-                       model = line[idx + 5..-1].match(/[\s:]+([\w:]+)/)&.captures&.first
-                       if model && abstract_activerecord_bases.exclude?(model)
+                     if line.lstrip.start_with?('class ') && (idx = line.index('class')) &&
+                        (model_name = line[idx + 5..-1].match(/[\s:]+([\w:]+)/)&.captures&.first)
+                       # Prefix model class name with module names, if any
+                       model_name = modules.map{|m| "#{m}::"}.join + model_name
+                       unless abstract_activerecord_bases.include?(model_name)
                          klass = begin
-                                   model.constantize
+                                   model_name.constantize
                                  rescue
                                  end
-                         s[model.underscore.tr('/', '.').pluralize] = [
-                           v.start_with?(rails_root) ? v[rails_root.length + 1..-1] : v,
+                         s[model_name.underscore.tr('/', '.').pluralize] = [
+                           path.start_with?(rails_root) ? path[rails_root.length + 1..-1] : path,
                            klass
                          ]
                        end

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

@@ -2,6 +2,39 @@
 
 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]
+      end
+
+      if (signature = @image_signatures.find { |k, _v| val[0...k.length] == k })
+        if val.length < 500_000
+          "<img src=\"data:image/#{signature.last};base64,#{Base64.encode64(val)}\">"
+        else
+          "&lt;&nbsp;#{signature.last} image, #{val.length} bytes&nbsp;>"
+        end
+      else
+        "&lt;&nbsp;Binary, #{val.length} bytes&nbsp;>"
+      end
+    end
+
     # See http://guides.rubyonrails.org/engines.html
     class Engine < ::Rails::Engine
       JS_CHANGEOUT = "function changeout(href, param, value, trimAfter) {
@@ -938,7 +971,7 @@ def display_value(col_type, val)
       '(Add RGeo gem to parse geometry detail)'
     end
   when :binary
-    display_binary(val) if val
+    ::Brick::Rails.display_binary(val) if val
   else
     if col_type
       hide_bcrypt(val, col_type == :xml)
@@ -948,39 +981,6 @@ def display_value(col_type, val)
   end
 end
 
-def image_signatures
-  @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' }
-end
-def display_binary(val)
-  if val[0..1] == \"\\x15\\x1C\" # One of those goofy Microsoft OLE containers?
-    package_header_length = val[2..3].bytes.reverse.inject(0) {|m, b| (m << 8) + b }
-    # This will often be just FF FF FF FF
-    # object_size = val[16..19].bytes.reverse.inject(0) {|m, b| (m << 8) + b }
-    friendly_and_class_names = val[20...package_header_length].split(\"\\0\")
-    object_type_name_length = val[package_header_length + 8..package_header_length+11].bytes.reverse.inject(0) {|m, b| (m << 8) + b }
-    friendly_and_class_names << val[package_header_length + 12...package_header_length + 12 + object_type_name_length].strip
-    # friendly_and_class_names will now be something like:  ['Bitmap Image', 'Paint.Picture', 'PBrush']
-    real_object_size = val[package_header_length + 20 + object_type_name_length..package_header_length + 23 + object_type_name_length].bytes.reverse.inject(0) {|m, b| (m << 8) + b }
-    object_start = package_header_length + 24 + object_type_name_length
-    val = val[object_start...object_start + real_object_size]
-  end
-  if (signature = image_signatures.find { |k, _v| val[0...k.length] == k })
-    if val.length < 500_000
-      \"<img src=\\\"data:image/#\{signature.last};base64,#\{Base64.encode64(val)}\\\">\"
-    else
-      \"&lt;&nbsp;#\{signature.last} image, #\{val.length} bytes&nbsp;>\"
-    end
-  else
-    \"&lt;&nbsp;Binary, #\{val.length} bytes&nbsp;>\"
-  end
-end
-
 # Accommodate composite primary keys that include strings with forward-slash characters
 def slashify(*vals)
   vals.map { |val_part| val_part.is_a?(String) ? val_part.gsub('/', '^^sl^^') : val_part }
@@ -1685,7 +1685,7 @@ end
              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)
+               ::Brick::Rails.display_binary(val)
              end.html_safe
            end %>
       <% when :primary_key

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

@@ -72,10 +72,12 @@ module Brick::Rails::FormTags
         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
+            if (poly_id = obj.send("#{bt.first}_id"))
+              # Was:  obj.send("#{bt.first}_type")
+              bt_class = obj.send(obj.class.reflect_on_association(bt.first).foreign_type)
+              base_class_underscored = (::Brick.existing_stis[bt_class] || bt_class).constantize.base_class._brick_index(:singular)
+              out << link_to("#{bt_class} ##{poly_id}", send("#{base_class_underscored}_path".to_sym, poly_id))
+            end
           else # BT or HOT
             bt_class = bt[1].first.first
             descrips = bt_descrip[bt.first][bt_class]
@@ -84,13 +86,19 @@ module Brick::Rails::FormTags
                         elsif descrips.length == 1
                           [obj.class.reflect_on_association(bt.first)&.foreign_key]
                         else
-                          descrips.last
+                          # Was:  descrips.last  -- but the ID stuff is not coming through anymore
+                          [bt.first]
                         end
-            bt_txt = bt_class.brick_descrip(
+            txt_parts = descrips.map do |id|
+              obj2 = obj
+              id[0..-2].each { |ref| obj2 = obj2&.send(ref) }
               # 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'
+              obj2&.send(id.last[0..62])
+            end
+            unless txt_parts.compact.empty?
+              bt_txt = bt_class.brick_descrip(obj, txt_parts, bt_id_col)
+              bt_txt = ::Brick::Rails.display_binary(bt_txt).html_safe if bt_txt&.encoding&.name == 'ASCII-8BIT'
+            end
             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 || '')
@@ -102,7 +110,7 @@ module Brick::Rails::FormTags
             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
+              if (ho_id = (ho_id_col = descrips.last).map { |id_col| obj.respond_to?(id_sym = id_col.to_sym) && obj.send(id_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

data/lib/brick/version_number.rb

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

data/lib/generators/brick/install_generator.rb

@@ -268,7 +268,7 @@ if ActiveRecord::Base.respond_to?(:brick_select) && !::Brick.initializer_loaded
   # # FRIENDLY DSL
 
   # # A simple DSL is available to allow more user-friendly display of objects.  Normally a user object might be shown
-  # # as its first non-metadata column, or if that is not available then something like \"User #45\" where 45 is that
+  # # as its first non-metadata column, or if that is not available then something like \"User #42\" where 42 is that
   # # object's ID.  If there is no primary key then even that is not possible, so the object's .to_s method is called.
   # # To override these defaults and specify exactly what you want shown, such as first names and last names for a
   # # user, then you can use model_descrips like this, putting expressions with property references in square brackets:

metadata

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