brick 1.0.181 → 1.0.182

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 322ed139c5ec7c48572ab2ea87830998fe742c32ac56e91d2eed97084f7d8c42
-  data.tar.gz: 836c21610811fb2322bdfd572d2b1ccce0a23464bf54512ae160149a6bfdb972
+  metadata.gz: 390cb3f8a466f1d94c0e8e7472017753fb09f8c9909a71134545e25b47edfb21
+  data.tar.gz: 9398ee17aa8a5b8741adf784ebde9421f6419f93a421ec0ba5893f028b192383
 SHA512:
-  metadata.gz: 034b252fc08bc09216a33d8cd34a97c4afa81a86943d319e0bccd26a387060d69a3d1e0b80de2ba29e9f57c06e7eff3b41cbdfa92354f8a754e350b0ab8daacf
-  data.tar.gz: 0ba1422cb56af76c4e0eb89de5fd940a90dcfb93fd90016852cb9631d71542825dea0187fd44ac66fa65a79905583b9dec92b3615b67db1f16d4ad5e5357f1ac
+  metadata.gz: 75c2d9f206d58f5296862fcdec776b3a5daa82e2c7405ff3fa46bf386e61cfac39ddf9cf55d7ab3eb54ddf23434c5086fd99e6d9eca0543ed63d9946892ea140
+  data.tar.gz: 1818e986519622fd6c51c25e0153e003a476c7e823f14ff4cc9aabdf4cfb1adae7fe8f67ff1e9ca1a181694e028aa3b0c985afad8ab88b5c1d839be3aba70ed0

data/lib/brick/extensions.rb

@@ -1545,8 +1545,7 @@ class Object
         is_sti = true
       else
         # Class for auto-generated models to inherit from
-        base_model = (::Brick.config.models_inherit_from ||= (app.config.brick.fetch(:models_inherit_from, nil) ||
-                                                              begin
+        base_model = (::Brick.config.models_inherit_from ||= (begin
                                                                 ::ApplicationRecord
                                                               rescue StandardError => ex
                                                                 ::ActiveRecord::Base
@@ -1610,9 +1609,14 @@ class Object
           if has_pk
             code << "  # Primary key: #{_brick_primary_key.join(', ')}\n" unless _brick_primary_key == ['id']
           elsif our_pks&.present?
-            if our_pks.length > 1 && respond_to?(:'primary_keys=') # Using the composite_primary_keys gem?
-              new_model_class.primary_keys = our_pks
-              code << "  self.primary_keys = #{our_pks.map(&:to_sym).inspect}\n"
+            pk_mutator = if respond_to?(:'primary_keys=')
+                           'primary_keys=' # Using the composite_primary_keys gem
+                         elsif ActiveRecord.version >= Gem::Version.new('7.1')
+                           'primary_key=' # Rails 7.1+?
+                         end
+            if our_pks.length > 1 && pk_mutator
+              new_model_class.send(pk_mutator, our_pks)
+              code << "  self.#{pk_mutator[0..-2]} = #{our_pks.map(&:to_sym).inspect}\n"
             else
               new_model_class.primary_key = (pk_sym = our_pks.first.to_sym)
               code << "  self.primary_key = #{pk_sym.inspect}\n"
@@ -1790,14 +1794,19 @@ class Object
         singular_table_parts.shift
       end
       options[:class_name] = "::#{assoc[:primary_class]&.name || singular_table_parts.map(&:camelize).join('::')}" if need_class_name
-      # Work around a bug in CPK where self-referencing belongs_to associations double up their foreign keys
       if need_fk # Funky foreign key?
-        options[:foreign_key] = if assoc[:fk].is_a?(Array)
-                                  assoc_fk = assoc[:fk].uniq
-                                  assoc_fk.length < 2 ? assoc_fk.first : assoc_fk
-                                else
-                                  assoc[:fk].to_sym
-                                end
+        options_fk_key = :foreign_key
+        if assoc[:fk].is_a?(Array)
+          # #uniq works around a bug in CPK where self-referencing belongs_to associations double up their foreign keys
+          if (assoc_fk = assoc[:fk].uniq).length > 1
+            options_fk_key = :query_constraints if ActiveRecord.version >= ::Gem::Version.new('7.1')
+            options[options_fk_key] = assoc_fk
+          else
+            options[options_fk_key] = assoc_fk.first
+          end
+        else
+          options[options_fk_key] = assoc[:fk].to_sym
+        end
       end
       if inverse_assoc_name && (need_class_name || need_fk || need_inverse_of) &&
          (klass = options[:class_name]&.constantize) && (ian = inverse_assoc_name.tr('.', '_').to_sym) &&

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

@@ -158,7 +158,7 @@ module Brick::Rails::FormTags
                                       pk.map { |pk_part| obj.send(pk_part.to_sym) }), { class: 'big-arrow' })}</td>\n" if pk.present?
       sequence.each_with_index do |col_name, idx|
         val = obj.attributes[col_name]
-        bt = bts[col_name]
+        bt = bts[col_name] || composite_bt_names[col_name]
         out << '<td'
         (classes ||= []) << 'col-sticky' if idx < nfc
         (classes ||= []) << 'dimmed' unless cols.key?(col_name) || (cust_col = cust_cols[col_name]) ||
@@ -166,7 +166,7 @@ module Brick::Rails::FormTags
         (classes ||= []) << 'right' if val.is_a?(Numeric) && !bt
         out << " class=\"#{classes.join(' ')}\"" if classes&.present?
         out << '>'
-        if (bt || composite_bt_names[col_name])
+        if bt
           if bt[2] && obj.respond_to?(poly_id_col = "#{bt.first}_id") # Polymorphic?
             if (poly_id = obj.send(poly_id_col))
               bt_class = obj.send(klass.brick_foreign_type(bt.first))

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -203,23 +203,25 @@ module Brick
       end
 
       model_cols = model.columns_hash
-      pk_type = if (mpk = model.primary_key).is_a?(Array)
-                  # Composite keys should really use:  model.primary_key.map { |pk_part| model_cols[pk_part].type }
-                  model_cols[mpk.first].type
-                else
-                  mpk && model_cols[mpk].type
-                end
       bts, hms = model.reflect_on_all_associations.each_with_object([{}, {}]) do |a, s|
-        # %%% The time will come when we will support type checking of composite foreign keys!
-        # binding.pry if a.foreign_key.is_a?(Array)
         if a.belongs_to? && !a.polymorphic? && ::Brick.config.polymorphics.fetch(full_assoc_name = "#{model.table_name}.#{a.name}", nil)
           puts "Based on inclusion in ::Brick.polymorphics, marking association #{full_assoc_name} as being polymorphic."
           a.options[:polymorphic] = true
         end
-        unless a.polymorphic? || (!a.belongs_to? && (through = a.options[:through])) ||
-               (a.klass && ::Brick.config.exclude_tables.exclude?(a.klass.table_name) &&
-                 (!a.belongs_to? || (same_type = (fk_type = model_cols[a.foreign_key]&.type) == pk_type))
-               )
+        if !a.polymorphic? && (a.belongs_to? || (through = a.options[:through])) &&
+           !(a.klass && ::Brick.config.exclude_tables.exclude?(a.klass.table_name) &&
+              (!a.belongs_to? ||
+                ((fk_type = a.foreign_key.is_a?(Array) ? a.foreign_key.map { |fk_part| model_cols[fk_part.to_s].type } : model_cols[a.foreign_key.to_s].type) &&
+                 (primary_cols = a.klass.columns_hash) &&
+                 (pk_type = a.klass.primary_key.is_a?(Array) ? a.klass.primary_key.map { |pk_part| primary_cols[pk_part.to_s].type } : primary_cols[a.klass.primary_key].type) &&
+                 (same_type = (pk_type == fk_type))
+                )
+              )
+            )
+        # unless a.polymorphic? || (!a.belongs_to? && (through = a.options[:through])) ||
+        #        (a.klass && ::Brick.config.exclude_tables.exclude?(a.klass.table_name) &&
+        #          (!a.belongs_to? || (same_type = (fk_type = model_cols[a.foreign_key.to_s]&.type) == pk_type))
+        #        )
           if same_type == false # We really do want to test specifically for false here, and not nil!
             puts "WARNING:
   Foreign key column #{a.klass.table_name}.#{a.foreign_key} is #{fk_type}, but the primary key it relates to, #{a.active_record.table_name}.#{a.active_record.primary_key}, is #{pk_type}.
@@ -280,7 +282,8 @@ module Brick
               next
             end
           else
-            if !a.options.key?(:as) && a.klass.column_names.exclude?(a.foreign_key.to_s)
+            this_fks = this_fk.is_a?(Array) ? this_fk : [this_fk.to_s]
+            if !a.options.key?(:as) && (this_fks - a.klass.column_names).length.positive?
               options = ", #{a.options.map { |k, v| "#{k.inspect} => #{v.inspect}" }.join(', ')}" if a.options.present?
               puts "WARNING:  Model #{model.name} has this association:
             has_many :#{a.name}#{options}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.181
+  version: 1.0.182
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-09 00:00:00.000000000 Z
+date: 2023-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.42.0
+- !ruby/object:Gem::Dependency
+  name: rswag-ui
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement