brick 1.0.196 → 1.0.197

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f5cff29063c150d35653274752bcda0ed44ce462563824f8b8a974dfacc8a81
-  data.tar.gz: 2d26e1e8a62b3a9e69c6a28a37e640fa5c5e0ced28a6527db4b68d2abdfc47f5
+  metadata.gz: bfd8798f339e1bb363ca73f7b3285cdb32471cbae2c6ff5a500b43db6536840a
+  data.tar.gz: be5744fd98d6323ecb33be2b77f50e9ee5b872bc8356ef4d08372cddab4d9920
 SHA512:
-  metadata.gz: 150e669bb088db49139311839cbca472317b371d24ab85bc096bea94221331c1f7122b8ed521a9c87691d9ded450d723954c2bd7d833b56fd07f248be5624339
-  data.tar.gz: cf000d92773ce9ec8db6a412e7f4fe642e6e9bc07db9412459931a69ebc7dff7fb41de9d1824d068b9c8568827cdbd1881073f3404b85eab1fc1c5670cd625ff
+  metadata.gz: 8848e2c6a93a75f454b0b9ebd4712769c39868583fc6d6659548c6eb3818eec12bfb7968580a4c684eab67095fca754553a42bc4b71729b223f79882731ebfd3
+  data.tar.gz: b764da2f667e22e5d02e6f5354e3b4b30164827c5b40647b7fca672038f7435ebe14f32dc22d05c54375a29e94c68d82b61dc590099f9e26f2b4843092861bed

data/lib/brick/extensions.rb

@@ -3468,9 +3468,9 @@ module Brick
       separator ||= '_'
       res_name = (tbl_name_parts = tbl_name.split('.'))[0..-2].first
       res_name << '.' if res_name
-      (res_name ||= +'') << (relation || ::Brick.relations.fetch(tbl_name, nil))&.fetch(:resource, nil) || tbl_name_parts.last
+      (res_name ||= +'') << (relation ||= ::Brick.relations.fetch(tbl_name, nil))&.fetch(:resource, nil) || tbl_name_parts.last
 
-      res_parts = ((mode == :singular) ? res_name.singularize : res_name).split('.')
+      res_parts = ((mode == :singular) ? tbl_name.singularize : tbl_name).split('.')
       res_parts.shift if ::Brick.apartment_multitenant && res_parts.length > 1 && res_parts.first == ::Brick.apartment_default_tenant
       if (aps = relation&.fetch(:auto_prefixed_schema, nil)) && res_parts.last.start_with?(aps)
         last_part = res_parts.last[aps.length..-1]
@@ -3487,7 +3487,7 @@ module Brick
       index = index.tr('_', 'x') if separator == 'x'
       # Rails applies an _index suffix to that route when the resource name isn't something plural
       index << '_index' if mode != :singular && separator == '_' &&
-                           index == (path_prefix + [name&.underscore&.tr('/', '_') || '_']).join(separator)
+                           index == (path_prefix + [relation[:class_name]&.underscore&.tr('/', '_') || '_']).join(separator)
       index
     end
 

data/lib/brick/route_mapper.rb

@@ -74,7 +74,7 @@ module Brick
           schema_prefix = "#{schema_name}."
         end
 
-        resource_name = v.fetch(:resource, nil)
+        resource_name = v.fetch(:resource, nil) || k
         next if !resource_name ||
                 existing_controllers.key?(
                   controller_prefix + (resource_name = "#{schema_prefix&.tr('.', '/')}#{resource_name}".pluralize)
@@ -82,7 +82,7 @@ module Brick
 
         object_name = k.split('.').last # Take off any first schema part
 
-        full_schema_prefix = if (full_aps = aps = v.fetch(:auto_prefixed_schema, nil))
+        full_schema_prefix = if (aps = v.fetch(:auto_prefixed_schema, nil))
                                aps = aps[0..-2] if aps[-1] == '_'
                                (schema_prefix&.dup || +'') << "#{aps}."
                              else
@@ -90,7 +90,6 @@ module Brick
                              end
 
         # Track routes being built
-        resource_name = v.fetch(:resource, nil) || k
         if (class_name = v.fetch(:class_name, nil))
           if v.key?(:isView)
             view_class_length = class_name.length if class_name.length > view_class_length
@@ -98,7 +97,7 @@ module Brick
           else
             table_class_length = class_name.length if class_name.length > table_class_length
             tables
-          end << [class_name, aps, "#{"#{schema_name}/" if schema_name}#{resource_name[full_aps&.length || 0 .. -1]}"]
+          end << [class_name, aps, "#{"#{schema_name}/" if schema_name}#{resource_name}"]
         end
 
         options = {}

data/lib/brick/version_number.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.196
+  version: 1.0.197
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-30 00:00:00.000000000 Z
+date: 2024-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord