brick 1.0.226 → 1.0.228

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f49b4376a0265094ca854c558df6bc4166a619de70bb8b8306cee5667b3545fa
-  data.tar.gz: 2230e3a409329ec8781aa92e976f4dca318727a1620b3814d1f382ef9e33502c
+  metadata.gz: ada376a5ef8d35110b7228a583cdcb18e5246fcfa52b975aff872c9a2ac7e37d
+  data.tar.gz: 7621c881fcacca08f8b9543371fbcb190c0513e5d8c8b6bc2c767a51a48ef43e
 SHA512:
-  metadata.gz: bd980b9c153b10d7b9298299553d552c1265b61cbd842fdd4814d6188a27dc101366fff42bf52cfa799f4a6304bb71e5b9505742b3fe606c41eef5309bd6d2e7
-  data.tar.gz: b196a9a308e512f1faaea85982c6a738fe7bb00b70ef2d9e7eeff37638b01ca563696d85e1e82216b1358c2999cb9bfaf7e4081f012121c0266ebf8ff2f877d9
+  metadata.gz: 8ccbeae9b7cf7874653de1666af8a708e77126248eadec4cd80d1766f33063f93a7b198aabdb02895e9a8456d89b63f36a15d6348a70a9b9ead928b7a29c1567
+  data.tar.gz: 7fc00087943b2b7fdab18783793057772f59a1e98896239a8cc4c4d91f7aa41201265931393201a399c3b3261186a7e56deb4d8703cb46676eafd5a10ab3fa22

data/lib/brick/extensions.rb

@@ -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,7 +2278,11 @@ class Object
         end
 
         self.protect_from_forgery unless: -> { self.request.format.js? }
-        tn_start = (pcn_split = plural_class_name.split('::')).length > 1 ? -2 : -1
+        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

data/lib/brick/rails/engine.rb

@@ -587,8 +587,9 @@ window.addEventListener(\"popstate\", linkSchemas);
               def lookup_context(*args)
                 ret = _brick_lookup_context(*args)
                 if self.class < AbstractController::Base
-                  request if respond_to?(:request) # ActionMailer does not have +request+
-                  @_lookup_context.instance_variable_set(:@_brick_req_params, params) if request && params.present?
+                  if respond_to?(:request) # ActionMailer does not have +request+
+                    @_lookup_context.instance_variable_set(:@_brick_req_params, params) if request && params.present?
+                  end
                 end
                 ret
               end
@@ -681,7 +682,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

data/lib/brick/version_number.rb

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

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.226
+  version: 1.0.228
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-09 00:00:00.000000000 Z
+date: 2025-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord