brick 1.0.90 → 1.0.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eca72d418715811a100a44a45b3cd054ca511ed280f1d1a6f344ddaa972c220c
-  data.tar.gz: d712ebb5dedf75da99d8d8720f4b89e29ea2e96b498b4a59540811f5e087231c
+  metadata.gz: 81eaa518a99452286bdaf1e5ed33b83962ede9f9c6509f0b472fd0fe19a8eceb
+  data.tar.gz: 06f5653ce40eb6ee1568b380cf3063073ac7735add8aab6c5873a343e8018a70
 SHA512:
-  metadata.gz: 1b3d3941f4905b7a3ce1489a6f018d958331bd4c2970a5ba5034eb0fb81683febdc8a93562be5a1505afe6d6479fb1ed068a0f21d6ea80f24460e9e9267b8ea3
-  data.tar.gz: c3f61b68cd2ca5790f93b82010909f65913ccecb46df24786c83db362241092824db66833b72f03708560f23b7e87f64f12b180d8e4fb9ababba32bdb9b3f9df
+  metadata.gz: 7e0a678885c927a7a80c8758d265c2ff351f67ea44e8e1b2c128e123df441f4f72a62f775b9785615eeacbdbff99427e9d1590890bdffd06165ae7b2339fe1af
+  data.tar.gz: 7bd3e424225e435bab4517fb14aeaa3ca128041a746aaf413ecdb17a771444c3413f058ff28cc5e303d074fdd7cc7d21ff66f842667c14226d1849e96d4b3a98

data/lib/brick/extensions.rb

@@ -309,9 +309,15 @@ module ActiveRecord
     def self._brick_calculate_bts_hms(translations, join_array)
       # Add any custom columns
       ::Brick.config.custom_columns&.fetch(table_name, nil)&.each do |k, cc|
+        if cc.is_a?(Array)
+          fk_col = cc.last unless cc.last.blank?
+          cc = cc.first
+        else
+          fk_col = true
+        end
         # false = not polymorphic, and true = yes -- please emit_dsl
         pieces, my_dsl = brick_parse_dsl(join_array, [], translations, false, cc, true)
-        _br_cust_cols[k] = [pieces, my_dsl]
+        _br_cust_cols[k] = [pieces, my_dsl, fk_col]
       end
       bts, hms, associatives = ::Brick.get_bts_and_hms(self)
       bts.each do |_k, bt|
@@ -557,6 +563,10 @@ module ActiveRecord
             next
           end
 
+          key_klass = nil
+          key_tbl_name = nil
+          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 }
             tbl_name = (field_tbl_names[k][cc_part.last] ||= shift_or_first(chains[dest_klass])).split('.').last
@@ -569,10 +579,29 @@ module ActiveRecord
                   used_col_aliases.key?(col_alias)
               cc_part_idx -= 1
             end
+            used_col_aliases[col_alias] = nil
+            # Set up custom column links by preparing key_klass and key_alias
+            # (If there are multiple different tables referenced in the DSL, we end up creating a link to the last one)
+            if cc[2] && (dest_pk = dest_klass.primary_key)
+              key_klass = dest_klass
+              key_tbl_name = tbl_name
+              cc_part_idx = cc_part.length - 1
+              while cc_part_idx > 0 &&
+                    (key_alias = "br_cc_#{k}__#{(cc_part[cc_part_idx..-2] + [dest_pk]).map(&:to_s).join('__')}") &&
+                    key_alias != col_alias && # We break out if this key alias does exactly match the col_alias
+                    used_col_aliases.key?(key_alias)
+                cc_part_idx -= 1
+              end
+            end
             selects << "#{tbl_name}.#{cc_part.last} AS #{col_alias}"
             cc_part << col_alias
-            used_col_aliases[col_alias] = nil
           end
+          # Add a key column unless we've already got it
+          if key_alias && !used_col_aliases.key?(key_alias)
+            selects << "#{key_tbl_name}.#{dest_pk} AS #{key_alias}"
+            used_col_aliases[key_alias] = nil
+          end
+          cc[2] = key_alias ? [key_klass, key_alias] : nil
         end
 
         klass._br_bt_descrip.each do |v|
@@ -1167,7 +1196,7 @@ class Object
       if (base_model = ::Brick.sti_models[full_model_name]&.fetch(:base, nil) || ::Brick.existing_stis[full_model_name]&.constantize)
         is_sti = true
       else
-        base_model = ::Brick.config.models_inherit_from || ActiveRecord::Base
+        base_model = ::Brick.config.models_inherit_from
       end
       hmts = nil
       code = +"class #{full_name} < #{base_model.name}\n"

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

@@ -19,7 +19,12 @@ module Brick
         ::Brick.exclude_tables = app.config.brick.fetch(:exclude_tables, [])
 
         # Class for auto-generated models to inherit from
-        ::Brick.models_inherit_from = app.config.brick.fetch(:models_inherit_from, ActiveRecord::Base)
+        ::Brick.models_inherit_from = app.config.brick.fetch(:models_inherit_from, nil) ||
+                                      begin
+                                        ::ApplicationRecord
+                                      rescue StandardError => ex
+                                        ::ActiveRecord::Base
+                                      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, [])
@@ -985,7 +990,12 @@ erDiagram
     %><%=  display_value(col_type || col&.sql_type, val) %><%
          elsif cust_col
            data = cust_col.first.map { |cc_part| #{obj_name}.send(cc_part.last) }
-    %><%=  #{model_name}.brick_descrip(cust_col.last, data) %><%
+           cust_txt = #{model_name}.brick_descrip(cust_col[-2], data)
+           if (link_id = #{obj_name}.send(cust_col.last[1]) if cust_col.last)
+    %><%=    link_to(cust_txt, send(\"#\{cust_col.last.first._brick_index(:singular)}_path\", link_id)) %><%
+           else
+    %><%=    cust_txt %><%
+           end
          else # Bad column name!
       %>?<%
          end

data/lib/brick/version_number.rb

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

data/lib/generators/brick/install_generator.rb

@@ -139,7 +139,7 @@ module Brick
 # Settings for the Brick gem
 # (By default this auto-creates models, controllers, views, and routes on-the-fly.)
 
-if Object.const_defined?('Brick')
+if ActiveRecord::Base.respond_to?(:brick_select)
   # Mode -- generally :on or :off, or only in :development.  Also available is :diag_env which enables only
   # when the environment variable BRICK is set.
   Brick.mode = :development

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.90
+  version: 1.0.91
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-04 00:00:00.000000000 Z
+date: 2022-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord