brick 1.0.46 → 1.0.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1442fb46672a819689a1f15aa16e2dd53647a057ea38948431746d3d8baf66f0
-  data.tar.gz: 38d26e09e226d37e87737cba35f76ee3b2413dc4474ac8ecba582297205789aa
+  metadata.gz: 4180c0164d7f086112339696df9d8fef2aeebcd32d9b81faf22d76ddc11815bc
+  data.tar.gz: 823673bcbecc342f5df15e196ee65ad6f6ac0b75415514079c055af06d0ac7f6
 SHA512:
-  metadata.gz: 8cb9e747cffb1e33f045f07656891b8e17ac4349661f897aa01886bae6fb7c2e4687f1021e04173266ab60cf330ec71f58514aeb670669f30ea8c6dd4140e943
-  data.tar.gz: 54166ef84adaeab00c2d6408e9a9a6c5da5998bd278b0db490943d2d8da2701938cdc87a4c40ff65ac2cbe7196a7eb014a4b3b08dfd2ff5aa2ec426af00d38ab
+  metadata.gz: 1d17b1abd64051066b71839095be1e672b897ad707a2d10f4ca4429131c894ee178711c873cef59957111704437b86b6322b8909ab5cc41cc955547146377dd8
+  data.tar.gz: e210becff69096e73b9b7fa09bb4e1be6c36cd2982305b2c803c9c00e9d2b5b085857ea6edacc62498557cde928e2afbbb42ebbd137180385ec3a8a0c5efdf85

data/lib/brick/extensions.rb

@@ -596,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),
@@ -773,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

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

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 46
+    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.46
+  version: 1.0.47
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-15 00:00:00.000000000 Z
+date: 2022-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord