brick 1.0.98 → 1.0.100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4285ef6fb81d75bd90ceffc7d66c7fa096f04fb998da590f291f28fc9dfb45d
-  data.tar.gz: 2d031b156fd9c82d19af9b7818387eaecdd8cfadf939cbcf3b3b479474a77b54
+  metadata.gz: ba0de7f332d1d98502a4e66bc4fda9b44d4f97fe6d6a259ac7527a856c726000
+  data.tar.gz: 45898a638f4c944cf33e98ff73a41da97686819bbdfcc8534257c013a6b28582
 SHA512:
-  metadata.gz: 5967ede119f86cd92f88abb0f43bd2049eda4272c14ae7fa1c3f9ecc54c813c4c227be2d99aaa501363e42ef34a3eb5d0a0924ac4e540ab668e40a9a9d28311e
-  data.tar.gz: ab01005e485b9335c67ba48bb01a13db78fed3ce31293122fae8fbf1317b3bc0c3197adb087ec4b125e2ff7153e52fb55d8b7fc675b1e7759233cf8d42769ac7
+  metadata.gz: 28079c58b020d395845c681710c88db3e7a32ae312fbdf607ab496854aab37d29f3a9dfed78a2495a011b3817aed8259260a1d0d5ecd409803d89b4eda70b87f
+  data.tar.gz: 834499603e05412ee19c2f5db90f55df1f927eff85a41488e4f57381065580aeb4477700596988e4cc630282268f40045d1831822bde2c80b659a23e257f692a

data/lib/brick/extensions.rb

@@ -398,7 +398,7 @@ module ActiveRecord
     # Links from ActiveRecord association pathing names over to real table correlation names
     # that get chosen when the AREL AST tree is walked.
     def brick_links
-      @brick_links ||= {}
+      @brick_links ||= { '' => table_name }
     end
 
     def brick_select(params, selects = [], order_by = nil, translations = {}, join_array = ::Brick::JoinArray.new)
@@ -436,6 +436,7 @@ module ActiveRecord
 
       # %%% Skip the metadata columns
       if selects.empty? # Default to all columns
+        id_parts = (id_col = klass.primary_key).is_a?(Array) ? id_col : [id_col]
         tbl_no_schema = table.name.split('.').last
         # %%% Have once gotten this error with MSSQL referring to http://localhost:3000/warehouse/cold_room_temperatures__archive
         #     ActiveRecord::StatementInvalid (TinyTds::Error: DBPROCESS is dead or not enabled)
@@ -496,16 +497,23 @@ module ActiveRecord
           dest_pk = nil
           key_alias = nil
           cc.first.each do |cc_part|
-            dest_klass = cc_part[0..-2].inject(klass) { |kl, cc_part_term| kl.reflect_on_association(cc_part_term).klass }
+            dest_klass = cc_part[0..-2].inject(klass) do |kl, cc_part_term|
+              # %%% Clear column info properly so we can do multiple subsequent requests
+              # binding.pry unless kl.reflect_on_association(cc_part_term)
+              kl.reflect_on_association(cc_part_term)&.klass || klass
+            end
             tbl_name = rel_dupe.brick_links[cc_part[0..-2].map(&:to_s).join('.')]
             # Deal with the conflict if there are two parts in the custom column named the same,
             # "category.name" and "product.name" for instance will end up with aliases of "name"
             # and "product__name".
-            cc_part_idx = cc_part.length - 1
-            while cc_part_idx > 0 &&
-                  (col_alias = "br_cc_#{k}__#{cc_part[cc_part_idx..-1].map(&:to_s).join('__')}") &&
-                  used_col_aliases.key?(col_alias)
-              cc_part_idx -= 1
+            if (cc_part_idx = cc_part.length - 1).zero?
+              col_alias = "br_cc_#{k}__#{table_name.tr('.', '_')}"
+            else
+              while cc_part_idx > 0 &&
+                    (col_alias = "br_cc_#{k}__#{cc_part[cc_part_idx..-1].map(&:to_s).join('__').tr('.', '_')}") &&
+                    used_col_aliases.key?(col_alias)
+                cc_part_idx -= 1
+              end
             end
             used_col_aliases[col_alias] = nil
             # Set up custom column links by preparing key_klass and key_alias
@@ -963,7 +971,7 @@ Module.class_exec do
                                    ::Brick.is_oracle ? class_name.upcase : class_name,
                                    (plural_class_name = class_name.pluralize)].find { |s| Brick.db_schemas&.include?(s) }&.camelize ||
                                   (::Brick.config.sti_namespace_prefixes&.key?("::#{class_name}::") && class_name) ||
-                                  (::Brick.config.table_name_prefixes&.values.include?(class_name) && class_name))
+                                  (::Brick.config.table_name_prefixes.values.include?(class_name) && class_name))
                return self.const_get(schema_name) if self.const_defined?(schema_name)
 
                # Build out a module for the schema if it's namespaced
@@ -1372,7 +1380,7 @@ class Object
       when Symbol
         order_tbl[order_default] || order_default
       else
-        pk.map(&:to_sym) # If it's not a custom ORDER BY, just use the key
+        pk.map { |part| "#{table_name}.#{part}"}.join(', ') # If it's not a custom ORDER BY, just use the key
       end
     end
 
@@ -1568,7 +1576,8 @@ class Object
             order_by, _ = model._brick_calculate_ordering(ordering, true) # Don't do the txt part
 
             ar_relation = ActiveRecord.version < Gem::Version.new('4') ? model.preload : model.all
-            @_brick_params = ar_relation.brick_select(params, (selects = []), order_by,
+
+            @_brick_params = ar_relation.brick_select(params, (selects ||= []), order_by,
                                                                translations = {},
                                                                join_array = ::Brick::JoinArray.new)
             # %%% Add custom HM count columns

data/lib/brick/frameworks/rails/engine.rb

@@ -54,7 +54,7 @@ module Brick
                                       end
 
         # When table names have specific prefixes, automatically place them in their own module with a table_name_prefix.
-        ::Brick.table_name_prefixes = app.config.brick.fetch(:table_name_prefixes, [])
+        ::Brick.table_name_prefixes = app.config.brick.fetch(:table_name_prefixes, {})
 
         # Columns to treat as being metadata for purposes of identifying associative tables for has_many :through
         ::Brick.metadata_columns = app.config.brick.fetch(:metadata_columns, ['created_at', 'updated_at', 'deleted_at'])

data/lib/brick/frameworks/rails/form_tags.rb

@@ -11,7 +11,7 @@ module Brick::Rails::FormTags
       out << "<th x-order=\"#{pk.join(',')}\"></th>"
     end
 
-    col_keys = relation.columns.each_with_object([]) do |col, s|
+    col_keys ||= relation.columns.each_with_object([]) do |col, s|
       col_name = col.name
       next if inclusions&.exclude?(col_name) ||
               (pk.include?(col_name) && [:integer, :uuid].include?(col.type) && !bts.key?(col_name)) ||
@@ -122,7 +122,7 @@ module Brick::Rails::FormTags
         if (link_id = obj.send(cust_col.last[1]) if cust_col.last)
           out << link_to(cust_txt, send("#{cust_col.last.first._brick_index(:singular)}_path", link_id))
         else
-          out << cust_txt
+          out << (cust_txt || '')
         end
       else # Bad column name!
         out << '?'
@@ -186,13 +186,14 @@ module Brick::Rails::FormTags
         end
       end
       filter = "?#{filter_parts.join('&')}" if filter_parts.present?
+      app_routes = Rails.application.routes # In case we're operating in another engine, reference the application since Brick routes are placed there.
       if (klass_or_obj&.is_a?(Class) && klass_or_obj < ActiveRecord::Base) ||
          (klass_or_obj&.is_a?(ActiveRecord::Base) && klass_or_obj.new_record? && (klass_or_obj = klass_or_obj.class))
-        path = (proc = kwargs[:index_proc]) ? proc.call(klass_or_obj) : "#{send("#{klass_or_obj.base_class._brick_index}_path")}#{filter}"
+        path = (proc = kwargs[:index_proc]) ? proc.call(klass_or_obj) : "#{app_routes.path_for(controller: klass_or_obj.base_class._brick_index, action: :index)}#{filter}"
         lt_args = [text || "Index for #{klass_or_obj.name.pluralize}", path]
       else
         # If there are multiple incoming parameters then last one is probably the actual ID, and first few might be some nested tree of stuff leading up to it
-        path = (proc = kwargs[:show_proc]) ? proc.call(klass_or_obj) : "#{send("#{klass_or_obj.class.base_class._brick_index(:singular)}_path", klass_or_obj)}#{filter}"
+        path = (proc = kwargs[:show_proc]) ? proc.call(klass_or_obj) : "#{app_routes.path_for(controller: klass_or_obj.class.base_class._brick_index, action: :show, id: klass_or_obj)}#{filter}"
         lt_args = [text || "Show this #{klass_or_obj.class.name}", path]
       end
       link_to(*lt_args, **kwargs)

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 98
+    TINY = 100
 
     # 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.98
+  version: 1.0.100
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-04 00:00:00.000000000 Z
+date: 2022-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord