brick 1.0.250 → 1.0.252

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dfd58af439d004894147bf5e1e568c791e2044d48f945aa22fa89a8e46d3efa
-  data.tar.gz: 166b4869016f55f710f4124e8eb9d1ca4531c29a5e4c83e7c32dc661cf429c21
+  metadata.gz: 7bb30040fa7e3a7e755f0d853559f3fe2c9d2dc94af4b6ffbaceb39ef41d981f
+  data.tar.gz: 21642081c09d80c40b585ee838a8d4436254f4746cf4798e4cfa6eaf04cdccf7
 SHA512:
-  metadata.gz: 354fa85b9c8e24c6bfd3a970de0fa93aec8daede747bb14a32d9c9a8ead95e19a38bbad646b70fd74c5d8aed24a55b31c9acdf9a9ea4570b8d5f24853961f484
-  data.tar.gz: '0367903f7ff42ec1ac644b08e8462bf6297fccb34fac5f7cd92eb0f365e6af2e44c93d3a7bf216bf004366ba45a73f916607e2ff67141bfb1a68fc540fed5b65'
+  metadata.gz: ff10a4dc80c8e663be90c6c6e2b489763312c81834b2303b91799354b91b0bfd8b3d54343ab8ebc17665e17b5a039a53b336822d4529509d1d9f6ba588b403c1
+  data.tar.gz: '0912de41a2ee1651470e764234fd7394adcba3b16b618fd20359038010fb37a182746b386816fb5673eef7a0848b472fbdec9cea846dd510614cb6286e7b1403'

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
@@ -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.include?(self)
+
+        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
 
@@ -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? %>

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 250
+    TINY = 252
 
     # 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.250
+  version: 1.0.252
 platform: ruby
 authors:
 - Lorin Thwaits