brick 1.0.225 → 1.0.227

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f82da7422196469fc96ed7e6a720404547125622e4a9221b762d2797ddfa1a1
-  data.tar.gz: 48db61484c3899a2ee44754979eca01442d1c396e2ae10df8c5bb707d45398fa
+  metadata.gz: 1640b4022f78ed3bba288342fd3cb4f3c90cdb75c09aa804b9aeb7e91ae64403
+  data.tar.gz: 1c44e055658540a923db08a4ef0114f1291024acb90c2cad26631c61a9b050a9
 SHA512:
-  metadata.gz: 33e2eb178a7eb4e7c04ea47ee7cb14b732eb43918974ef189f7423615158acae66a6135ba43373cdc30fa6dffff83388e32f3f0610450f6ae46a66dd9e672176
-  data.tar.gz: e7f04e018e0f21780c2d1a6705a5f39b3a62321d7314fb5b3f0924c77ca11344c5a1928231ac39b32daa858e3411cdee9eb8c09d55992677f46384f2e474cdba
+  metadata.gz: 61345c77cea2b0d61f9828086f3c9e9b464d377945b2a1a78822f4db36bd37a73e052689750b23f54549fd17e0cd5af0a794eec664ba3a593c4a5b90fb12be13
+  data.tar.gz: b05f1791d999a9e57ee1987a336dde5aefc1bfda029a8afd0a26103b4b64ea89bde3bad1f954f70fa25ec4d1d60aaf53ad7a363801c4695113b4ddbe6d52bf0b

data/lib/brick/extensions.rb

@@ -459,7 +459,7 @@ module ActiveRecord
 
         # join_array will receive this relation name when calling #brick_parse_dsl
         _br_bt_descrip[bt.first] = if bt[1].is_a?(Array)
-                                     # Last params here:  "true" is for yes, we are polymorphic
+                                     # Last param here:  "true" is for yes, we are polymorphic
                                      bt[1].each_with_object({}) { |bt_class, s| s[bt_class] = bt_class.brick_parse_dsl(join_array, bt.first, translations, true) }
                                    else
                                      { bt.last => bt[1].brick_parse_dsl(join_array, bt.first, translations) }
@@ -1497,7 +1497,7 @@ end
                  # ... then just fall through and allow it to fail when trying to load the ____Controller class normally.
                end
                unless skip_controller
-                 Object.send(:build_controller, self, class_name, plural_class_name, model, relations)
+                 Object.send(:build_controller, self, class_name, plural_class_name, model, relations, is_brick_prefix)
                end
 
              # MODULE
@@ -2096,7 +2096,7 @@ class Object
       end
     end
 
-    def build_controller(namespace, class_name, plural_class_name, model, relations)
+    def build_controller(namespace, class_name, plural_class_name, model, relations, is_brick_prefix = nil)
       if (is_avo = (namespace.name == 'Avo' && Object.const_defined?('Avo')))
         # Basic Avo functionality is available via its own generic controller.
         # (More information on https://docs.avohq.io/3.0/controllers.html)
@@ -2278,8 +2278,12 @@ class Object
         end
 
         self.protect_from_forgery unless: -> { self.request.format.js? }
-        tn_start = (table_name_split = table_name.split('.')).length > 1 ? -2 : -1
-        plural_table_name = table_name_split[tn_start..-1].join('_').pluralize
+        pcn_split = [plural_class_name]
+        namespace_names = namespace&.name&.split('::')
+        namespace_names&.shift if is_brick_prefix
+        pcn_split.unshift(namespace_names.join('::')) if namespace_names.present?
+        tn_start = pcn_split.length > 1 ? -2 : -1
+        plural_table_name = pcn_split[tn_start..-1].join.underscore.pluralize
         singular_table_name = plural_table_name.singularize
         unless is_avo
           self.define_method :index do

data/lib/brick/rails/engine.rb

@@ -681,7 +681,7 @@ window.addEventListener(\"popstate\", linkSchemas);
                 rescue StandardError => e
                   # Search through the routes to confirm that something might match (Devise stuff for instance, which has its own view templates),
                   # and bubble the same exception (probably an ActionView::MissingTemplate) if a legitimate option is found.
-                  raise if ActionView.version >= ::Gem::Version.new('5.0') &&
+                  raise if ActionView.version >= ::Gem::Version.new('5.0') && args[1] &&
                            ::Rails.application.routes.set.find { |x| args[1].include?(x.defaults[:controller]) && args[0] == x.defaults[:action] }
 
                   find_template_err = e
@@ -691,8 +691,8 @@ 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 = (res_name_split = model_name.split('::')).length > 1 ? -2 : -1
-                obj_name = res_name_split[rn_start..-1].join('_').singularize
+                rn_start = (mn_split = model_name.split('::')).length > 1 ? -2 : -1
+                obj_name = mn_split[rn_start..-1].join.underscore.singularize
                 res_name = obj_name.pluralize
 
                 path_obj_name = @_brick_model._brick_index(:singular)

data/lib/brick/rails/form_tags.rb

@@ -94,7 +94,17 @@ module Brick::Rails::FormTags
     #     (After restarting the server it worked fine again.)
     row_count = 0
     # if @_brick_join_array&.include?()
-    enumerator = relation.each # Runs the SQL query
+    begin
+      enumerator = relation.each # Runs the SQL query
+    rescue ActiveRecord::SubclassNotFound => e
+      # If there is a missing STI class then keep the show on the road by temporarily modifying the inheritance column.
+      inh_col = klass.inheritance_column
+      puts "WARNING:  At least one row in the \"#{klass.table_name}\" table has an invalid value in the inheritance column \"#{inh_col}\"."
+      puts e.message
+      klass.inheritance_column = '^\/^' # Some impossible column name
+      enumerator = relation.each
+      klass.inheritance_column = inh_col
+    end
     # Add proxied info for @_brick_includes
     # proxy = relation.instance_variable_get(:@proxy) || relation.instance_variable_set(:@proxy, {})
     bi = relation.instance_variable_get(:@_brick_includes)

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -251,7 +251,7 @@ module Brick
             if (pri_models = (model.respond_to?(poly_types_method = "#{a.name}_types") &&
                               model.send(poly_types_method)
                              ) ||
-                             (rel_poly_bt = relations[model.table_name][:fks].find { |_k, fk| fk[:assoc_name] == a.name.to_s } &&
+                             ((rel_poly_bt = relations[model.table_name][:fks].find { |_k, fk| fk[:assoc_name] == a.name.to_s }) &&
                               (rel_poly_bt[1][:polymorphic] || rel_poly_bt&.last&.fetch(:inverse_table, [])&.map { |table| table.singularize.camelize })
                              )
                ).is_a?(Array)

data/lib/generators/brick/controllers_generator.rb

@@ -63,8 +63,8 @@ module Brick
                     else
                       Object
                     end
-        controller_parts[controller_parts.length - 1] = (controller_name = "#{controller_parts.last}Controller")
-        _built_controller, code = Object.send(:build_controller, namespace, controller_name, controller_name, controller_option.model, relations)
+        _built_controller, code = Object.send(:build_controller, namespace, (controller_name = "#{controller_parts.last}Controller"), controller_parts.last, controller_option.model, relations)
+        controller_parts[-1] = controller_name
         path = ['controllers']
         path.concat(controller_parts.map(&:underscore))
         dir = +"#{::Rails.root}/app"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.225
+  version: 1.0.227
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-08 00:00:00.000000000 Z
+date: 2025-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord