brick 1.0.236 → 1.0.239

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8397091edab4be1edd1e61eb4be3284a8c169a3207f87e92227b84d07413d241
-  data.tar.gz: 2ffaef636cfba92e38bf9330f04a5bd65f39eb06d62e002e5227f7261b126494
+  metadata.gz: 7fc4a9f9ff2721cfc065f6765eb2e9a661a8aa3339c2bf23aa367d6342b6ce1d
+  data.tar.gz: f2270956a65f66cbae1c4e59bbd5c2a395406099a699ed649a31d279cbdefe46
 SHA512:
-  metadata.gz: 38d24e9e8ae60a63f6755bb5e0854880df019ce4004d3e8962c8a47cfc80bb23fcba576216e9cedf7560f37b458ce47e651ccaa206b0e92844519e2a932d7c7e
-  data.tar.gz: 4f33bd865494dcd1855204bd5c307f8b2fc70485bd8ce5c9fd79708df638ff0f715d44755087a0c8230589dd3679d238dfdaeea8807dc14cf4a658fae21ffa7d
+  metadata.gz: 89d81c26f4090cf8892780701ffb594c859c94c21fa5d3a7ff2dd24bcf7246992423221d71a417d48fecc29c5475bfb64c73814ddef219cdd192a80bc3ce414d
+  data.tar.gz: 6ca286b5fd22ac2316860373fcab4c7650010bf723f82ce587327f7d6ce1cc5aecf976ce4b2268c4031a7e78d58fc29fc6a695f9570248c4285e35cd95f4c8ad

data/lib/brick/extensions.rb

@@ -416,7 +416,7 @@ module ActiveRecord
         @_br_cust_cols ||= {}
       end
 
-      def _brick_find_permits(model_or_assoc, current_permits, done_permits = [])
+      def _brick_find_permits(model_or_assoc, current_permits, is_for_expects = nil, done_permits = [])
         unless done_permits.include?(model_or_assoc)
           done_permits << model_or_assoc
           self.reflect_on_all_associations.select { |assoc| !assoc.belongs_to? }.each_with_object([]) do |assoc, s|
@@ -430,6 +430,7 @@ module ActiveRecord
                                                        assoc.klass.instance_variable_get(:@friendly_id_config)
               new_attrib_text = assoc.klass._brick_find_permits(assoc, (new_permits = assoc.klass._brick_all_fields), done_permits)
               new_permits << :_destroy
+              new_permits = [new_permits] if is_for_expects
               current_permits << { "#{assoc.name}_attributes".to_sym => new_permits }
               s << "#{assoc.name}_attributes: #{new_attrib_text}"
             end
@@ -1437,12 +1438,13 @@ end
       if (self.const_defined?(args.first) && (possible = self.const_get(args.first)) &&
           # Reset `possible` if it's a controller request that's not a perfect match
           # Was:  (possible = nil)  but changed to #local_variable_set in order to suppress the "= should be ==" warning
-          (possible&.name == desired_classname || (is_controller && binding.local_variable_set(:possible, nil)))) ||
+          (possible&.name == desired_classname || (is_controller && binding.local_variable_set(:possible, nil)))
+         ) ||
 
          # Try to require the respective Ruby file
          # ((filename = ActiveSupport::Dependencies.search_for_file(desired_classname.underscore)) &&
          #  (require_dependency(filename) || true) &&
-         (!anonymous? &&
+         (!anonymous? && # Don't try to find classes first mentioned in .erb or .haml templates
           (filename = ActiveSupport::Dependencies.search_for_file(desired_classname.underscore) ||
                       (self != Object && ActiveSupport::Dependencies.search_for_file((desired_classname = requested).underscore))
           ) && (require_dependency(filename) || true) &&
@@ -2026,7 +2028,8 @@ class Object
                 else
                   need_fk = "#{ActiveSupport::Inflector.singularize(assoc[:inverse][:inverse_table].split('.').last)}_id" != assoc[:fk]
                 end
-                singular_assoc_name = ActiveSupport::Inflector.singularize(assoc_name.tr('.', '_'))
+                full_assoc_name = assoc_name.tr('.', '_')
+                singular_assoc_name = ActiveSupport::Inflector.singularize(full_assoc_name)
                 has_ones = ::Brick.config.has_ones&.fetch(full_name, nil)
                 macro = if has_ones&.key?(singular_assoc_name)
                           assoc_name = if (custom_assoc_name = has_ones[singular_assoc_name])
@@ -2041,7 +2044,7 @@ class Object
                         end
                 # Auto-create an accepts_nested_attributes_for for this HM?
                 is_anaf = (anaf = ::Brick.config.nested_attributes&.fetch(full_name, nil)) &&
-                          (anaf.is_a?(Array) ? anaf.include?(assoc_name) : anaf == assoc_name)
+                          (anaf.is_a?(Array) ? anaf.include?(full_assoc_name) : anaf == full_assoc_name)
                 macro
               end
       if (singular_table_parts = singular_table_name.split('.')).length > 1 &&
@@ -2058,7 +2061,9 @@ class Object
         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')
+            # The :query_constraints option was only valid for Rails 7.1 and 7.2.  Starting in Rails 8 you will get this:
+            #   Setting `query_constraints:` option on `Sales::Specialofferproduct.has_many :sales_salesorderdetails` is not allowed. To get the same behavior, use the `foreign_key` option instead.
+            options_fk_key = :query_constraints if ActiveRecord.version >= ::Gem::Version.new('7.1') && ActiveRecord.version < ::Gem::Version.new('8.0a')
             options[options_fk_key] = assoc_fk
           else
             options[options_fk_key] = assoc_fk.first
@@ -2100,8 +2105,8 @@ class Object
       code << "  #{macro} #{assoc_name.inspect}#{options.map { |k, v| ", #{k}: #{v.inspect}" }.join}\n"
       self.send(macro, assoc_name, **options)
       if is_anaf
-        code << "  accepts_nested_attributes_for #{assoc_name.inspect}\n"
-        self.send(:accepts_nested_attributes_for, assoc_name)
+        code << "  accepts_nested_attributes_for #{full_assoc_name.to_sym.inspect}\n"
+        self.send(:accepts_nested_attributes_for, full_assoc_name)
       end
     end
 
@@ -2260,7 +2265,7 @@ class Object
               return
             end
 
-            # Apartment::Tenant.switch!(params['schema'])
+            Apartment::Tenant.switch!(params['_brick_schema']) if Object.const_defined?('Apartment')
             # result = ActiveRecord::Base.connection.query("SELECT #{cols.join(', ')} FROM #{view}")
             col_num = 0
             grouping = []
@@ -2286,7 +2291,7 @@ class Object
                         end
               s << "#{col_def} AS c#{col_num}"
             end
-            sql = "SELECT #{cols.join(', ')} FROM #{first_relation.downcase}"
+            sql = +"SELECT #{cols.join(', ')} FROM #{first_relation.downcase}"
             sql << "\nGROUP BY #{grouping.map(&:to_s).join(',')}" if is_grouped && grouping.present?
             result = ActiveRecord::Base.connection.query(sql)
             render json: { data: result } # [ver, result]
@@ -2760,7 +2765,11 @@ class Object
               end
               obj.send(:update, upd_hash)
               if obj.errors.any? # Surface errors to the user in a flash message
-                flash.now.alert = (obj.errors.errors.map { |err| "<b>#{err.attribute}</b> #{err.message}" }.join(', '))
+                flash.now.alert = if obj.errors.respond_to?(:errors)
+                                    obj.errors.errors.map { |err| "<b>#{err.attribute}</b> #{err.message}" }.join(', ')
+                                  else
+                                    obj.errors.messages.map { |k, v| "<b>#{k}</b> #{v}" }.join(', ')
+                                  end
               end
             end
 
@@ -2809,12 +2818,26 @@ class Object
 
           if is_need_params
             code << "  def #{params_name}\n"
-            permits_txt = model._brick_find_permits(model, permits = model._brick_all_fields(true))
-            code << "    params.require(:#{model.base_class.name.underscore.tr('/', '_')
-                             }).permit(#{permits_txt.map(&:inspect).join(', ')})\n"
-            code << "  end\n"
-            self.define_method(params_name) do
-              params.require(model.base_class.name.underscore.tr('/', '_').to_sym).permit(permits)
+            require_txt = model.base_class.name.underscore.tr('/', '_')
+            is_for_expects = ::ActiveSupport.version >= ::Gem::Version.new('8.0a')
+            permits_txt = model._brick_find_permits(model, permits = model._brick_all_fields(true), is_for_expects)
+            if is_for_expects
+              code << "    params.expect(#{require_txt
+                              }: #{permits_txt})\n"
+              code << "  end\n"
+            else
+              code << "    params.require(:#{require_txt
+                              }).permit(#{permits_txt.map(&:inspect).join(', ')})\n"
+              code << "  end\n"
+            end
+            if is_for_expects
+              self.define_method(params_name) do
+                params.expect({ model.base_class.name.underscore.tr('/', '_').to_sym => permits })
+              end
+            else
+              self.define_method(params_name) do
+                params.require(model.base_class.name.underscore.tr('/', '_').to_sym).permit(permits)
+              end
             end
             private params_name
             # Get column names for params from relations[model.table_name][:cols].keys

data/lib/brick/rails/engine.rb

@@ -672,7 +672,7 @@ window.addEventListener(\"popstate\", linkSchemas);
               find_template_err = nil
               unless (model_name = @_brick_model&.name) ||
                      (
-                      args[1].first == 'brick_gem' &&
+                      args[1]&.first == 'brick_gem' &&
                       ((is_search = ::Brick.config.add_search && args[0] == 'search' &&
                                     ::Brick.elasticsearch_existings&.length&.positive?
                        ) ||
@@ -1012,7 +1012,7 @@ if (window.brickFontFamily) {
 +"<html>
 <head>
 #{css}
-<title><%= (model = #{model_name}).name %><%
+<title><%= (model = ::#{model_name}).name %><%
      if (description = (relation = Brick.relations[model.table_name])&.fetch(:description, nil)).present?
        %> - <%= description
 %><% end
@@ -1330,11 +1330,10 @@ end
 
                        when 'crosstab'
                          if is_crosstab && ::Brick.config.license
-                           decipher = OpenSSL::Cipher::AES256.new(:CBC).decrypt
-                           decipher.iv = "\xB4,\r2\x19\xF5\xFE/\aR\x1A\x8A\xCFV\v\x8C"
+                           encrypted = File.binread("#{Gem::Specification.find_by_name('brick').gem_dir}/lib/brick/rails/crosstab.brk")
+                           (decipher = OpenSSL::Cipher::AES256.new(:CBC).decrypt).iv = encrypted[0..15]
                            decipher.key = Digest::SHA256.hexdigest(::Brick.config.license).scan(/../).map { |x| x.hex }.pack('c*')
-                           brick_path = Gem::Specification.find_by_name('brick').gem_dir
-                           decipher.update(File.binread("#{brick_path}/lib/brick/rails/crosstab.brk"))[16..-1]
+                           decipher.update(encrypted[16..-1]) + decipher.final
                          else
                            'Crosstab Charting not yet activated -- enter a valid license key in brick.rb'
                          end
@@ -1347,12 +1346,13 @@ end
   if (model = (obj = @#{obj_name})&.class || @lookup_context&.instance_variable_get(:@_brick_model))
     see_all_path = send(\"#\{(base_model = model.base_class)._brick_index}_path\")
 #{(inh_col = @_brick_model.inheritance_column).present? &&
-"  if obj.respond_to?(:#{inh_col}) && (model_name = @#{obj_name}.#{inh_col}) &&
-     !model_name.is_a?(Numeric) && model_name != base_model.name
-    see_all_path << \"?#{inh_col}=#\{model_name}\"
+"    if obj.respond_to?(:#{inh_col}) && (model_name = @#{obj_name}.#{inh_col}) &&
+       !model_name.is_a?(Numeric) && model_name != base_model.name
+      see_all_path << \"?#{inh_col}=#\{model_name}\"
+    end
+    model_name = base_model.name if model_name.is_a?(Numeric)"}
+    model_name = nil if model_name == ''
   end
-  model_name = base_model.name if model_name.is_a?(Numeric)"}
-  model_name = nil if model_name == ''
   page_title = (\"#\{model_name ||= model.name}: #\{obj&.brick_descrip || controller_name}\")
 %></title>
 </head>

data/lib/brick/rails.rb

@@ -140,7 +140,7 @@ erDiagram
      bt_class = bt[1].first.first
      callbacks[bt_name = bt_class.name.split('::').last] = bt_class
      # Used to have:  &.inverse_of  before  &.macro
-     is_has_one = #{model.name}.reflect_on_association(bt.first)&.macro == :has_one ||
+     is_has_one = ::#{model.name}.reflect_on_association(bt.first)&.macro == :has_one ||
                   ::Brick.config.has_ones&.fetch('#{model.name}', nil)&.key?(bt.first.to_s)
     %>  <%= \"#{model_short_name} #\{is_has_one ? '||--o|' : '}o--||'} #\{bt_name} : \\\"#\{
         bt_underscored = bt[1].first.first.name.underscore.singularize
@@ -151,7 +151,7 @@ erDiagram
    last_hm = nil
    @_brick_hm_counts&.each do |hm|
      # Skip showing self-referencing HM links since they would have already been drawn while evaluating the BT side
-     next if (hm_class = hm.last&.klass) == #{model.name}
+     next if (hm_class = hm.last&.klass) == ::#{model.name}
 
      callbacks[hm_name = hm_class.name.split('::').last] = hm_class
      if (through = hm.last.options[:through]&.to_s) # has_many :through  (HMT)
@@ -180,7 +180,7 @@ erDiagram
        'time without time zone' => 'time',
        'time with time zone' => 'time' }[dt] || dt&.tr(' ', '_') || 'int'
    end
-   callbacks.merge({#{model_short_name.inspect} => #{model.name}}).each do |cb_k, cb_class|
+   callbacks.merge({#{model_short_name.inspect} => ::#{model.name}}).each do |cb_k, cb_class|
      cb_relation = ::Brick.relations[cb_class.table_name]
      pkeys = cb_relation[:pkey]&.first&.last
      fkeys = cb_relation[:fks]&.values&.each_with_object([]) { |fk, s| s << fk[:fk] if fk.fetch(:is_bt, nil) }
@@ -211,7 +211,7 @@ erDiagram
  %>
   </div>#{
  add_column = false # For the moment, disable all schema modification things
- "<%= brick_add_column(#{model.name}, #{prefix.inspect}).html_safe %>" unless add_column == false}
+ "<%= brick_add_column(::#{model.name}, #{prefix.inspect}).html_safe %>" unless add_column == false}
 </div>
 "
     end

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -280,7 +280,7 @@ to instead be this:
                 else
                   puts "to support the #{model.name} model, you can add this into your brick.rb:
 ::Brick.polymorphics = { \"#{model.table_name}.#{a.name}\" =>
-                         #{hm_models.map(&:name).inspect}
+                         #{hm_models.map { |m| "::#{m.name}" }.inspect}
                        }"
                 puts "and it will \"cement\" these options into place, and avoid this lookup process.\n"
                 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.236
+  version: 1.0.239
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-12 00:00:00.000000000 Z
+date: 2025-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -261,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Create a Rails app from data alone