brick 1.0.180 → 1.0.182

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5cc0c73d63cbebcbad81388f8ae444c72dafa57a38c1f2a95b3b7f5bd4a621a
-  data.tar.gz: 8670884c20ac46ee01d28c97fabe97694a2f3862761228e16c0422790a937cc8
+  metadata.gz: 390cb3f8a466f1d94c0e8e7472017753fb09f8c9909a71134545e25b47edfb21
+  data.tar.gz: 9398ee17aa8a5b8741adf784ebde9421f6419f93a421ec0ba5893f028b192383
 SHA512:
-  metadata.gz: 62d010ea2765fe14369e18db8b123426f5ace62025b053b453656870223073b75f95add727e5cb2073f78d0f58a88cb293904bcbee08726b0ba09947c16f3709
-  data.tar.gz: 25dbb2878198256df74cc36934bb7fcaab24a3dfd0b9cac55de8d04e2fcfce8ff0158458cd2d76004e354020addd6b38de5001ab79bebecb9f8afaa1f3e5133f
+  metadata.gz: 75c2d9f206d58f5296862fcdec776b3a5daa82e2c7405ff3fa46bf386e61cfac39ddf9cf55d7ab3eb54ddf23434c5086fd99e6d9eca0543ed63d9946892ea140
+  data.tar.gz: 1818e986519622fd6c51c25e0153e003a476c7e823f14ff4cc9aabdf4cfb1adae7fe8f67ff1e9ca1a181694e028aa3b0c985afad8ab88b5c1d839be3aba70ed0

data/lib/brick/compatibility.rb

@@ -115,14 +115,30 @@ if Object.const_defined?('ActionPack') && !ActionPack.respond_to?(:version)
     end
   end
 end
-if Bundler.locked_gems&.dependencies.key?('action_view')
+if Object.const_defined?('Bundler') && Bundler.locked_gems&.dependencies.key?('action_view')
   require 'action_view' # Needed for Rails <= 4.0
-  if Object.const_defined?('ActionView') && !ActionView.respond_to?(:version)
-    module ActionView
+  module ::ActionView
+    if Object.const_defined?('ActionView') && !ActionView.respond_to?(:version)
       def self.version
         ActionPack.version
       end
     end
+    if self.version < ::Gem::Version.new('5.2')
+      module Helpers
+        module TextHelper
+          # Older versions of #pluralize lack the all-important .to_s
+          def pluralize(count, singular, plural_arg = nil, plural: plural_arg, locale: I18n.locale)
+            word = if (count == 1 || count.to_s =~ /^1(\.0+)?$/)
+              singular
+            else
+              plural || singular.pluralize(locale)
+            end
+
+            "#{count || 0} #{word}"
+          end
+        end
+      end
+    end
   end
 end
 

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/engine.rb

@@ -1404,12 +1404,6 @@ end
 #{erd_markup}
 
 <%= # Consider getting the name from the association -- hm.first.name -- if a more \"friendly\" alias should be used for a screwy table name
-    cols = {#{hms_keys = []
-              hms_headers.map do |hm|
-                hms_keys << (assoc_name = (assoc = hm.first).name.to_s)
-                "#{assoc_name.inspect} => [#{(assoc.options[:through] && !assoc.through_reflection).inspect}, #{assoc.klass.name}, #{hm[1].inspect}, #{hm[2].inspect}]"
-              end.join(', ')}}
-
     # If the resource is missing, has the user simply created an inappropriately pluralised name for a table?
     @#{table_name} ||= if (dym_list = instance_variables.reject do |entry|
                              entry.to_s.start_with?('@_') ||
@@ -1429,6 +1423,13 @@ end
                          end
                        end
 
+    # Starts as being just has_many columns, and will be augmented later with all the other columns
+    cols = {#{hms_keys = []
+              hms_headers.map do |hm|
+                hms_keys << (assoc_name = (assoc = hm.first).name.to_s)
+                "#{assoc_name.inspect} => [#{(assoc.options[:through] && !assoc.through_reflection).inspect}, #{assoc.klass.name}, #{hm[1].inspect}, #{hm[2].inspect}]"
+              end.join(', ')}}
+
     # %%% Why in the Canvas LMS app does ActionView::Helpers get cleared / reloaded, or otherwise lose access to #brick_grid ???
     # Possible fix if somewhere we can implement the #include with:
     # (ActiveSupport.const_defined?('Reloader') ? ActiveSupport : ActionDispatch)::Reloader.to_prepare do ... end
@@ -1436,8 +1437,8 @@ end
     # Rails.application.reloader.to_prepare do ... end
     self.class.class_exec { include ::Brick::Rails::FormTags } unless respond_to?(:brick_grid)
     # Write out the mega-grid
-    brick_grid(@#{table_name}, @_brick_bt_descrip, @_brick_sequence, @_brick_incl, @_brick_excl,
-               cols, poly_cols, bts, #{hms_keys.inspect}, {#{hms_columns.join(', ')}}) %>
+    brick_grid(@#{table_name}, @_brick_sequence, @_brick_incl, @_brick_excl,
+               cols, bt_descrip: @_brick_bt_descrip, poly_cols: poly_cols, bts: bts, hms_keys: #{hms_keys.inspect}, hms_cols: {#{hms_columns.join(', ')}}) %>
 
 #{"<hr><%= link_to(\"New #{new_path_name = "new_#{path_obj_name}_path"
                            obj_name}\", #{new_path_name}, { class: '__brick' }) if respond_to?(:#{new_path_name}) %>" unless @_brick_model.is_view?}

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

@@ -1,7 +1,7 @@
 module Brick::Rails::FormTags
   # Our super speedy grid
-  def brick_grid(relation = nil, bt_descrip = nil, sequence = nil, inclusions = nil, exclusions = nil,
-                 cols = {}, poly_cols = nil, bts = {}, hms_keys = [], hms_cols = {},
+  def brick_grid(relation = nil, sequence = nil, inclusions = nil, exclusions = nil,
+                 cols = {}, bt_descrip: nil, poly_cols: nil, bts: {}, hms_keys: [], hms_cols: {},
                  show_header: nil, show_row_count: nil, show_erd_button: nil, show_new_button: nil, show_avo_button: nil, show_aa_button: nil)
     # When a relation is not provided, first see if one exists which matches the controller name
     unless (relation ||= instance_variable_get("@#{controller_name}".to_sym))
@@ -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 = 180
+    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}
@@ -1544,7 +1547,7 @@ ActiveSupport.on_load(:active_record) do
                  else
                    {}
                  end
-        _original_initialize(klass, **kwargs)
+        _original_initialize(klass, *args, **kwargs)
       end
     end
   end
@@ -2036,11 +2039,13 @@ if ActiveRecord.version < ::Gem::Version.new('6.0') && ruby_version >= ::Gem::Ve
   end
 
   # AR >= 5.0 on Ruby >= 3.0
-  ::ActiveRecord::Type::AdapterSpecificRegistry.class_exec do
-    alias :_brick_add_modifier :add_modifier
-    def add_modifier(*args, **kwargs)
-      kwargs.merge!(args.pop) if args.length > 2 && args.last.is_a?(Hash)
-      _brick_add_modifier(*args, **kwargs)
+  if ActiveRecord.version >= ::Gem::Version.new('5.0')
+    ::ActiveRecord::Type::AdapterSpecificRegistry.class_exec do
+      alias :_brick_add_modifier :add_modifier
+      def add_modifier(*args, **kwargs)
+        kwargs.merge!(args.pop) if args.length > 2 && args.last.is_a?(Hash)
+        _brick_add_modifier(*args, **kwargs)
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.180
+  version: 1.0.182
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-08 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