brick 1.0.44 → 1.0.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d43e8d88203f6496d0e86f57a3de2638f254a74da070d6a0f0ae107bf596a87
-  data.tar.gz: d5ce2e3814f36fa758762e3c4774032c70ce18a101cdd1e30622dd86c757ab1a
+  metadata.gz: 4180c0164d7f086112339696df9d8fef2aeebcd32d9b81faf22d76ddc11815bc
+  data.tar.gz: 823673bcbecc342f5df15e196ee65ad6f6ac0b75415514079c055af06d0ac7f6
 SHA512:
-  metadata.gz: 36b8bf590c1d980655b8c465e52659fdbcdf3e13b7050e46dcb41c2b3fba44ebc9ff14db823afddbb49b3e6b736a33fa1ef794ed6062aba4e35ade3cd95c5bbd
-  data.tar.gz: d1bd0954d0400068aaf8f7c83cc599f283fbe9c75e347fd4193d1fa3973c0d2bd3198f3265990cd3d24f406cd3b55f3174518bd6a991801c75a06d1c749cc157
+  metadata.gz: 1d17b1abd64051066b71839095be1e672b897ad707a2d10f4ca4429131c894ee178711c873cef59957111704437b86b6322b8909ab5cc41cc955547146377dd8
+  data.tar.gz: e210becff69096e73b9b7fa09bb4e1be6c36cd2982305b2c803c9c00e9d2b5b085857ea6edacc62498557cde928e2afbbb42ebbd137180385ec3a8a0c5efdf85

data/lib/brick/extensions.rb

@@ -274,7 +274,6 @@ module ActiveRecord
             table = table.left
           end
           (_brick_chains[table._arel_table_type] ||= []) << (alias_name || table.table_alias || table.name)
-          # puts "YES! #{self.object_id}"
         end
         # rubocop:enable Style/IdenticalConditionalBranches
       when Arel::Table # Table
@@ -286,9 +285,9 @@ module ActiveRecord
         # Spin up an empty set of Brick alias name chains at the start
         @_brick_chains = {}
         # The left side is the "FROM" table
-        # names += _recurse_arel(piece.left)
         names << (this_name = [piece.left._arel_table_type, (piece.left.table_alias || piece.left.name)])
-        (_brick_chains[this_name.first] ||= []) << this_name.last
+        # # Do not currently need the root "FROM" table in our list of chains
+        # (_brick_chains[this_name.first] ||= []) << this_name.last
         # The right side is an array of all JOINs
         piece.right.each { |join| names << _recurse_arel(join) }
       end
@@ -354,7 +353,6 @@ module ActiveRecord
           next if bt[2] # Polymorphic?
 
           # join_array will receive this relation name when calling #brick_parse_dsl
-          # binding.pry if bt.length > 2
           bt_descrip[bt.first] = if bt[1].is_a?(Array)
                                    bt[1].each_with_object({}) { |bt_class, s| s[bt_class] = bt_class.brick_parse_dsl(join_array, bt.first, translations, true) }
                                  else
@@ -598,7 +596,7 @@ Module.class_exec do
                # See if a file is there in the same way that ActiveSupport::Dependencies#load_missing_constant
                # checks for it in ~/.rvm/gems/ruby-2.7.5/gems/activesupport-5.2.6.2/lib/active_support/dependencies.rb
 
-               if (base_model = ::Brick.config.sti_namespace_prefixes&.fetch("::#{name}::", nil)&.constantize) || # Are we part of an auto-STI namespace? ...
+               if (base_model = ::Brick.config.sti_namespace_prefixes&.fetch("::#{self.name}::", nil)&.constantize) || # Are we part of an auto-STI namespace? ...
                   self != Object # ... or otherwise already in some namespace?
                  schema_name = [(singular_schema_name = name.underscore),
                                 (schema_name = singular_schema_name.pluralize),
@@ -775,33 +773,47 @@ class Object
       end # class definition
       # Having this separate -- will this now work out better?
         built_model.class_exec do
-          hmts&.each do |hmt_fk, fks|
+          hmts&.each do |hmt_fk, hms|
             hmt_fk = hmt_fk.tr('.', '_')
-            fks.each do |fk|
-              # %%% Will not work with custom has_many name
-              through = ::Brick.config.schema_behavior[:multitenant] ? fk.first[:assoc_name] : fk.first[:inverse_table].tr('.', '_').pluralize
-              hmt_name = if fks.length > 1
-                           if fks[0].first[:inverse][:assoc_name] == fks[1].first[:inverse][:assoc_name] # Same BT names pointing back to us? (Most common scenario)
-                             "#{hmt_fk}_through_#{fk.first[:assoc_name]}"
+            hms.each do |hm|
+              # %%% Need to confirm that HMTs work when they are built from has_manys with custom names
+              through = ::Brick.config.schema_behavior[:multitenant] ? hm.first[:assoc_name] : hm.first[:inverse_table].tr('.', '_').pluralize
+              options = {}
+              hmt_name = if hms.length > 1
+                           if hms[0].first[:inverse][:assoc_name] == hms[1].first[:inverse][:assoc_name] # Same BT names pointing back to us? (Most common scenario)
+                             "#{hmt_fk}_through_#{hm.first[:assoc_name]}"
                            else # Use BT names to provide uniqueness
-                             through = fk.first[:alternate_name].pluralize
-                             singular_assoc_name = fk.first[:inverse][:assoc_name].singularize
+                             if self.name.underscore.singularize == hm.first[:alternate_name]
+                              #  Has previously been:
+                              # # If it folds back on itself then look at the other side
+                              # # (At this point just infer the source be the inverse of the first has_many that
+                              # # we find that is not ourselves.  If there are more than two then uh oh, can't
+                              # # yet handle that rare circumstance!)
+                              # other = hms.find { |hm1| hm1 != hm } # .first[:fk]
+                              # options[:source] = other.first[:inverse][:assoc_name].to_sym
+                              #  And also has been:
+                              # hm.first[:inverse][:assoc_name].to_sym
+                               options[:source] = hm.last.to_sym
+                             else
+                               through = hm.first[:alternate_name].pluralize
+                             end
+                             singular_assoc_name = hm.first[:inverse][:assoc_name].singularize
                              "#{singular_assoc_name}_#{hmt_fk}"
                            end
                          else
                            hmt_fk
                          end
-              options = { through: through.to_sym }
+              options[:through] = through.to_sym
               if relation[:fks].any? { |k, v| v[:assoc_name] == hmt_name }
-                hmt_name = "#{hmt_name.singularize}_#{fk.first[:assoc_name]}"
+                hmt_name = "#{hmt_name.singularize}_#{hm.first[:assoc_name]}"
                 # Was:
-                # options[:class_name] = fk.first[:inverse_table].singularize.camelize
-                # options[:foreign_key] = fk.first[:fk].to_sym
-                far_assoc = relations[fk.first[:inverse_table]][:fks].find { |_k, v| v[:assoc_name] == fk.last }
+                # options[:class_name] = hm.first[:inverse_table].singularize.camelize
+                # options[:foreign_key] = hm.first[:fk].to_sym
+                far_assoc = relations[hm.first[:inverse_table]][:fks].find { |_k, v| v[:assoc_name] == hm.last }
                 options[:class_name] = far_assoc.last[:inverse_table].singularize.camelize
                 options[:foreign_key] = far_assoc.last[:fk].to_sym
               end
-              options[:source] = fk.last.to_sym unless hmt_name.singularize == fk.last
+              options[:source] ||= hm.last.to_sym unless hmt_name.singularize == hm.last
               code << "  has_many :#{hmt_name}#{options.map { |opt| ", #{opt.first}: #{opt.last.inspect}" }.join}\n"
               self.send(:has_many, hmt_name.to_sym, **options)
             end
@@ -832,13 +844,13 @@ class Object
                   need_fk = "#{assoc_name}_id" != assoc[:fk]
                 end
                 if (inverse = assoc[:inverse])
-                  inverse_assoc_name, _x = _brick_get_hm_assoc_name(relations[inverse_table], inverse)
                   # If it's multitenant with something like:  public.____ ...
                   if (it_parts = inverse_table.split('.')).length > 1 &&
                      ::Brick.config.schema_behavior[:multitenant] && Object.const_defined?('Apartment') &&
                      it_parts.first == Apartment.default_schema
                     it_parts.shift # ... then ditch the generic schema name
                   end
+                  inverse_assoc_name, _x = _brick_get_hm_assoc_name(relations[inverse_table], inverse, it_parts.join('_').singularize)
                   has_ones = ::Brick.config.has_ones&.fetch(it_parts.join('/').singularize.camelize, nil)
                   if has_ones&.key?(singular_inv_assoc_name = ActiveSupport::Inflector.singularize(inverse_assoc_name.tr('.', '_')))
                     inverse_assoc_name = if has_ones[singular_inv_assoc_name]
@@ -1086,9 +1098,9 @@ class Object
       [built_controller, code]
     end
 
-    def _brick_get_hm_assoc_name(relation, hm_assoc)
+    def _brick_get_hm_assoc_name(relation, hm_assoc, source = nil)
       if (relation[:hm_counts][hm_assoc[:assoc_name]]&.> 1) &&
-         hm_assoc[:alternate_name] != hm_assoc[:inverse][:assoc_name]
+         hm_assoc[:alternate_name] != (source || name.underscore)
         plural = ActiveSupport::Inflector.pluralize(hm_assoc[:alternate_name])
         new_alt_name = (hm_assoc[:alternate_name] == name.underscore) ? "#{hm_assoc[:assoc_name].singularize}_#{plural}" : plural
         # uniq = 1

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

@@ -105,13 +105,26 @@ module Brick
                 hms_columns = [] # Used for 'index'
                 skip_klass_hms = ::Brick.config.skip_index_hms[model_name] || {}
                 hms_headers = hms.each_with_object([]) do |hm, s|
-                  hm_stuff = [(hm_assoc = hm.last), "H#{hm_assoc.macro == :has_one ? 'O' : 'M'}#{'T' if hm_assoc.options[:through]}", (assoc_name = hm.first)]
+                  hm_stuff = [(hm_assoc = hm.last),
+                              "H#{hm_assoc.macro == :has_one ? 'O' : 'M'}#{'T' if hm_assoc.options[:through]}",
+                              (assoc_name = hm.first)]
                   hm_fk_name = if hm_assoc.options[:through]
-                                associative = associatives[hm_assoc.name]
-                                associative && "'#{associative.name}.#{associative.foreign_key}'"
-                              else
-                                hm_assoc.foreign_key
-                              end
+                                 associative = associatives[hm.first]
+                                 tbl_nm = if hm_assoc.options[:source]
+                                            associative.klass.reflect_on_association(hm_assoc.options[:source]).inverse_of&.name
+                                          else
+                                            associative.name
+                                          end
+                                 # If there is no inverse available for the source belongs_to association, make one based on the class name
+                                 unless tbl_nm
+                                   tbl_nm = associative.class_name.underscore
+                                   tbl_nm.slice!(0) if tbl_nm[0] == ('/')
+                                   tbl_nm = tbl_nm.tr('/', '_').pluralize
+                                 end
+                                 "'#{tbl_nm}.#{associative.foreign_key}'"
+                               else
+                                 hm_assoc.foreign_key
+                               end
                   case args.first
                   when 'index'
                     hms_columns << if hm_assoc.macro == :has_many
@@ -168,10 +181,10 @@ module Brick
 }
 
 #headerTop {
-	position: sticky;
-	top: 0px;
-	background-color: white;
-	z-index: 1;
+  position: sticky;
+  top: 0px;
+  background-color: white;
+  z-index: 1;
 }
 table {
   border-collapse: collapse;
@@ -218,9 +231,6 @@ table tbody tr.active-row {
   color: #009879;
 }
 
-td.val {
-  display: block;
-}
 a.show-arrow {
   font-size: 1.5em;
   text-decoration: none;
@@ -240,6 +250,10 @@ a.big-arrow {
 .dimmed {
   background-color: #C0C0C0;
 }
+.orphan {
+  color: red;
+  white-space: nowrap;
+}
 
 #revertTemplate {
   display: none;
@@ -255,13 +269,13 @@ input+svg.revert {
   top: 0.5em;
 }
 
-input[type=submit] {
+.update {
+  position: sticky;
+  right: 1em;
+  float: right;
   background-color: #004998;
   color: #FFF;
 }
-.right {
-  text-align: right;
-}
 </style>
 <% is_includes_dates = nil
 
@@ -580,8 +594,8 @@ if (headerTop) {
                # 0..62 because Postgres column names are limited to 63 characters
                #{obj_name}, (descrips = @_brick_bt_descrip[bt.first][bt_class])[0..-2].map { |id| #{obj_name}.send(id.last[0..62]) }, (bt_id_col = descrips.last)
              )
-             bt_txt ||= \"<< Orphaned ID: #\{val} >>\" if val
-             bt_id = bt_id_col.map { |id_col| #{obj_name}.send(id_col.to_sym) } if bt_id_col&.present? %>
+             bt_txt ||= \"<span class=\\\"orphan\\\">&lt;&lt; Orphaned ID: #\{val} >></span>\".html_safe if val
+             bt_id = bt_id_col.map { |id_col| #{obj_name}.send(id_col.to_sym) } %>
           <%= bt_id&.first ? link_to(bt_txt, send(\"#\{bt_class.base_class.name.underscore.tr('/', '_')\}_path\".to_sym, bt_id)) : bt_txt %>
           <%#= Previously was:  bt_obj = bt[1].first.first.find_by(bt[2] => val); link_to(bt_obj.brick_descrip, send(\"#\{bt[1].first.first.name.underscore\}_path\".to_sym, bt_obj.send(bt[1].first.first.primary_key.to_sym))) if bt_obj %>
         <% end %>
@@ -680,7 +694,7 @@ end
       <%= k %>
     <% end %>
     </th>
-    <td class=\"val\">
+    <td>
     <% dt_pickers = { datetime: 'datetimepicker', timestamp: 'datetimepicker', time: 'timepicker', date: 'datepicker' }
     if bt
       html_options = { prompt: \"Select #\{bt_name\}\" }
@@ -689,18 +703,21 @@ end
       <%= if (bt_obj = bt_class&.find_by(bt_pair[1] => val))
             link_to('⇛', send(\"#\{bt_class.base_class.name.underscore.tr('/', '_')\}_path\".to_sym, bt_obj.send(bt_class.primary_key.to_sym)), { class: 'show-arrow' })
           elsif val
-            \"<span>Orphaned ID: #\{val}</span>\".html_safe
+            \"<span class=\\\"orphan\\\">Orphaned ID: #\{val}</span>\".html_safe
           end %><svg class=\"revert\" width=\"1.5em\" viewBox=\"0 0 512 512\"><use xlink:href=\"#revertPath\" /></svg>
-    <% else case (col_type = #{model_name}.column_for_attribute(k).type)
+    <% else
+    html_options = {}
+    html_options[:class] = 'dimmed' unless val
+    case (col_type = #{model_name}.column_for_attribute(k).type)
       when :string, :text %>
         <% if is_bcrypt?(val) # || .readonly? %>
           <%= hide_bcrypt(val, 1000) %>
         <% else %>
-          <div class=\"wide-input\"><%= f.text_field k.to_sym %><svg class=\"revert\" width=\"1.5em\" viewBox=\"0 0 512 512\"><use xlink:href=\"#revertPath\" /></svg></div>
+          <div class=\"wide-input\"><%= f.text_field(k.to_sym, html_options) %><svg class=\"revert\" width=\"1.5em\" viewBox=\"0 0 512 512\"><use xlink:href=\"#revertPath\" /></svg></div>
         <% end %>
       <% when :boolean %>
         <%= f.check_box k.to_sym %><svg class=\"revert\" width=\"1.5em\" viewBox=\"0 0 512 512\"><use xlink:href=\"#revertPath\" /></svg>
-      <% when :integer, :decimal, :float
+      <% when :integer, :decimal, :float %>
         <%= if col_type == :integer
               f.text_field k.to_sym, { pattern: '\\d*', class: 'check-validity' }
             else
@@ -710,10 +727,11 @@ end
            is_includes_dates = true %>
         <%= f.text_field k.to_sym, { class: dt_pickers[col_type] } %><svg class=\"revert\" width=\"1.5em\" viewBox=\"0 0 512 512\"><use xlink:href=\"#revertPath\" /></svg>
       <% when :uuid %>
-        # Postgres naturally uses the +uuid_generate_v4()+ function from the uuid-ossp extension
-        # If it's not yet enabled then:  enable_extension 'uuid-ossp'
-        # ActiveUUID gem created a new :uuid type %>
-        <%= val %>
+        <%=
+          # Postgres naturally uses the +uuid_generate_v4()+ function from the uuid-ossp extension
+          # If it's not yet enabled then:  enable_extension 'uuid-ossp'
+          # ActiveUUID gem created a new :uuid type
+          val %>
       <% when :binary, :primary_key %>
       <% end %>
     <% end %>
@@ -721,7 +739,7 @@ end
     </tr>
   <% end
   if has_fields %>
-    <tr><td colspan=\"2\" class=\"right\"><%= f.submit %></td></tr>
+    <tr><td colspan=\"2\"><%= f.submit({ class: 'update' }) %></td></tr>
   <% else %>
     <tr><td colspan=\"2\">(No displayable fields)</td></tr>
   <% end %>

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -168,8 +168,12 @@ module Brick
       skip_hms = {}
       associatives = hms.each_with_object({}) do |hmt, s|
         if (through = hmt.last.options[:through])
-          skip_hms[through] = nil
-          s[hmt.first] = hms[through] # End up with a hash of HMT names pointing to join-table associations
+          skip_hms[through] = nil # if hms[through]
+          # binding.pry if !hms[through]
+          # End up with a hash of HMT names pointing to join-table associations
+          # Last part was:  hmt.last.name
+          # Changed up because looking for:  hms[:issue_issue_duplicates]
+          s[hmt.first] = hms[through] # || hms["#{(opt = hmt.last.options)[:through].to_s.singularize}_#{opt[:source].to_s.pluralize}".to_sym]
         elsif hmt.last.inverse_of.nil?
           puts "SKIPPING #{hmt.last.name.inspect}"
           # %%% If we don't do this then below associative.name will find that associative is nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.44
+  version: 1.0.47
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-12 00:00:00.000000000 Z
+date: 2022-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord