brick 1.0.136 → 1.0.138

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f34d7342f9445995a1cb28a3b42eeecaf4f90483eb2fc5e848517536c3631287
-  data.tar.gz: 68d308c36abffbc024c5439c06863777d4512a85137ef34566a7bfe0d9e590a1
+  metadata.gz: 2f044e21a6e4c2120a453b6cb3dc404d4d3e3e15034c638d316cbc418bcb996b
+  data.tar.gz: f3360e5e7778bacde155e58bf0683d6b75c74d7dd63d336131e82b0a1865199a
 SHA512:
-  metadata.gz: f45d7f79a0d484f6c3b1276545f7fbabd854b16b8fae54bd428f7fd8893e572675ddb7c8b5e3a08d8df30437be7ee5ac3e34af71f652ed341d2b08ebe630add7
-  data.tar.gz: 213f3f2c4b3984adf58c66cef21282c3cc43bd4283c5afba356102603b68be37235f52f41108b6820f41aee63e04eaf42348c8eef0f7ba4e17d3405666f22ebb
+  metadata.gz: 413c6fe2526752eab0e24998b852e9ae68ef7f56a6488bc14b777e13a4ad281f6c352af465be9e49f05e20fa597e7750d3c706df762f74eb70a18fda5112a319
+  data.tar.gz: cb5040c5333dfa0c0fcbd9d1c04c229e538db1b33fc1526ace987d6da8bd1634e50269e5e05249da6205980ac79c3bad792dd5cc2242115349846365a881bf81

data/lib/brick/extensions.rb

@@ -989,7 +989,7 @@ end
 if Object.const_defined?('ActionView')
   require 'brick/frameworks/rails/form_tags'
   require 'brick/frameworks/rails/form_builder'
-  module ActionView::Helpers
+  module ::ActionView::Helpers
     module FormTagHelper
       include ::Brick::Rails::FormTags
     end
@@ -999,8 +999,8 @@ if Object.const_defined?('ActionView')
   end
 
   # FormBuilder#field_id isn't available in Rails < 7.0.  This is a rudimentary version with no `index`.
-  unless ActionView::Helpers::FormBuilder.methods.include?(:field_id)
-    ActionView::Helpers::FormBuilder.class_exec do
+  unless ::ActionView::Helpers::FormBuilder.methods.include?(:field_id)
+    ::ActionView::Helpers::FormBuilder.class_exec do
       def field_id(method)
         [object_name, method.to_s].join('_')
       end
@@ -1136,6 +1136,12 @@ Module.class_exec do
                     plural_class_name == 'BrickGem'
                   ) ||
                   model = self.const_get(full_class_name)
+                 # In the very rare case that we've picked up a MODULE which has the same name as what would be the
+                 # resource's MODEL name, just build out an appropriate auto-model on-the-fly. (RailsDevs code has this in PayCustomer.)
+                 # %%% We don't yet display the code for this new model
+                 if model && !model.is_a?(Class)
+                   model, _code = Object.send(:build_model, relations, model.module_parent, model.module_parent.name, singular_class_name)
+                 end
                  # if it's a controller and no match or a model doesn't really use the same table name, eager load all models and try to find a model class of the right name.
                  Object.send(:build_controller, self, class_name, plural_class_name, model, relations)
                end
@@ -1149,7 +1155,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 !is_tnp_module && self.const_defined?(schema_name)
 
                # Build out a module for the schema if it's namespaced
@@ -1942,8 +1948,9 @@ class Object
               end
               render json: { result: ::Brick.unexclude_column(table_name, col) }
             else
-              instance_variable_set("@#{singular_table_name}".to_sym,
-                                    model.send(:create, send(params_name_sym)))
+              @_lookup_context.instance_variable_set("@#{singular_table_name}".to_sym,
+                                                     model.send(:create, send(params_name_sym)))
+              @_lookup_context.instance_variable_set(:@_brick_model, model)
               index
               render :index
             end

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

@@ -1430,6 +1430,12 @@ end
                          end
                        end
 
+    # %%% Why in the Canvas LMS app does ActionView::Helpers get cleared / reloaded, or otherwise lose access to #brick_grid ???
+    # Possible fix if somewhere we can implement the #include with:
+    # (ActiveSupport.const_defined?('Reloader') ? ActiveSupport : ActionDispatch)::Reloader.to_prepare do ... end
+    # or
+    # Rails.application.reloader.to_prepare do ... end
+    self.class.class_exec { include ::Brick::Rails::FormTags } unless respond_to?(:brick_grid)
     # Write out the mega-grid
     brick_grid(@#{table_name}, @_brick_bt_descrip, @_brick_sequence, @_brick_incl, @_brick_excl,
                cols, poly_cols, bts, #{hms_keys.inspect}, {#{hms_columns.join(', ')}}) %>
@@ -1470,7 +1476,7 @@ end
             kls = Object.const_get(::Brick.relations.fetch(r[0], nil)&.fetch(:class_name, nil))
           rescue
           end
-          kls ? link_to(r[0], send(\"#\{kls._brick_index}_path\".to_sym)) : r[0] %></td>
+          kls.is_a?(Class) ? link_to(r[0], send(\"#\{kls._brick_index}_path\".to_sym)) : r[0] %></td>
   <td<%= if r[1]
            ' class=\"orphan\"' unless ::Brick.relations.key?(r[1])
          else

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

@@ -88,7 +88,7 @@ module Brick::Rails::FormBuilder
         end
       when :primary_key
         is_revert = false
-      when :json
+      when :json, :jsonb
         template.instance_variable_set(:@_json_fields_present, true)
         if val.is_a?(String)
           val_str = val

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

@@ -36,9 +36,9 @@ module Brick::Rails::FormTags
     end
     sequence.reject! { |nm| exclusions.include?(nm) } if exclusions
     out << sequence.each_with_object(+'') do |col_name, s|
+             s << '<th '
              if (col = cols[col_name]).is_a?(ActiveRecord::ConnectionAdapters::Column)
-               s << '<th '
-               s << "title=\"#{col.comment}\"" if col.respond_to?(:comment) && !col.comment.blank?
+               s << "title=\"#{col.comment}\" " if col.respond_to?(:comment) && !col.comment.blank?
                s << if (bt = bts[col_name])
                       # Allow sorting for any BT except polymorphics
                       "x-order=\"#{bt.first.to_s + '"' unless bt[2]}>BT " +
@@ -49,18 +49,18 @@ module Brick::Rails::FormTags
              elsif col # HM column
                options = {}
                options[col[1].inheritance_column] = col[1].name unless col[1] == col[1].base_class
-               s << "<th x-order=\"#{col_name + '"' if true}>#{col[2]} "
+               s << "x-order=\"#{col_name + '"' if true}>#{col[2]} "
                s << (col.first ? "#{col[3]}" : "#{link_to(col[3], send("#{col[1]._brick_index}_path", options))}")
              elsif cust_cols.key?(col_name) # Custom column
-               s << "<th x-order=\"#{col_name}\">#{col_name}"
+               s << "x-order=\"#{col_name}\">#{col_name}"
              elsif col_name.is_a?(Symbol) && (hot = bts[col_name]) # has_one :through
-               s << "<th x-order=\"#{hot.first.to_s}\">HOT " +
+               s << "x-order=\"#{hot.first.to_s}\">HOT " +
                     hot[1].map { |hot_pair| hot_pair.first.bt_link(col_name) }.join(' ')
              elsif (bt = composite_bt_names[col_name])
-               s << "<th x-order=\"#{bt.first.to_s + '"' unless bt[2]}>BT comp " +
+               s << "x-order=\"#{bt.first.to_s + '"' unless bt[2]}>BT comp " +
                     bt[1].map { |bt_pair| bt_pair.first.bt_link(bt.first) }.join(' ')
              else # Bad column name!
-               s << "<th title=\"<< Unknown column >>\">#{col_name}"
+               s << "title=\"<< Unknown column >>\">#{col_name}"
              end
              s << '</th>'
            end
@@ -93,18 +93,20 @@ module Brick::Rails::FormTags
             end
           else # BT or HOT
             bt_class = bt[1].first.first
-            descrips = bt_descrip[bt.first][bt_class]
-            bt_id_col = if descrips.nil?
-                          puts "Caught it in the act for obj / #{col_name}!"
-                        elsif descrips.length == 1
-                          [obj.class.reflect_on_association(bt.first)&.foreign_key]
-                        else
-                          descrips.last
-                        end
-            bt_txt = bt_class.brick_descrip(
-              # 0..62 because Postgres column names are limited to 63 characters
-              obj, descrips[0..-2].map { |id| obj.send(id.last[0..62]) }, bt_id_col
-            )
+            if bt_descrip
+              descrips = bt_descrip[bt.first][bt_class]
+              bt_id_col = if descrips.nil?
+                            puts "Caught it in the act for obj / #{col_name}!"
+                          elsif descrips.length == 1
+                            [obj.class.reflect_on_association(bt.first)&.foreign_key]
+                          else
+                            descrips.last
+                          end
+            end
+            br_descrip_args = [obj]
+            # 0..62 because Postgres column names are limited to 63 characters
+            br_descrip_args += [descrips[0..-2].map { |id| obj.send(id.last[0..62]) }, bt_id_col] if descrips
+            bt_txt = bt_class.brick_descrip(*br_descrip_args)
             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 }
@@ -128,13 +130,11 @@ module Brick::Rails::FormTags
                          end
                 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, predicates))}\n"
-              end
+            elsif obj.respond_to?(ct_col = hms_col[1].to_sym) && (ct = obj.send(ct_col)&.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, predicates))}\n"
             end
           end
         elsif (col = cols[col_name]).is_a?(ActiveRecord::ConnectionAdapters::Column)

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -163,6 +163,8 @@ module Brick
 
     # All tables and views (what Postgres calls "relations" including column and foreign key info)
     def relations
+      return {} if ::ActiveRecord::Base.connection_handler.connection_pool_list.blank?
+
       # Key our list of relations for this connection off of the connection pool's object_id
       (@relations ||= {})[ActiveRecord::Base.connection_pool.object_id] ||= Hash.new { |h, k| h[k] = Hash.new { |h, k| h[k] = {} } }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.136
+  version: 1.0.138
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-28 00:00:00.000000000 Z
+date: 2023-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord