brick 1.0.93 → 1.0.94

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8488acac0623c04f11e916c67303fd06d471154231c92613318cc7458fcfe23f
-  data.tar.gz: af566c853bb25e7497a6afbba539ad0d14ec23ad000c053e6dbdf757deefbaa0
+  metadata.gz: 4b4de74edca4a5dd2c7d57d23dda2aa4cbc966402db4f2d0490dfeb741224dd5
+  data.tar.gz: fe905ed82bf8ae8f249e5ce3fe1646cb6366caf3343086ea8ba597e51525f521
 SHA512:
-  metadata.gz: d0d8428b6f80bf3a79abb16265fb8625404f92caf30034da94186a5c5982a78543f29e0a49cc0dc515eb8b6d6da24ccdd53e8d089c90dce46ce214ce5bee4339
-  data.tar.gz: 562bd7522f0f45843a89464645e1cc153e455e1e5b4e3dec5f1b38a8bfaefd8bd359a2538aa274b90b50353285d2175f315b7e304e54e60516a5ce2ed3b2fc7e
+  metadata.gz: 45d2dda76345ab043c4e62d92b5e12a466ffec892e1ce63b540bd6427fcecfa777739732754d554f78b5803599fca1390fa2d38cb8f0acd9b0ffd8e5c6dd34aa
+  data.tar.gz: 65b73535a5874fe5b3c46fec455fe62857259c7d56b68241a729f2c928a47e0fdcc71988a3b7ead506de717fae71932007855efaf18dd8866b920da2c6d5c779

data/lib/brick/extensions.rb

@@ -245,12 +245,15 @@ module ActiveRecord
     end
 
     def self.bt_link(assoc_name)
-      assoc_name = CGI.escapeHTML(assoc_name.to_s)
+      assoc_html_name = unless (assoc_name = assoc_name.to_s).camelize == name
+                          CGI.escapeHTML(assoc_name)
+                        end
       model_path = ::Rails.application.routes.url_helpers.send("#{_brick_index}_path".to_sym)
+      model_path << "?#{self.inheritance_column}=#{self.name}" if self != base_class
       av_class = Class.new.extend(ActionView::Helpers::UrlHelper)
       av_class.extend(ActionView::Helpers::TagHelper) if ActionView.version < ::Gem::Version.new('7')
-      link = av_class.link_to(name, model_path)
-      table_name == assoc_name ? link : "#{assoc_name}-#{link}".html_safe
+      link = av_class.link_to(assoc_html_name ? name : assoc_name, model_path)
+      assoc_html_name ? "#{assoc_name}-#{link}".html_safe : link
     end
 
     def self._brick_index(mode = nil)
@@ -542,7 +545,7 @@ module ActiveRecord
               field_tbl_name = "\"#{field_tbl_name}\"" if ::Brick.is_oracle && rel_dupe.brick_links.values.include?(field_tbl_name)
 
               # Postgres can not use DISTINCT with any columns that are XML, so for any of those just convert to text
-              is_xml = is_distinct && Brick.relations[field_tbl_name]&.[](:cols)&.[](sel_col.last)&.first&.start_with?('xml')
+              is_xml = is_distinct && Brick.relations[k1.table_name]&.[](:cols)&.[](sel_col.last)&.first&.start_with?('xml')
               # If it's not unique then also include the belongs_to association name before the column name
               if used_col_aliases.key?(col_alias = "br_fk_#{v.first}__#{sel_col.last}")
                 col_alias = "br_fk_#{v.first}__#{v1[idx][-2..-1].map(&:to_s).join('__')}"
@@ -2310,7 +2313,7 @@ module Brick
       rails_root = ::Rails.root.to_s
       migrations = if Dir.exist?(mig_path = ActiveRecord::Migrator.migrations_paths.first || "#{rails_root}/db/migrate")
                      Dir["#{mig_path}/**/*.rb"].each_with_object(Hash.new { |h, k| h[k] = [] }) do |v, s|
-                       File.read(v).split("\n").each do |line|
+                       File.read(v).split("\n").each_with_index do |line, line_idx|
                          # For all non-commented lines, look for any that have "create_table", "alter_table", or "drop_table"
                          if !line.lstrip.start_with?('#') &&
                             (idx = (line.index('create_table ') || line.index('create_table('))&.+(13)) ||
@@ -2318,8 +2321,9 @@ module Brick
                             (idx = (line.index('drop_table ') || line.index('drop_table('))&.+(11))
                            tbl = line[idx..-1].match(/([:'"\w\.]+)/)&.captures&.first
                            if tbl
-                             s[tbl.tr(':\'"', '').pluralize] << v
-                             break
+                             v = v[(rails_root.length)..-1] if v.start_with?(rails_root)
+                             v = v[1..-1] if v.start_with?('/')
+                             s[tbl.tr(':\'"', '').pluralize] << [v, line_idx + 1]
                            end
                          end
                        end

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

@@ -141,10 +141,10 @@ module Brick
                                  next unless @_brick_model.instance_methods.include?(through) &&
                                              (associative = @_brick_model._br_associatives.fetch(hm.first, nil))
 
-                                 tbl_nm = if (source = hm_assoc.source_reflection).macro == :belongs_to
-                                            hm_assoc.through_reflection&.name # for standard HMT, which is HM -> BT
-                                          else
+                                 tbl_nm = if (source = hm_assoc.source_reflection).macro == :has_many
                                             source.inverse_of&.name # For HM -> HM style HMT
+                                          else # belongs_to or has_one
+                                            hm_assoc.through_reflection&.name # for standard HMT, which is HM -> BT
                                           end
                                  # If there is no inverse available for the source belongs_to association, make one based on the class name
                                  unless tbl_nm
@@ -203,7 +203,6 @@ module Brick
               # environment or whatever, then get either the controllers or routes list instead
               prefix = "#{::Brick.config.path_prefix}/" if ::Brick.config.path_prefix
               table_options = (::Brick.relations.keys - ::Brick.config.exclude_tables).each_with_object({}) do |tbl, s|
-                                binding.pry if tbl.is_a?(Symbol)
                                 if (tbl_parts = tbl.split('.')).first == apartment_default_schema
                                   tbl = tbl_parts.last
                                 end
@@ -911,7 +910,9 @@ erDiagram
      end
      unless @_brick_sequence # If no sequence is defined, start with all inclusions
        cust_cols = #{model_name}._br_cust_cols
-       @_brick_sequence = col_keys + cust_cols.keys + #{(hms_keys).inspect}.reject { |assoc_name| @_brick_incl&.exclude?(assoc_name) }
+       # HOT columns, kept as symbols
+       hots = #{model_name}._br_bt_descrip.keys.select { |k| bts.key?(k) }
+       @_brick_sequence = col_keys + cust_cols.keys + hots + #{(hms_keys).inspect}.reject { |assoc_name| @_brick_incl&.exclude?(assoc_name) }
      end
      @_brick_sequence.reject! { |nm| @_brick_excl.include?(nm) } if @_brick_excl # Reject exclusions
      @_brick_sequence.each_with_object(+'') do |col_name, s|
@@ -928,8 +929,12 @@ erDiagram
        elsif col # HM column
          s << \"<th#\{' x-order=\"' + col_name + '\"' if true}>#\{col[2]} \"
          s << (col.first ? \"#\{col[3]}\" : \"#\{link_to(col[3], send(\"#\{col[1]._brick_index}_path\"))}\")
-       elsif (cc = cust_cols.key?(col_name)) # Custom column
+       elsif cust_cols.key?(col_name) # Custom column
          s << \"<th x-order=\\\"#\{col_name}\\\">#\{col_name}\"
+       elsif col_name.is_a?(Symbol) && (hot = bts[col_name]) # has_one :through
+         s << \"<th x-order=\\\"#\{hot.first.to_s}\\\">HOT \" +
+              hot[1].map { |hot_pair| hot_pair.first.bt_link(col_name) }.join(' ')
+         hot[1].first
        else # Bad column name!
          s << \"<th title=\\\"<< Unknown column >>\\\">#\{col_name}\"
        end
@@ -947,14 +952,16 @@ erDiagram
     <td><%= link_to '⇛', #{path_obj_name}_path(slashify(#{obj_pk})), { class: 'big-arrow' } %></td>" if obj_pk}
     <% @_brick_sequence.each do |col_name|
          val = #{obj_name}.attributes[col_name] %>
-      <td<%= ' class=\"dimmed\"'.html_safe unless cols.key?(col_name) || (cust_col = cust_cols[col_name])%>><%
+      <td<%= ' class=\"dimmed\"'.html_safe unless cols.key?(col_name) || (cust_col = cust_cols[col_name]) || 
+                                                  (col_name.is_a?(Symbol) && bts.key?(col_name)) # HOT
+         %>><%
          if (bt = bts[col_name])
            if bt[2] # Polymorphic?
              bt_class = #{obj_name}.send(\"#\{bt.first}_type\")
              base_class_underscored = (::Brick.existing_stis[bt_class] || bt_class).constantize.base_class._brick_index(:singular)
              poly_id = #{obj_name}.send(\"#\{bt.first}_id\")
              %><%= link_to(\"#\{bt_class} ##\{poly_id}\", send(\"#\{base_class_underscored}_path\".to_sym, poly_id)) if poly_id %><%
-           else
+           else # BT or HOT
              bt_class = bt[1].first.first
              descrips = @_brick_bt_descrip[bt.first][bt_class]
              bt_id_col = if descrips.nil?
@@ -1041,7 +1048,7 @@ erDiagram
   %>
   <tr>
   <td><%= begin
-            kls = Object.const_get(::Brick.relations[r[0]].fetch(:class_name, nil))
+            kls = Object.const_get(::Brick.relations.fetch(r[0], nil)&.fetch(:class_name, nil))
           rescue
           end
           kls ? link_to(r[0], send(\"#\{kls._brick_index}_path\".to_sym)) : r[0] %></td>
@@ -1051,8 +1058,9 @@ erDiagram
            ' class=\"dimmed\"'
          end&.html_safe %>><%= # Table
           r[1] %></td>
-  <td<%= ' class=\"dimmed\"'.html_safe unless r[2] %>><%= # Migration
-          r[2]&.join('<br>')&.html_safe %></td>
+  <td<%= lines = r[2]&.map { |line| \"#\{line.first}:#\{line.last}\" }
+         ' class=\"dimmed\"'.html_safe unless r[2] %>><%= # Migration
+          lines&.join('<br>')&.html_safe %></td>
   <td<%= ' class=\"dimmed\"'.html_safe unless r[3] %>><%= # Model
           r[3] %></td>
   <td<%= ' class=\"dimmed\"'.html_safe unless r[4] %>><%= # Route

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -211,12 +211,13 @@ module Brick
           else
             s.first[a.foreign_key.to_s] = [a.name, a.klass]
           end
-        else # This gets has_many as well as has_one and has_many :through
-          if through
+        else # This gets all forms of has_many and has_one
+          if through # has_many :through or has_one :through
             is_invalid_source = nil
             begin
-              if a.through_reflection&.belongs_to?
-                puts "WARNING:  HMT relationship :#{a.name} in model #{model.name} tries to go through belongs_to association :#{through}.  This is not possible."
+              if a.through_reflection.macro != :has_many # This HM goes through either a belongs_to or a has_one, so essentially a HOT?
+                # Treat it like a belongs_to - just keyed on the association name instead of a foreign_key
+                s.first[a.name] = [a.name, a.klass]
                 next
               elsif !a.source_reflection # Had considered:  a.active_record.reflect_on_association(a.source_reflection_name).nil?
                 is_invalid_source = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.93
+  version: 1.0.94
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-21 00:00:00.000000000 Z
+date: 2022-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord