brick 1.0.249 → 1.0.251

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a0179dae81efe75fe8ed60f18a8bcad431cd98db8604eadf7efba5ef200798f
-  data.tar.gz: fa409b53922fc28f8d0e0ef4753b0545efc27ae2c92fdf2f2249508d311137dc
+  metadata.gz: 7f3523afa6d066b034bb48321fee476541b520db03a6414a6bbb3ce7eb6fef68
+  data.tar.gz: 2a7db114267da1de863e4d225c09983585e04674a92c4d3c7d21c2eadf9ce1d8
 SHA512:
-  metadata.gz: 95ad49630d116d9fc1ca4c29065caeef4bbff0c688f4cadc64aed81b9611d057a628168ab2bd69d8958e4aa79c6caf4a2715ae2979c60741f081ddfc0fb41db5
-  data.tar.gz: a8e9d742f3207b58ff4069e3efd57a02cfa25f6c267db72ca1e725b10bc3fd29fddcaca2dd19c6501aaa4003cafc515d413789539c838f4d24cc668785776111
+  metadata.gz: ca9c7a8a90956bbfce0af44e21bace777bc988653173c854e59b783c05d7016ab0407015367ea7e5b075f6ab88416e3caf8825653f208d781c3ff86e82baf610
+  data.tar.gz: c93ba7596bfe01d8850178a2334d952fff29e2e4b76e0d5db22a081a8d05151cd64287caa81769a6401fd8f31c3bd9fad6bd50ca4c2081fa245376ef0c591254

data/lib/brick/extensions.rb

@@ -74,8 +74,9 @@ module ActiveRecord
 
       # Accommodate STI
       def find_real_model(params)
-        if params && ((sub_name = params.fetch(inheritance_column, nil)).present? ||
-                      (sub_name = params[name.underscore]&.fetch(inheritance_column, nil)))
+        if params && ((sub_name = params.fetch(inh_col = "__#{inheritance_column}", nil)).present? ||
+                      (sub_name = params[name.underscore]&.fetch(inh_col, nil)))
+          sub_name = sub_name.split(',') if sub_name.include?(',')
           sub_name = sub_name.first if sub_name.is_a?(Array) # Support the params style that gets returned from #_brick_querying
           # Make sure the chosen model is really the same or a subclass of this model
           return self if sub_name.blank?
@@ -128,6 +129,11 @@ module ActiveRecord
           end
           case ks.length
           when 1
+            if k == self.inheritance_column && self.name == v && (children = self.descendants).present?
+              # Modifying only the underlying where_values_hash is enough to cause inheritance_column types to work properly.
+              v << children.map { |sti_child| ",#{sti_child.name}" }.join
+              next
+            end
             next unless self.column_names.any?(where_col) || self._brick_get_fks.include?(where_col)
           when 2
             assoc_name = ks.first.to_sym
@@ -441,7 +447,7 @@ module ActiveRecord
                           CGI.escapeHTML(assoc_name)
                         end
       model_path = ::Rails.application.routes.url_helpers.send("#{_brick_index || table_name}_path".to_sym)
-      model_path << "?#{self.inheritance_column}=#{self.name}" if self != base_class
+      model_path << "__?#{self.inheritance_column}=#{self.name}" if self != base_class
       av_class = Class.new.extend(ActionView::Helpers::UrlHelper)
       av_class.extend(ActionView::Helpers::TagHelper) if ActionView.version < ::Gem::Version.new('7')
       link = av_class.link_to(assoc_html_name ? name : assoc_name, model_path)
@@ -483,24 +489,24 @@ module ActiveRecord
         @_br_cust_cols ||= {}
       end
 
-      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|
-            if assoc.options[:through]
-              current_permits << { "#{assoc.name.to_s.singularize}_ids".to_sym => [] }
-              s << "#{assoc.name.to_s.singularize}_ids: []"
-            end
-            if self.instance_methods.include?(:"#{assoc.name}_attributes=")
-              # Support nested attributes which use the friendly_id gem
-              assoc.klass._brick_nested_friendly_id if Object.const_defined?('FriendlyId') &&
-                                                       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
+      def _brick_find_permits(current_permits, is_for_expects = nil, done_models = [])
+        return current_permits if done_models.any? { |dp| self <= dp }
+
+        done_models << self
+        self.reflect_on_all_associations.select { |assoc| !assoc.belongs_to? }.each do |assoc|
+          if assoc.options[:through]
+            current_permits << { "#{assoc.name.to_s.singularize}_ids".to_sym => [] }
+          end
+          if self.instance_methods.include?(:"#{assoc.name}_attributes=")
+            next if assoc.source_reflection.nil?
+
+            # Support nested attributes which use the friendly_id gem
+            assoc.klass._brick_nested_friendly_id if Object.const_defined?('FriendlyId') &&
+                                                      assoc.klass.instance_variable_get(:@friendly_id_config)
+            assoc.klass._brick_find_permits((new_permits = assoc.klass._brick_all_fields), is_for_expects, done_models)
+            new_permits << :_destroy
+            new_permits = [new_permits] if is_for_expects
+            current_permits << { "#{assoc.name}_attributes".to_sym => new_permits }
           end
         end
         current_permits
@@ -1109,9 +1115,9 @@ JOIN (SELECT #{hm_selects.map { |s| _br_quoted_name("#{'br_t0.' if from_clause}#
                              end
           tbl_and_col_name << v_parts.last
           if v.last.is_a?(String) && ['>', '<'].include?(first_char = v.last.first[0]) # Greater than or less than?
-            col_name = v.last.first[1..-1]
-            col_name = "'#{col_name}'" unless [:integer, :boolean, :decimal, :float].include?(klass.columns_hash[v.first].type)
-            where_comparisons << "#{tbl_and_col_name.join('.')} #{first_char} #{col_name}"
+            val = v.last.first[1..-1]
+            val = "'#{val}'" unless [:integer, :boolean, :decimal, :float].include?(klass.columns_hash[v.first].type)
+            where_comparisons << "#{tbl_and_col_name.join('.')} #{first_char} #{val}"
           else
             (is_not ? where_nots : s)[tbl_and_col_name.join('.')] = v.last
           end
@@ -1836,7 +1842,7 @@ class Object
           code << "  has_secure_password\n"
         end
         # Accommodate singular or camel-cased table names such as "order_detail" or "OrderDetails"
-        code << "  self.table_name = '#{self.table_name = matching}'\n" if (inheritable_name || model_name).underscore.pluralize != matching
+        code << "  self.table_name = '#{self.table_name = matching}'\n" if table_name != matching
 
         if (inh_col = relation.fetch(:sti_col, nil) ||
                       ::Brick.config.sti_type_column.find { |_k, v| v.include?(matching) }&.first)
@@ -1877,7 +1883,7 @@ class Object
             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
+            elsif new_model_class.primary_key != our_pks.first
               new_model_class.primary_key = (pk_sym = our_pks.first.to_sym)
               code << "  self.primary_key = #{pk_sym.inspect}\n"
             end
@@ -2872,7 +2878,7 @@ class Object
           code << "  def #{params_name}\n"
           require_txt = model.base_class.name.underscore.tr('/', '_')
           is_for_expects = ::ActiveSupport.version >= ::Gem::Version.new('8.0a')
-          permits = model._brick_find_permits(model, model._brick_all_fields(true), is_for_expects)
+          permits = model._brick_find_permits(model._brick_all_fields(true), is_for_expects)
           if is_for_expects
             code << "    params.expect(#{require_txt}: #{permits})\n"
             self.define_method(params_name) do

data/lib/brick/rails/engine.rb

@@ -705,7 +705,7 @@ window.addEventListener(\"popstate\", linkSchemas);
 
               if @_brick_model
                 pk = @_brick_model._brick_primary_key(::Brick.relations.fetch((table_name = @_brick_model.table_name.split('.').last), nil))
-                rn_start = (mn_split = model_name.split('::')).length > 1 ? -2 : -1
+                rn_start = (mn_split = @_brick_model.base_class.name.split('::')).length > 1 ? -2 : -1
                 obj_name = mn_split[rn_start..-1].join.underscore.singularize
                 res_name = obj_name.pluralize
 
@@ -1098,7 +1098,7 @@ if (window.brickFontFamily) {
       until this_model == base_model do
         this_model = this_model.superclass
         path = send(\"#\{this_model._brick_index}_path\")
-        path << \"?#\{base_model.inheritance_column}=#\{this_model.name}\" unless this_model == base_model
+        path << \"?__#\{base_model.inheritance_column}=#\{this_model.name}\" unless this_model == base_model
         parent_links << link_to(this_model.name, path)
       end
       \"<tr><td colspan=\\\"#\{td_count}\\\">Parent: #\{parent_links.join(' ')}</tr>\".html_safe
@@ -1130,7 +1130,7 @@ end
                %><% end %></h3><%
        end %><%
      end %>
-  <span class=\"__brick\">(<%= link_to \"See all #\{model.base_class.name.split('::').last.pluralize}\", #{@_brick_model._brick_index}_path %>)</span>
+  <span class=\"__brick\">(<%= link_to \"See all #\{base_model.name.split('::').last.pluralize}\", #{@_brick_model._brick_index}_path %>)</span>
 <% end %><%
    # COLUMN EXCLUSIONS
    if @_brick_excl&.present? %>
@@ -1406,7 +1406,7 @@ s << \"\\n  <br>\\n\"
 #{(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}\"
+      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 == ''
@@ -1647,7 +1647,7 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
   var mermaidCode;
   var cbs = {<%= callbacks.map do |k, v|
                    path = send(\"#\{v._brick_index}_path\".to_sym)
-                   path << \"?#\{v.base_class.inheritance_column}=#\{v.name}\" unless v == v.base_class
+                   path << \"?__#\{v.base_class.inheritance_column}=#\{v.name}\" unless v == v.base_class
                    \"#\{k}: \\\"#\{path}\\\"\"
                  end.join(', ').html_safe %>};
   if (imgErd) imgErd.addEventListener(\"click\", showErd);

data/lib/brick/rails/form_tags.rb

@@ -807,7 +807,7 @@ function onImagesLoaded(event) {
                        klass, sti_type, rel_name = ::Brick.ctrl_to_klass(controller_path)
                        if klass
                          type_col = klass.inheritance_column # Usually 'type'
-                         filter_parts << "#{type_col}=#{sti_type}" if sti_type && klass.column_names.include?(type_col)
+                         filter_parts << "__#{type_col}=#{sti_type}" if sti_type && klass.column_names.include?(type_col)
                          path_params = request.path_parameters
                          pk = (klass.primary_key || ActiveRecord::Base.primary_key).to_sym
                          if ((id = (path_params[pk] || path_params[:id] || path_params["#{klass.name.underscore}_id".to_sym])) && (obj = klass.find_by(pk => id))) ||
@@ -829,7 +829,7 @@ function onImagesLoaded(event) {
                                                      .pluck(assoc_klass.primary_key).first)
                                foreign_id = new_id
                              end
-                             filter_parts << "#{path_param}=#{foreign_id}"
+                             filter_parts << "__#{path_param}=#{foreign_id}"
                            end
                            klass
                          end
@@ -839,7 +839,7 @@ function onImagesLoaded(event) {
     if klass_or_obj
       if klass_or_obj.is_a?(ActiveRecord::Relation)
         klass_or_obj.where_values_hash.each do |whr|
-          filter_parts << "#{whr.first}=#{whr.last}" if whr.last && !whr.last.is_a?(Array)
+          filter_parts << "__#{whr.first}=#{whr.last}" if whr.last && !whr.last.is_a?(Array)
         end
         klass_or_obj = klass_or_obj.klass
       end
@@ -849,7 +849,7 @@ function onImagesLoaded(event) {
       if klass_or_obj.is_a?(Class) && klass_or_obj <= ActiveRecord::Base
         type_col = klass_or_obj.inheritance_column
         if klass_or_obj.column_names.include?(type_col) && klass_or_obj.name != klass_or_obj.base_class.name
-          filter_parts << "#{type_col}=#{klass_or_obj.name}"
+          filter_parts << "__#{type_col}=#{klass_or_obj.name}"
         end
       end
       filter = "?#{filter_parts.join('&')}" if filter_parts.present?

data/lib/brick/version_number.rb

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

metadata

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