brick 1.0.45 → 1.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 678e1295006174594606dc731cd650afa60d2cc727be08bd416c9503faeb1ca4
-  data.tar.gz: b00802df45b7e388523b29cfab38feaaaf7c61d057cf509c71a6a08860373b15
+  metadata.gz: 1442fb46672a819689a1f15aa16e2dd53647a057ea38948431746d3d8baf66f0
+  data.tar.gz: 38d26e09e226d37e87737cba35f76ee3b2413dc4474ac8ecba582297205789aa
 SHA512:
-  metadata.gz: 7962bbc61bd43b68062d188ac3565e38f4840d52ca76b4c675e0da55d213104f13e007578658441359323899ed881d10497bb8285384abe42a2d15bd9c26b64b
-  data.tar.gz: 449e74d3ab9558eed77c89aac5a871927ed0842fc043c910d04d1cca29221508332a7def78940ed67048a29e4384576aa8a176beb117c0bc7ff8a48a87f64af6
+  metadata.gz: 8cb9e747cffb1e33f045f07656891b8e17ac4349661f897aa01886bae6fb7c2e4687f1021e04173266ab60cf330ec71f58514aeb670669f30ea8c6dd4140e943
+  data.tar.gz: 54166ef84adaeab00c2d6408e9a9a6c5da5998bd278b0db490943d2d8da2701938cdc87a4c40ff65ac2cbe7196a7eb014a4b3b08dfd2ff5aa2ec426af00d38ab

data/lib/brick/extensions.rb

@@ -353,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
@@ -831,13 +830,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]
@@ -1085,9 +1084,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

@@ -218,9 +218,6 @@ table tbody tr.active-row {
   color: #009879;
 }
 
-td.val {
-  display: block;
-}
 a.show-arrow {
   font-size: 1.5em;
   text-decoration: none;
@@ -266,7 +263,6 @@ input+svg.revert {
   background-color: #004998;
   color: #FFF;
 }
-
 </style>
 <% is_includes_dates = nil
 
@@ -685,7 +681,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\}\" }

data/lib/brick/version_number.rb

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