brick 1.0.121 → 1.0.122

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 142adfa751be46ca1115b6e6f6945ab25ad10148e55c7584eba6f91be62c6cf0
-  data.tar.gz: a20a11f7fc6c864fbf9c5d9b4c6f80f29c0d26380e0aa110b63183f6e0c2e3e0
+  metadata.gz: b1f047f700bc850e0e54210cd9669e2877c2d770010f42c82b7f2616ad14f542
+  data.tar.gz: e89b2be75f7d961b24681b4e6c5aeb8beedef51e2537759f93a68baff1787e60
 SHA512:
-  metadata.gz: 84c6880fcb0c2aa00ee7484053c40afc61e2f9e66af38bb677408f762002c8a990a2f68bd3f17443916e02ed1a08b1db605bc28a7e913b2841bbb1318a3dcca0
-  data.tar.gz: 377decd3c088a4ddc6034de54aed3885e99b10e54a5336885a4b8ed1c611e52947af99728b48ffa6bb0b5ec29babf971dea580bcfca053deb4f5fb3f60fd1877
+  metadata.gz: 54418f3b20260bea82b912383038fce3a019a6daf85e56714a1eb2331c7aa130c44706d64e8d1c86502d9ed7c6f7ece730b8a3d467fbe77ee3e699f8e2eb1586
+  data.tar.gz: baf068daf69952fd2235b14abddd93420b73984912eef5da6ffc33699db124058b2e6a093d9984d2fe31abbe620e6d51d5bdbecc5cf23297f6c31b4d4450ed71

data/lib/brick/extensions.rb

@@ -58,6 +58,16 @@ module ActiveRecord
       def is_view?
         false
       end
+
+      def real_model(params)
+        if params && (sub_model = params.fetch(type_col = inheritance_column, nil))
+          sub_model = sub_model.first if sub_model.is_a?(Array) # Support the params style that gets returned from #brick_select
+          # Make sure the chosen model is really the same or a subclass of this model
+          (possible_model = sub_model.constantize) <= self ? possible_model : self
+        else
+          self
+        end
+      end
     end
 
     def self._brick_primary_key(relation = nil)
@@ -1651,16 +1661,18 @@ class Object
               return
             end
 
+            real_model = model.real_model(params)
+
             if request.format == :csv # Asking for a template?
               require 'csv'
               exported_csv = CSV.generate(force_quotes: false) do |csv_out|
-                model.df_export(model.brick_import_template).each { |row| csv_out << row }
+                real_model.df_export(real_model.brick_import_template).each { |row| csv_out << row }
               end
               render inline: exported_csv, content_type: request.format
               return
             # elsif request.format == :js || current_api_root # Asking for JSON?
             #   # %%% Add:  where, order, page, page_size, offset, limit
-            #   data = (model.is_view? || !Object.const_defined?('DutyFree')) ? model.limit(1000) : model.df_export(model.brick_import_template)
+            #   data = (real_model.is_view? || !Object.const_defined?('DutyFree')) ? real_model.limit(1000) : real_model.df_export(real_model.brick_import_template)
             #   render inline: { data: data }.to_json, content_type: request.format == '*/*' ? 'application/json' : request.format
             #   return
             end
@@ -1670,9 +1682,9 @@ class Object
             # %%% Allow params to define which columns to use for order_by
             # Overriding the default by providing a querystring param?
             ordering = params['_brick_order']&.split(',')&.map(&:to_sym) || Object.send(:default_ordering, table_name, pk)
-            order_by, _ = model._brick_calculate_ordering(ordering, true) # Don't do the txt part
+            order_by, _ = real_model._brick_calculate_ordering(ordering, true) # Don't do the txt part
 
-            ar_relation = ActiveRecord.version < Gem::Version.new('4') ? model.preload : model.all
+            ar_relation = ActiveRecord.version < Gem::Version.new('4') ? real_model.preload : real_model.all
             params['_brick_is_api'] = true if (is_api = request.format == :js || current_api_root)
             @_brick_params = ar_relation.brick_select(params, (selects ||= []), order_by,
                                                       translations = {},
@@ -1682,7 +1694,7 @@ class Object
               # Apply column renaming
               data = ar_relation.respond_to?(:_select!) ? ar_relation.dup._select!(*selects) : ar_relation.select(selects)
               if data.present? &&
-                 (column_renaming = ::Brick.find_col_renaming(current_api_root, model&._brick_relation)&.select { |cr| cr.last })
+                 (column_renaming = ::Brick.find_col_renaming(current_api_root, real_model&._brick_relation)&.select { |cr| cr.last })
                 data.map!({}) do |row, s|
                   column_renaming.each_with_object({}) do |rename, s|
                     s[rename.last] = row[rename.first] if rename.last
@@ -1693,7 +1705,7 @@ class Object
               # # %%% This currently only gives a window to check security and raise an exception if someone isn't
               # # authenticated / authorised. Still need to figure out column filtering and transformations.
               # proc_result = if (column_filter = ::Brick.config.api_column_filter).is_a?(Proc)
-              #                 object_columns = (relation = model&._brick_relation)[:cols]
+              #                 object_columns = (relation = real_model&._brick_relation)[:cols]
               #                 begin
               #                   num_args = column_filter.arity.negative? ? 5 : column_filter.arity
               #                   # object_name, api_version, columns, data
@@ -1718,7 +1730,7 @@ class Object
 
             # %%% Add custom HM count columns
             # %%% What happens when the PK is composite?
-            counts = model._br_hm_counts.each_with_object([]) do |v, s|
+            counts = real_model._br_hm_counts.each_with_object([]) do |v, s|
               s << if is_mysql
                      "`b_r_#{v.first}`.c_t_ AS \"b_r_#{v.first}_ct\""
                    elsif is_postgres
@@ -1738,8 +1750,8 @@ class Object
                                s << excl_parts.last
                              end
                            end
-            @_brick_bt_descrip = model._br_bt_descrip
-            @_brick_hm_counts = model._br_hm_counts
+            @_brick_bt_descrip = real_model._br_bt_descrip
+            @_brick_hm_counts = real_model._br_hm_counts
             @_brick_join_array = join_array
             @_brick_erd = params['_brick_erd']&.to_i
           end

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

@@ -510,6 +510,16 @@ window.addEventListener(\"popstate\", linkSchemas);
         # Dynamically create generic templates
         # ====================================
         if ::Brick.enable_views?
+          # Add the params to the lookup_context so that we have context about STI classes when setting @_brick_model
+          ActionView::ViewPaths.class_exec do
+            alias :_brick_lookup_context :lookup_context
+            def lookup_context(*args)
+              ret = _brick_lookup_context(*args)
+              @_lookup_context.instance_variable_set(:@_brick_req_params, params)
+              ret
+            end
+          end
+
           ActionView::LookupContext.class_exec do
             # Used by Rails 5.0 and above
             alias :_brick_template_exists? :template_exists?
@@ -520,10 +530,10 @@ window.addEventListener(\"popstate\", linkSchemas);
               _brick_template_exists?(*args, **options) ||
               # Do not auto-create a template when it's searching for an application.html.erb, which comes in like:  ["edit", ["games", "application"]]
               ((args[1].length == 1 || args[1][-1] != 'application') &&
-               set_brick_model(args))
+               set_brick_model(args, @_brick_req_params))
             end
 
-            def set_brick_model(find_args)
+            def set_brick_model(find_args, params)
               # Return an appropriate model for a given view template request.
               # find_args will generally be something like:  ["index", ["categories"]]
               # and must cycle through all of find_args[1] because in some cases such as with Devise we get something like:
@@ -537,7 +547,7 @@ window.addEventListener(\"popstate\", linkSchemas);
                          # Only CUD stuff has create / update / destroy
                          (!model.is_view? && ['new', 'create', 'edit', 'update', 'destroy'].include?(find_args.first))
                        )
-                      @_brick_model = model
+                      @_brick_model = model.real_model(params)
                     end
                   rescue
                   end
@@ -579,7 +589,7 @@ window.addEventListener(\"popstate\", linkSchemas);
                   find_template_err = e # Can come up with stuff like Devise which has its own view templates
                 end
                 # Used to also have:  ActionView.version < ::Gem::Version.new('5.0') &&
-                model_name = set_brick_model(args)&.name
+                model_name = set_brick_model(args, @_brick_req_params)&.name
               end
 
               if @_brick_model
@@ -848,6 +858,10 @@ input+svg.revert {
   color: #FFF;
 }
 </style>
+<script>
+  if (window.history.state && window.history.state.turbo)
+    window.addEventListener(\"popstate\", function () { location.reload(true); });
+</script>
 
 <% is_includes_dates = nil
    is_includes_json = nil
@@ -1158,7 +1172,7 @@ erDiagram
    @_brick_bt_descrip&.each do |bt|
      bt_class = bt[1].first.first
      callbacks[bt_name = bt_class.name.split('::').last] = bt_class
-     is_has_one = #{@_brick_model.name}.reflect_on_association(bt.first).inverse_of&.macro == :has_one ||
+     is_has_one = #{@_brick_model.name}.reflect_on_association(bt.first)&.inverse_of&.macro == :has_one ||
                   ::Brick.config.has_ones&.fetch('#{@_brick_model.name}', nil)&.key?(bt.first.to_s)
     %>  <%= \"#\{model_short_name} #\{is_has_one ? '||' : '}o'}--|| #\{bt_name} : \\\"#\{
         bt_underscored = bt[1].first.first.name.underscore.singularize
@@ -1316,13 +1330,9 @@ erDiagram
 +"<html>
 <head>
 #{css}
-<title><% model = #{model_name}
-          if sub_model = @_brick_params&.fetch(type_col = model.inheritance_column, nil)&.first
-            model = Object.const_get(sub_model.to_sym)
-          end
-       %><%= model.name %><%
-  if (description = (relation = Brick.relations[model.table_name])&.fetch(:description, nil)).present?
-    %> - <%= description
+<title><%= (model = #{model_name}).name %><%
+     if (description = (relation = Brick.relations[model.table_name])&.fetch(:description, nil)).present?
+       %> - <%= description
 %><% end
 %></title>
 </head>
@@ -1359,7 +1369,27 @@ erDiagram
         ) %></td>
   <%   end
      end %>
-</tr><%= if (page_num = @#{table_name}._brick_page_num)
+</tr>
+
+<%= if model < (base_model = model.base_class)
+      this_model = model
+      parent_links = []
+      until this_model == base_model do
+        this_model = this_model.superclass
+        path = send(\"#\{this_model._brick_index}_path\")
+        path << \"?#\{base_model.inheritance_column}=#\{this_model.name}\" unless this_model == base_model
+        parent_links << link_to(this_model.name, path)
+      end
+      \"<tr><td colspan=\\\"#\{td_count}\\\">Parent: #\{parent_links.join(' ')}</tr>\".html_safe
+    end
+%><%= if (children = model.descendants).present?
+  child_links = children.map do |child|
+    path = send(\"#\{child._brick_index}_path\") + \"?#\{base_model.inheritance_column}=#\{child.name}\"
+    link_to(child.name, path)
+  end
+  \"<tr><td colspan=\\\"#\{td_count}\\\">Children: #\{child_links.join(' ')}</tr>\".html_safe
+end
+%><%= if (page_num = @#{table_name}._brick_page_num)
            \"<tr><td colspan=\\\"#\{td_count}\\\">Page #\{page_num}</td></tr>\".html_safe
          end %></table>#{template_link}<%
    if description.present? %><%=

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

@@ -86,19 +86,13 @@ module Brick::Rails::FormTags
                         elsif descrips.length == 1
                           [obj.class.reflect_on_association(bt.first)&.foreign_key]
                         else
-                          # Was:  descrips.last  -- but the ID stuff is not coming through anymore
-                          [bt.first]
+                          descrips.last
                         end
-            txt_parts = descrips.map do |id|
-              obj2 = obj
-              id[0..-2].each { |ref| obj2 = obj2&.send(ref) }
+            bt_txt = bt_class.brick_descrip(
               # 0..62 because Postgres column names are limited to 63 characters
-              obj2&.send(id.last[0..62])
-            end
-            unless txt_parts.compact.empty?
-              bt_txt = bt_class.brick_descrip(obj, txt_parts, bt_id_col)
-              bt_txt = ::Brick::Rails.display_binary(bt_txt).html_safe if bt_txt&.encoding&.name == 'ASCII-8BIT'
-            end
+              obj, descrips[0..-2].map { |id| obj.send(id.last[0..62]) }, bt_id_col
+            )
+            bt_txt = ::Brick::Rails.display_binary(bt_txt).html_safe if bt_txt&.encoding&.name == 'ASCII-8BIT'
             bt_txt ||= "<span class=\"orphan\">&lt;&lt; Orphaned ID: #{val} >></span>" if val
             bt_id = bt_id_col&.map { |id_col| obj.respond_to?(id_sym = id_col.to_sym) ? obj.send(id_sym) : id_col }
             out << (bt_id&.first ? link_to(bt_txt, send("#{bt_class.base_class._brick_index(:singular)}_path".to_sym, bt_id)) : bt_txt || '')
@@ -110,16 +104,16 @@ module Brick::Rails::FormTags
             hm_klass = (col = cols[col_name])[1]
             if col[2] == 'HO'
               descrips = bt_descrip[col_name.to_sym][hm_klass]
-              if (ho_id = (ho_id_col = descrips.last).map { |id_col| obj.respond_to?(id_sym = id_col.to_sym) && obj.send(id_sym) })&.first
+              if (ho_id = (ho_id_col = descrips.last).map { |id_col| obj.send(id_col.to_sym) })&.first
                 ho_txt = hm_klass.brick_descrip(obj, descrips[0..-2].map { |id| obj.send(id.last[0..62]) }, ho_id_col)
                 out << link_to(ho_txt, send("#{hm_klass.base_class._brick_index(:singular)}_path".to_sym, ho_id))
               end
             else
               if (ct = obj.send(hms_col[1].to_sym)&.to_i)&.positive?
+                predicates = hms_col[2].each_with_object({}) { |v, s| s[v.first] = v.last.is_a?(String) ? v.last : obj.send(v.last) }
+                predicates.each { |k, v| predicates[k] = obj.class.name if v == '[sti_type]' }
                 out << "#{link_to("#{ct || 'View'} #{hms_col.first}",
-                                  send("#{hm_klass._brick_index}_path".to_sym,
-                                       hms_col[2].each_with_object({}) { |v, s| s[v.first] = v.last.is_a?(String) ? v.last : obj.send(v.last) })
-                                 )}\n"
+                                  send("#{hm_klass._brick_index}_path".to_sym, predicates))}\n"
               end
             end
           end

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -1618,8 +1618,8 @@ module ActiveRecord
           end
         end
 
-        if JoinDependency.private_instance_methods.include?(:table_aliases_for)
-          # No matter if it's older or newer Rails, now extend so that we can associate AR links to table_alias names
+        # No matter if it's older or newer Rails, now extend so that we can associate AR links to table_alias names
+        if ActiveRecord.version < ::Gem::Version.new('6.1')
           alias _brick_table_aliases_for table_aliases_for
           def table_aliases_for(parent, node)
             result = _brick_table_aliases_for(parent, node)
@@ -1630,7 +1630,7 @@ module ActiveRecord
             end
             result
           end
-        else # Same idea but for Rails 7
+        else # Same idea but for Rails >= 6.1
           alias _brick_make_constraints make_constraints
           def make_constraints(parent, child, join_type)
             result = _brick_make_constraints(parent, child, join_type)
@@ -1657,7 +1657,7 @@ if Gem::Specification.all_names.any? { |g| g.start_with?('ransack-') }
   module Polyamorous::JoinDependencyExtensions
     def build(associations, base_klass, root = nil, path = '')
       root ||= associations
-      puts associations.map(&:first)
+      # puts associations.map(&:first)
 
       associations.map do |name, right|
         link_path = path.blank? ? name.to_s : path + ".#{name}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.121
+  version: 1.0.122
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-19 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord