brick 1.0.201 → 1.0.203

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52b363a56451567ff44ebee4510f850eb6f1df3d09bf05392c75a3c0444daa73
-  data.tar.gz: bd39b40ba7fbeae5f9225ba8a9591f53082f60ee6f89f68b9bc83199656c75fd
+  metadata.gz: 7653a7b2f496e0ade8937b6352b66d06a63dc47487a2472ebf5e5f5b94faf711
+  data.tar.gz: b4723c7d202d7cdaf125bd0ca6bc52852b89c813444bf8e4662724a591d7a7bc
 SHA512:
-  metadata.gz: e095c942770c458142026d918aa7084853d23963c0802dbda7a7773b504cc2a6a751369cbf58214453aa83e004230b8bab9ff7c2d1040bffc9f28a5b371c894e
-  data.tar.gz: 4d15b729fea0b416cf75fc18a6ce11c28eea989438d831de94710d8878ee9cb2174df7a5075028922691acceea9af2322591f4219b8dbca16b7a25716c55ee09
+  metadata.gz: c29614452bbbd5b1c52e6fcee20fd2308479e508a03d15d98ddd3ca73c3ad746dff9e9bfffb8979768f456d68ce5bbfaa286d96c2ef62c65e306bd3d0fa15495
+  data.tar.gz: f8a2ac34c8a34a3a7308a49b6e17a57bf71c13718a58838f61e8e5d45699f3d9dee766a3786d4fd11be52601f02e9168803f49a8b4ce35ef7d404bef95523584

data/lib/brick/extensions.rb

@@ -1508,7 +1508,7 @@ module Brick
         ::Brick::ADD_AVO_FIELDS.call(self, model)
       end
     end
-    ::Avo::BaseResource.const_set(requested.to_sym, built_resource)
+    ::Avo::Resources.const_set(requested.to_sym, built_resource)
     built_resource
   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, {})
 
@@ -340,8 +332,8 @@ function linkSchemas() {
                   end
                 end
               end
-            else # Avo 2.x
-              (self::App.respond_to?(:eager_load) ? App : DynamicRouter).class_exec do
+            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)
@@ -368,7 +360,10 @@ function linkSchemas() {
                   if is_2x # Avo 2.x?
                     "::#{class_name}Resource".constantize
                   else # Avo 3.x
-                    ::Brick.avo_3x_resource(Object.const_get(class_name), class_name) unless ::Avo::BaseResource.constants.include?(class_name.to_sym)
+                    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
                   end
                 end
               end
@@ -426,12 +421,14 @@ window.addEventListener(\"popstate\", linkSchemas);
             end
 
             class Fields::IndexComponent
-              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?
+              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
 
@@ -630,7 +627,7 @@ window.addEventListener(\"popstate\", linkSchemas);
               alias :_brick_lookup_context :lookup_context
               def lookup_context(*args)
                 ret = _brick_lookup_context(*args)
-                @_lookup_context.instance_variable_set(:@_brick_req_params, params) if request
+                @_lookup_context.instance_variable_set(:@_brick_req_params, params) if self.class < AbstractController::Base && params
                 ret
               end
             end
@@ -1656,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/version_number.rb

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