brick 1.0.120 → 1.0.121

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faca98f57870f50ba6474325fa995fe70ac36b4efd4c58946553242afe7ccb86
-  data.tar.gz: 3dd28e3cb60b74bd99209da86e302b7301e0eb844e314e7c56dde43ed4475b7e
+  metadata.gz: 142adfa751be46ca1115b6e6f6945ab25ad10148e55c7584eba6f91be62c6cf0
+  data.tar.gz: a20a11f7fc6c864fbf9c5d9b4c6f80f29c0d26380e0aa110b63183f6e0c2e3e0
 SHA512:
-  metadata.gz: 3ccbfc86abb0a16f053ddbf0b43e0c96a6d70a9f2ab3cab95ea008d76bcba1572aaf87b5d6eb9a79a342c20b26b900c42a1dd178c6b478e6f0f8daf372bb9189
-  data.tar.gz: 464e92a80e820c66c8ed2517593440e0752bfc4b8d7fdf3667fd662291b6663e95e417f60281647529cea7c11c0d13a3fa5c22d69142c6b880db5ae077e632d3
+  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/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 = ::Brick::Rails.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 = 120
+    TINY = 121
 
     # 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.120
+  version: 1.0.121
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord