brick 1.0.170 → 1.0.171

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f802431e56f45276546a47b94f3571a6b23a2d0701c34b1f27964fd7ecf5b8f
-  data.tar.gz: 3fd88c0f0626bc9abf08e9317187baf3e755adb5840ac9b56b18c04ddc2577c7
+  metadata.gz: 3632cff341398d0856d985613943d45da5a4de86797c1c59f0e38e31218e8e3d
+  data.tar.gz: cd8374ed7f930d8eb17fa12b7947a00d973571dc493f7ecc677350d8be0cfe75
 SHA512:
-  metadata.gz: 3d5e4731d7956222b2c0ab28f19c5ac60addcea87b556a0765dd28a998c2364148bb348a57a9b3541096da71c6d9e2a4440cf6a038fb40d0b2d5c42aadf01ce5
-  data.tar.gz: c955e2d400887fe6e8ff3869bb6ca2e5a996898187e47d16764676b36e6a68a9ece28cf5593e993760c960cb25ba9c479904a2e327e824dd485e592df0d72d79
+  metadata.gz: 66814142c86e8066bb0a72aba93df3a0a826b9ca48cd14dd547291e27079399ed344e41c547dbd4c5fd26d98f7d361e9ad73c7a3bb53e96ec165c1b1b87a478a
+  data.tar.gz: e17de43008cd2b7e1a8ed62aad8cc428248f145e024266e7f4237f892d844d08a6cdc238c650c46986a9f1a1038d87cc7bd16531ad532bc25f2e6f7bc1a2af9b

data/lib/brick/extensions.rb

@@ -1676,7 +1676,7 @@ class Object
                               # 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
+                              options[:source] = hm[1].to_sym
                             else
                               through = hm.first.fetch(:alternate_chosen_name, hm.first[:alternate_name])
                             end
@@ -1692,11 +1692,11 @@ class Object
               # Was:
               # 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 }
+              far_assoc = relations[hm.first[:inverse_table]][:fks].find { |_k, v| v[:assoc_name] == hm[1] }
               options[:class_name] = far_assoc.last[:inverse_table].singularize.camelize
               options[:foreign_key] = far_assoc.last[:fk].to_sym
             end
-            options[:source] ||= hm.last.to_sym unless hmt_name.singularize == hm.last
+            options[:source] ||= hm[1].to_sym unless hmt_name.singularize == hm[1]
             code << "  has_many :#{hmt_name}#{options.map { |opt| ", #{opt.first}: #{opt.last.inspect}" }.join}\n"
             new_model_class.send(:has_many, hmt_name.to_sym, **options)
           end
@@ -1805,11 +1805,11 @@ class Object
         end
 
         # Add any relevant user-requested HMTs
-        Brick.config.hmts.each do |hmt|
+        Brick.config.hmts&.each do |hmt|
           # Make sure this HMT lines up with the current HM
           next unless hmt.first == table_name && hmt[1] == inverse_table &&
                       # And has not already been auto-created
-                      !(y = hmts.fetch(hmt[2], nil)&.find { |x| x.first[:assoc_name] == hmt[1] })
+                      !(hmts.fetch(hmt[2], nil)&.any? { |existing_hmt| existing_hmt.first[:assoc_name] == hmt[1] })
 
           # Good so far -- now see if we have appropriate HM -> BT/HM associations by which we can create this user-requested HMT
           if (hm_assoc = relation[:fks].find { |_k, v| !v[:is_bt] && v[:assoc_name] == hmt[1] }.last) &&

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

@@ -1669,8 +1669,8 @@ end
     brick_form_for(obj, options, #{model_name}, bts, #{pk.inspect}) %>
 
 #{unless args.first == 'new'
-  # Was:  confirm_are_you_sure = ActionView.version < ::Gem::Version.new('7.0') ? "data: { confirm: 'Delete #\{model_name} -- Are you sure?' }" : "form: { data: { turbo_confirm: 'Delete #\{model_name} -- Are you sure?' } }"
-  confirm_are_you_sure = "data: { confirm: 'Delete #\{model_name} -- Are you sure?' }"
+  # Was:  confirm_are_you_sure = ActionView.version < ::Gem::Version.new('7.0') ? "data: { confirm: \"Delete #\{model_name} -- Are you sure?\" }" : "form: { data: { turbo_confirm: \"Delete #\{model_name} -- Are you sure?\" } }"
+  confirm_are_you_sure = "data: { confirm: \"Delete #\{model_name} -- Are you sure?\" }"
   ret = +"<%= button_to(\"Delete #\{@#{obj_name}.brick_descrip}\", send(\"#\{#{model_name}._brick_index(:singular)}_path\".to_sym, @#{obj_name}), { method: 'delete', class: 'danger', #{confirm_are_you_sure} }) %>"
   hms_headers.each_with_object(ret) do |hm, s|
     # %%% Would be able to remove this when multiple foreign keys to same destination becomes bulletproof

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -278,7 +278,8 @@ module Brick
         if (through = hmt.last.options[:through])
           # ::Brick.relations[hmt.last.through_reflection.table_name]
           skip_hms[through] = nil if hms[through] && model.is_brick? &&
-                                     hmt.last.klass != hmt.last.active_record # Don't pull HMs for HMTs that point back to the same table
+                                     hmt.last.klass != hmt.last.active_record && # Don't pull HMs for HMTs that point back to the same table
+                                     hmt[1].source_reflection.belongs_to? # Don't pull HMs when the HMT is built from HM -> HM
           # End up with a hash of HMT names pointing to join-table associations
           model._br_associatives[hmt.first] = hms[through] # || hms["#{(opt = hmt.last.options)[:through].to_s.singularize}_#{opt[:source].to_s.pluralize}".to_sym]
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.170
+  version: 1.0.171
 platform: ruby
 authors:
 - Lorin Thwaits