brick 1.0.200 → 1.0.202

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 261f446a557861aebb3e8f2ce1451895f7034c903dd0713bc5bef7f7506765a2
-  data.tar.gz: e123ca1f0a0ee229d3e2e7baabea6bd76ed76848aa226753a97e4fb69b32ca74
+  metadata.gz: 80bf405e5c622d90a9e52cb94a9310740397a80c39add78a925a32f72c6ba75c
+  data.tar.gz: a434b961891001ba5c41767321392b390b0ab2c28bf1a5a323aae373686fe96f
 SHA512:
-  metadata.gz: df36018bfc5eaafd092546c165a7f829c4e7e00b1f52729e65812e8a6721a8d5e81a1b3d421c6ab23010d4c86be8af628874c80725e293d7e0646554decdbea7
-  data.tar.gz: 9e3b7c34512805c3afc7c71fb8a71d5a02da2514a4f24b70c45f618fa567a7840b8afbe358af706bffcd1e277da2dda24df884c5dc4ada20a0f2007da04eff8a
+  metadata.gz: 2354f0b013d84f3cd0cd5a41656eefa39acaff5f7c0cc64d0be4382ef7f97ca60187895a2bcdb48d425145c5712511c5c4bde321b1f643a64c47f865597c565d
+  data.tar.gz: 9badc9353850afc991f7a17e964a262827ec23c7d6df62d4e4591d905460e21001f0c7e898f5b09ba1e41afbe077d39c24de03d82ffb8f6d7b43d66572f05f1f

data/lib/brick/extensions.rb

@@ -334,10 +334,10 @@ module ActiveRecord
     end
 
     # Providing a relation object allows auto-modules built from table name prefixes to work
-    def self._brick_index(mode = nil, separator = nil, relation = nil)
+    def self._brick_index(mode = nil, separator = nil, relation = nil, not_path = nil)
       return if abstract_class?
 
-      ::Brick._brick_index(table_name, mode, separator, relation)
+      ::Brick._brick_index(table_name, mode, separator, relation, not_path)
     end
 
     def self.brick_import_template
@@ -1345,7 +1345,7 @@ end
          ((filename = ActiveSupport::Dependencies.search_for_file(desired_classname.underscore) ||
                       (self != Object && ActiveSupport::Dependencies.search_for_file((desired_classname = requested).underscore))
           ) && (require_dependency(filename) || true) &&
-          ((possible = self.const_get(args.first)) && possible.name == desired_classname)
+          (!anonymous? && (possible = self.const_get(args.first)) && possible.name == desired_classname)
          ) ||
 
          # If any class has turned up so far (and we're not in the middle of eager loading)
@@ -1366,13 +1366,14 @@ end
       end
     end
     class_name = ::Brick.namify(requested)
+    is_avo_present = Object.const_defined?('Avo') && ::Avo.respond_to?(:railtie_namespace)
     #        CONTROLLER
     result = if ::Brick.enable_controllers? &&
                 is_controller && (plural_class_name = class_name[0..-11]).length.positive?
                # Otherwise now it's up to us to fill in the gaps
                controller_class_name = +''
                full_class_name = +''
-               unless self == Object
+               unless self == Object || (is_avo_present && self.name == 'Avo')
                  controller_class_name << ((split_self_name&.first && split_self_name.join('::')) || self.name)
                  full_class_name << "::#{controller_class_name}"
                  controller_class_name << '::'
@@ -1432,58 +1433,43 @@ end
                base_module.const_set(class_name.to_sym, (built_module = Module.new))
                [built_module, "module #{possible_module}; end\n"]
 
-             # AVO Resource
-             elsif base_module == Object && Object.const_defined?('Avo') && ::Avo.respond_to?(:railtie_namespace) && requested.end_with?('Resource') &&
+             # AVO 2.x Resource
+             elsif base_module == Object && is_avo_present && requested.end_with?('Resource') &&
                    # Expect that anything called MotorResource or SpinaResource could be from those administrative gems
-                   requested.length > 8 && ['MotorResource', 'SpinaResource'].exclude?(requested)
-               if (model = Object.const_get(requested[0..-9])) && model < ActiveRecord::Base
-                 require 'generators/avo/resource_generator'
-                 field_generator = Generators::Avo::ResourceGenerator.new([''])
-                 field_generator.instance_variable_set(:@model, model)
-                 fields = field_generator.send(:generate_fields)&.split("\n")
-                                         &.each_with_object([]) do |f, s|
-                                           if (f = f.strip).start_with?('field ')
-                                             f = f[6..-1].split(',')
-                                             s << [f.first[1..-1].to_sym, [f[1][1..-1].split(': :').map(&:to_sym)].to_h]
-                                           end
-                                         end || []
-                 built_resource = Class.new(Avo::BaseResource) do |new_resource_class|
-                   self.model_class = model
-                   self.title = :brick_descrip
-                   self.includes = []
-                   if (!model.is_view? && mod_pk = model.primary_key)
-                     field((mod_pk.is_a?(Array) ? mod_pk.first : mod_pk).to_sym, { as: :id })
-                   end
-                   # Create a call such as:  field :name, as: :text
-                   fields.each do |f|
-                     # Add proper types if this is a polymorphic belongs_to
-                     if f.last == { as: :belongs_to } &&
-                        (fk = ::Brick.relations[model.table_name][:fks].find { |k, v| v[:assoc_name] == f.first.to_s }) &&
-                        fk.last.fetch(:polymorphic, nil)
-                       poly_types = fk.last.fetch(:inverse_table, nil)&.each_with_object([]) do |poly_table, s|
-                         s << Object.const_get(::Brick.relations[poly_table][:class_name])
-                       end
-                       if poly_types.present?
-                         f.last[:polymorphic_as] = f.first
-                         f.last[:types] = poly_types
-                       end
-                     end
-                     self.send(:field, *f)
-                   end
-                 end
-                 Object.const_set(requested.to_sym, built_resource)
-                 [built_resource, nil]
+                   requested.length > 8 && ['MotorResource', 'SpinaResource'].exclude?(requested) &&
+                   (model = Object.const_get(requested[0..-9])) && model < ActiveRecord::Base
+               built_resource = Class.new(Avo::BaseResource) do
+                 self.model_class = model
+                 self.title = :brick_descrip
+                 self.includes = []
+                 ::Brick::ADD_AVO_FIELDS.call(self, model)
                end
+               base_module.const_set(requested.to_sym, built_resource)
+               [built_resource, nil]
+
+             # AVO 3.x Resource
+             elsif is_avo_present && self.name == 'Avo::Resources' &&
+                   (model = begin
+                              (model = Object.const_get(requested)) && model < ActiveRecord::Base
+                              model
+                            rescue
+                            end)
+               [::Brick.avo_3x_resource(model, requested), nil]
 
              # MODEL
              elsif ::Brick.enable_models?
+               # Avo sometimes tries to find a model class inside of the Avo namespace
+               if is_avo_present && self.name == 'Avo'
+                 name = (base_module = Object).name
+               end
+               name ||= base_module.name
                # Custom inheritable Brick base model?
                class_name = (inheritable_name = class_name)[5..-1] if class_name.start_with?('Brick')
                Object.send(:build_model, relations, base_module, name, class_name, inheritable_name)
              end
     if result
       built_class, code = result
-      puts "\n#{code}\n"
+      puts "\n#{code}\n" if code
       built_class
     elsif !schema_name && ::Brick.config.sti_namespace_prefixes&.key?("::#{class_name}")
 #         module_prefixes = type_name.split('::')
@@ -1512,6 +1498,54 @@ end
   end
 end
 
+module Brick
+  def self.avo_3x_resource(model, requested)
+    built_resource = Class.new(Avo::BaseResource) do
+      self.model_class = model
+      self.title = :brick_descrip
+      self.includes = []
+      define_method :fields do # Have to be inside of a fields method
+        ::Brick::ADD_AVO_FIELDS.call(self, model)
+      end
+    end
+    ::Avo::Resources.const_set(requested.to_sym, built_resource)
+    built_resource
+  end
+end
+
+::Brick::ADD_AVO_FIELDS = lambda do |obj, model|
+  require 'generators/avo/resource_generator'
+  field_generator = Generators::Avo::ResourceGenerator.new([''])
+  field_generator.instance_variable_set(:@model, model)
+  flds = field_generator.send(:generate_fields)&.split("\n")
+                        &.each_with_object([]) do |f, s|
+                          if (f = f.strip).start_with?('field ')
+                            f = f[6..-1].split(',')
+                            s << [f.first[1..-1].to_sym, [f[1][1..-1].split(': :').map(&:to_sym)].to_h]
+                          end
+                        end || []
+  if (!model.is_view? && mod_pk = model.primary_key)
+    obj.field((mod_pk.is_a?(Array) ? mod_pk.first : mod_pk).to_sym, **{ as: :id })
+  end
+  # Create a call such as:  field :name, as: :text
+  flds.each do |f|
+    # Add proper types if this is a polymorphic belongs_to
+    if f.last == { as: :belongs_to } &&
+       (fk = ::Brick.relations[model.table_name][:fks].find { |k, v| v[:assoc_name] == f.first.to_s }) &&
+       fk.last.fetch(:polymorphic, nil)
+      poly_types = fk.last.fetch(:inverse_table, nil)&.each_with_object([]) do |poly_table, s|
+        s << Object.const_get(::Brick.relations[poly_table][:class_name])
+      end
+      if poly_types.present?
+        f.last[:polymorphic_as] = f.first
+        f.last[:types] = poly_types
+      end
+    end
+    kwargs = f.last.is_a?(Hash) ? f.pop : {}
+    obj.send(:field, *f, **kwargs)
+  end
+end
+
 class Object
   class << self
 
@@ -2602,8 +2636,9 @@ class Object
                                     assoc_parts[0].downcase! if assoc_parts[0] =~ /^[A-Z0-9_]+$/
                                     assoc_name = assoc_parts.join('.')
                                   else
-                                    class_name_parts = ::Brick.namify(hm_assoc[:inverse_table], :underscore).split('.')
-                                    needs_class = assoc_name.singularize.camelize != class_name_parts.last.singularize.camelize
+                                    last_class_name_part = ::Brick.relations[hm_assoc[:inverse_table]].fetch(:class_name, nil)&.split('::')&.last ||
+                                                           ::Brick.namify(hm_assoc[:inverse_table], :underscore).split('.').last.singularize.camelize
+                                    needs_class = assoc_name.singularize.camelize != last_class_name_part
                                   end
                                   [assoc_name, needs_class]
                                 end
@@ -2672,6 +2707,9 @@ else
       rescue ActiveRecord::NoDatabaseError
         # ::Brick.is_db_present = false
       end
+      if Object.const_defined?('Avo') && ::Avo.respond_to?(:railtie_namespace)
+        Module.class_exec &::Brick::ADD_CONST_MISSING
+      end
       conn
     end
   end

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

@@ -225,14 +225,6 @@ function linkSchemas() {
         # Specific database tables and views to omit when auto-creating models
         ::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, 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.config.table_name_prefixes ||= app.config.brick.fetch(:table_name_prefixes, {})
 
@@ -296,13 +288,13 @@ function linkSchemas() {
             end
 
             module UrlHelpers
-              alias _brick_resource_path resource_path
+              alias _brick_resources_path resources_path
               # Accommodate STI resources
-              def resource_path(model:, resource:, **args)
-                resource ||= if (klass = model&.class)
+              def resources_path(resource:, **kwargs)
+                resource ||= if (klass = resource.model_class)
                                Avo::App.resources.find { |r| r.model_class > klass }
                              end
-                _brick_resource_path(model: model, resource: resource, **args)
+                _brick_resources_path(resource: resource, **kwargs)
               end
             end
 
@@ -329,31 +321,53 @@ function linkSchemas() {
             #   end
             # end
 
-            (self::App.respond_to?(:eager_load) ? App : DynamicRouter).class_exec do
-              class << self
-                alias _brick_eager_load eager_load
-                def eager_load(entity)
-                  _brick_eager_load(entity)
-                  if entity == :resources
-                    possible_schema, _x1, _x2 = ::Brick.get_possible_schemas
-                    if possible_schema
-                      orig_tenant = Apartment::Tenant.current
-                      Apartment::Tenant.switch!(possible_schema)
-                    end
-                    existing = Avo::BaseResource.descendants.each_with_object({}) do |r, s|
-                                 s[r.name[0..-9]] = nil if r.name.end_with?('Resource')
-                               end
-                    ::Brick.relations.each do |k, v|
-                      unless k.is_a?(Symbol) || existing.key?(class_name = v[:class_name]) || Brick.config.exclude_tables.include?(k) ||
-                             class_name.blank? || class_name.include?('::') ||
-                             ['ActiveAdminComment', 'MotorAlert', 'MotorAlertLock', 'MotorApiConfig', 'MotorAudit', 'MotorConfig', 'MotorDashboard', 'MotorForm', 'MotorNote', 'MotorNoteTag', 'MotorNoteTagTag', 'MotorNotification', 'MotorQuery', 'MotorReminder', 'MotorResource', 'MotorTag', 'MotorTaggableTag'].include?(class_name)
-                        Object.const_get("#{class_name}Resource")
-                      end
+            if self.const_defined?('Resources') &&
+               self::Resources.const_defined?('ResourceManager') # Avo 3.x?
+              self::Resources::ResourceManager.class_exec do
+                class << self
+                  alias _brick_fetch_resources fetch_resources
+                  def fetch_resources
+                    Avo._brick_avo_resources
+                    _brick_fetch_resources
+                  end
+                end
+              end
+            elsif self::App.respond_to?(:eager_load) # Avo 2.x (compatible with 2.20.0 and up)
+              App.class_exec do
+                class << self
+                  alias _brick_eager_load eager_load
+                  def eager_load(entity)
+                    Avo._brick_avo_resources(true) if entity == :resources
+                    _brick_eager_load(entity)
+                  end
+                end
+              end
+            end
+
+            def self._brick_avo_resources(is_2x = nil)
+              possible_schema, _x1, _x2 = ::Brick.get_possible_schemas
+              if possible_schema
+                orig_tenant = Apartment::Tenant.current
+                Apartment::Tenant.switch!(possible_schema)
+              end
+              existing = Avo::BaseResource.descendants.each_with_object({}) do |r, s|
+                           s[r.name[0..-9]] = nil if r.name.end_with?('Resource')
+                         end
+              ::Brick.relations.each do |k, v|
+                unless k.is_a?(Symbol) || existing.key?(class_name = v[:class_name]) || Brick.config.exclude_tables.include?(k) ||
+                       class_name.blank? || class_name.include?('::') ||
+                       ['ActiveAdminComment', 'MotorAlert', 'MotorAlertLock', 'MotorApiConfig', 'MotorAudit', 'MotorConfig', 'MotorDashboard', 'MotorForm', 'MotorNote', 'MotorNoteTag', 'MotorNoteTagTag', 'MotorNotification', 'MotorQuery', 'MotorReminder', 'MotorResource', 'MotorTag', 'MotorTaggableTag'].include?(class_name)
+                  if is_2x # Avo 2.x?
+                    "::#{class_name}Resource".constantize
+                  else # Avo 3.x
+                    unless ::Avo::BaseResource.constants.include?(class_name.to_sym) ||
+                           ::Avo::Resources.constants.include?(class_name.to_sym)
+                      ::Brick.avo_3x_resource(Object.const_get(class_name), class_name)
                     end
-                    Apartment::Tenant.switch!(orig_tenant) if orig_tenant
                   end
                 end
               end
+              Apartment::Tenant.switch!(orig_tenant) if orig_tenant
             end
 
             # Add our schema link Javascript code when the TurboFrameWrapper is rendered so it ends up on all index / show / etc
@@ -407,20 +421,25 @@ window.addEventListener(\"popstate\", linkSchemas);
             end
 
             class Fields::IndexComponent
-              alias _brick_resource_view_path resource_view_path
-              def resource_view_path
-                return if @resource.model&.class&.is_view?
+              if respond_to?(:resource_view_path)
+                alias _brick_resource_view_path resource_view_path
+                def resource_view_path
+                  mdl_class = @resource.respond_to?(:model_class) ? @resource.model_class : @resource.model&.class
+                  return if mdl_class&.is_view?
 
-                _brick_resource_view_path
+                  _brick_resource_view_path
+                end
               end
             end
 
             module Concerns::HasFields
-              class_methods do
-                alias _brick_field field
-                def field(name, *args, **kwargs, &block)
-                  kwargs.merge!(args.pop) if args.last.is_a?(Hash)
-                  _brick_field(name, **kwargs, &block)
+              class << self
+                if respond_to?(:field)
+                  alias _brick_field field
+                  def field(name, *args, **kwargs, &block)
+                    kwargs.merge!(args.pop) if args.last.is_a?(Hash)
+                    _brick_field(name, **kwargs, &block)
+                  end
                 end
               end
             end
@@ -1634,10 +1653,8 @@ end
      # path_options = [obj.#{pk}]
      # path_options << { '_brick_schema':  } if
      options = {}
-     if ::Brick.config.path_prefix || (obj.class.table_name.singularize == obj.class.table_name)
-       path_helper = obj.new_record? ? #{model_name}._brick_index : #{model_name}._brick_index(:singular)
-       options[:url] = send(\"#\{path_helper}_path\".to_sym, obj)
-     end
+     path_helper = obj.new_record? ? #{model_name}._brick_index : #{model_name}._brick_index(:singular)
+     options[:url] = send(\"#\{path_helper}_path\".to_sym, obj) if ::Brick.config.path_prefix || (path_helper != obj.class.table_name)
 %>
   <br><br>
 

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

@@ -592,11 +592,11 @@ function onImagesLoaded(event) {
       relation = ::Brick.relations.fetch(rel_name || klass.table_name, nil)
       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, relation) : "#{app_routes.path_for(controller: klass_or_obj.base_class._brick_index(nil, '/', relation), action: :index)}#{filter}"
+        path = (proc = kwargs[:index_proc]) ? proc.call(klass_or_obj, relation) : "#{app_routes.path_for(controller: klass_or_obj.base_class._brick_index(nil, '/', relation, true), 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, relation) : "#{app_routes.path_for(controller: klass_or_obj.class.base_class._brick_index(nil, '/', relation), action: :show, id: klass_or_obj)}#{filter}"
+        path = (proc = kwargs[:show_proc]) ? proc.call(klass_or_obj, relation) : "#{app_routes.path_for(controller: klass_or_obj.class.base_class._brick_index(nil, '/', relation, true), action: :show, id: klass_or_obj)}#{filter}"
         lt_args = [text || "Show this #{klass_or_obj.class.name}", path]
       end
       kwargs.delete(:visited)

data/lib/brick/reflect_tables.rb

@@ -462,7 +462,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
         v[:resource] = proposed_name_parts.last.underscore
         if colliding_thing
           message_start = if colliding_thing.is_a?(Module) && Object.const_defined?(:Rails) &&
-                             colliding_thing.constants.find { |c| colliding_thing.const_get(c) < Rails::Application }
+                             colliding_thing.constants.find { |c| colliding_thing.const_get(c) < ::Rails::Application }
                             "The module for the Rails application itself, \"#{colliding_thing.name}\","
                           else
                             "Non-AR #{colliding_thing.class.name.downcase} \"#{colliding_thing.name}\""

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 200
+    TINY = 202
 
     # 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.200
+  version: 1.0.202
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-26 00:00:00.000000000 Z
+date: 2024-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord