brick 1.0.204 → 1.0.206

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bf1dd73cdb0040884c92622e0a7dab4c36232440b5f70e74c2f9f362843373d
-  data.tar.gz: 19fd7bbfd6088ed1606b6c2a5ad2fa67cb9dd3b6217313bdfaa368b4fc1ca5f0
+  metadata.gz: 7cd4c557cd4baa06fc68ab683444da5b018c1c0c63436d36d7648c259167c418
+  data.tar.gz: 62d2260128b72a0a6db5d0af14054ae9518e4516ccf18a04010d2e187c8768d2
 SHA512:
-  metadata.gz: eb16cd17c3ad18718164242957e71353ccb5708650136a44517a13255b65d40dc47d6b579defd92d76b9b6a77c696a386880db70f6c2d1495a0f198f64866dbc
-  data.tar.gz: 97e22cd5f88a8008313362558ccb5ab7829772568573f0622e2eba61640d5a59ae44135d4870878f90bd750d496ed8aeef0e22badffe4168b142580911650b11
+  metadata.gz: 43743d8447db6daa39e2fc506e7eef3260ba63abc3a4cb4990ace1d33e56e38d15dd7eaf9c9bbdb2873ea2b5dae6d308c12bd04ea2f073b04fefccac564ee3e3
+  data.tar.gz: 144317e91f03fdf2ca66db2c78d8f851e9ab21c4c016190ad3a48ef97a3594f2df8125a1d4f4a59214501429e1c16b6baca9878c22bb2d026eeee20a83929f53

data/lib/brick/config.rb

@@ -234,7 +234,7 @@ module Brick
 
     # Polymorphic associations
     def polymorphics
-      @mutex.synchronize { @polymorphics }
+      @mutex.synchronize { @polymorphics ||= {} }
     end
 
     def polymorphics=(polys)
@@ -344,7 +344,7 @@ module Brick
     end
 
     def table_name_prefixes
-      @mutex.synchronize { @table_name_prefixes }
+      @mutex.synchronize { @table_name_prefixes ||= {} }
     end
 
     def table_name_prefixes=(value)
@@ -384,7 +384,7 @@ module Brick
     end
 
     def metadata_columns
-      @mutex.synchronize { @metadata_columns }
+      @mutex.synchronize { @metadata_columns ||= ['created_at', 'updated_at', 'deleted_at'] }
     end
 
     def metadata_columns=(columns)

data/lib/brick/extensions.rb

@@ -536,10 +536,35 @@ module ActiveRecord
   class Relation
     attr_accessor :_brick_page_num
 
-    # Links from ActiveRecord association pathing names over to real table correlation names
-    # that get chosen when the AREL AST tree is walked.
+    # Links from ActiveRecord association pathing names over to the real table
+    # correlation names that get chosen when the AREL AST tree is walked.
     def brick_links
-      @brick_links ||= { '' => table_name }
+      # Touching AREL AST walks the JoinDependency tree, and in that process uses our
+      # "brick_links" patch to find how every AR chain of association names relates to exact
+      # table correlation names chosen by AREL.  We use a duplicate relation object for this
+      # because an important side-effect of referencing the AST is that the @arel instance
+      # variable gets set, and this is a signal to ActiveRecord that a relation has now
+      # become immutable.  (We aren't quite ready for our "real deal" relation object to be
+      # set in stone ... still need to add .select(), and possibly .where() and .order()
+      # things ... also if there are any HM counts then an OUTER JOIN for each of them out
+      # to a derived table to do that counting.  All of these things need to know proper
+      # table correlation names, which will now become available from brick_links on the
+      # @_brick_rel_dupe object.)
+      @_brick_links ||= begin
+                          # If it's a CollectionProxy (which inherits from Relation) then need to dig
+                          # out the core Relation object which is found in the association scope.
+                          rel_dupe = (is_a?(ActiveRecord::Associations::CollectionProxy) ? scope : self).dup
+                          # This will become a fully populated hash of correlation names
+                          rel_dupe.instance_variable_set(:@_brick_links, bl = { '' => table_name })
+                          # Walk the AST tree in order to capture all the correlation names
+                          rel_dupe.arel.ast
+                          # Now that @_brick_links are captured, we can garbage collect the @_brick_rel_dupe object
+                          # remove_instance_variable(:@_brick_rel_dupe)
+                          bl
+                        end
+      # if @_brick_rel_dupe
+      # end
+      # @_brick_links
     end
 
     def brick_select(*args, params: {}, order_by: nil, translations: {},
@@ -648,23 +673,6 @@ module ActiveRecord
         end
       end
 
-      # If it's a CollectionProxy (which inherits from Relation) then need to dig out the
-      # core Relation object which is found in the association scope.
-      rel_dupe = (is_a?(ActiveRecord::Associations::CollectionProxy) ? scope : self).dup
-
-      # Touching AREL AST walks the JoinDependency tree, and in that process uses our
-      # "brick_links" patch to find how every AR chain of association names relates to exact
-      # table correlation names chosen by AREL.  We use a duplicate relation object for this
-      # because an important side-effect of referencing the AST is that the @arel instance
-      # variable gets set, and this is a signal to ActiveRecord that a relation has now
-      # become immutable.  (We aren't quite ready for our "real deal" relation object to be
-      # set in stone ... still need to add .select(), and possibly .where() and .order()
-      # things ... also if there are any HM counts then an OUTER JOIN for each of them out
-      # to a derived table to do that counting.  All of these things need to know proper
-      # table correlation names, which will now become available in brick_links on the
-      # rel_dupe object.)
-      rel_dupe.arel.ast
-
       core_selects = selects.dup
       id_for_tables = Hash.new { |h, k| h[k] = [] }
       field_tbl_names = Hash.new { |h, k| h[k] = {} }
@@ -673,7 +681,7 @@ module ActiveRecord
       # CUSTOM COLUMNS
       # ==============
       (cust_col_override || klass._br_cust_cols).each do |k, cc|
-        if rel_dupe.respond_to?(k) # Name already taken?
+        if respond_to?(k) # Name already taken?
           # %%% Use ensure_unique here in this kind of fashion:
           # cnstr_name = ensure_unique(+"(brick) #{for_tbl}_#{pri_tbl}", nil, bts, hms)
           # binding.pry
@@ -690,7 +698,7 @@ module ActiveRecord
             # binding.pry unless kl.reflect_on_association(cc_part_term)
             kl.reflect_on_association(cc_part_term)&.klass || klass
           end
-          tbl_name = rel_dupe.brick_links[cc_part[0..-2].map(&:to_s).join('.')]
+          tbl_name = brick_links[cc_part[0..-2].map(&:to_s).join('.')]
           # Deal with the conflict if there are two parts in the custom column named the same,
           # "category.name" and "product.name" for instance will end up with aliases of "name"
           # and "product__name".
@@ -734,19 +742,19 @@ module ActiveRecord
       unless cust_col_override
         klass._br_bt_descrip.each do |v|
           v.last.each do |k1, v1| # k1 is class, v1 is array of columns to snag
-            next unless (tbl_name = rel_dupe.brick_links[v.first.to_s]&.split('.')&.last)
+            next unless (tbl_name = brick_links[v.first.to_s]&.split('.')&.last)
 
             # If it's Oracle, quote any AREL aliases that had been applied
-            tbl_name = "\"#{tbl_name}\"" if ::Brick.is_oracle && rel_dupe.brick_links.values.include?(tbl_name)
+            tbl_name = "\"#{tbl_name}\"" if ::Brick.is_oracle && brick_links.values.include?(tbl_name)
             field_tbl_name = nil
             v1.map { |x| [x[0..-2].map(&:to_s).join('.'), x.last] }.each_with_index do |sel_col, idx|
               # %%% Strangely in Rails 7.1 on a slower system then very rarely brick_link comes back nil...
-              brick_link = rel_dupe.brick_links[sel_col.first]
+              brick_link = brick_links[sel_col.first]
               field_tbl_name = brick_link&.split('.')&.last ||
                 # ... so here's a best-effort guess for what the table name might be.
-                rel_dupe.klass.reflect_on_association(sel_col.first)&.klass&.table_name
+                klass.reflect_on_association(sel_col.first)&.klass&.table_name
               # If it's Oracle, quote any AREL aliases that had been applied
-              field_tbl_name = "\"#{field_tbl_name}\"" if ::Brick.is_oracle && rel_dupe.brick_links.values.include?(field_tbl_name)
+              field_tbl_name = "\"#{field_tbl_name}\"" if ::Brick.is_oracle && brick_links.values.include?(field_tbl_name)
 
               # Postgres can not use DISTINCT with any columns that are XML, so for any of those just convert to text
               is_xml = is_distinct && Brick.relations[k1.table_name]&.[](:cols)&.[](sel_col.last)&.first&.start_with?('xml')
@@ -788,7 +796,7 @@ module ActiveRecord
         join_array.each do |assoc_name|
           next unless assoc_name.is_a?(Symbol)
 
-          table_alias = rel_dupe.brick_links[assoc_name.to_s]
+          table_alias = brick_links[assoc_name.to_s]
           _assoc_names[assoc_name] = [table_alias, klass]
         end
       end
@@ -931,7 +939,7 @@ JOIN (SELECT #{hm_selects.map { |s| _br_quoted_name("#{'br_t0.' if from_clause}#
           if (v_parts = v.first.split('.')).length == 1
             (is_not ? where_nots : s)[v.first] = v.last
           else
-            tbl_name = rel_dupe.brick_links[v_parts.first].split('.').last
+            tbl_name = brick_links[v_parts.first].split('.').last
             (is_not ? where_nots : s)["#{tbl_name}.#{v_parts.last}"] = v.last
           end
         end
@@ -1042,10 +1050,9 @@ JOIN (SELECT #{hm_selects.map { |s| _br_quoted_name("#{'br_t0.' if from_clause}#
           else
             self.joins!(ja)
           end
-          (ast_tree = self.dup).arel.ast # Walk the AST tree so we can rewrite the prefixes accordingly
           conditions = opts.each_with_object({}) do |v, s|
             if (ref_parts = v.first.split('.')).length > 1 &&
-               (tbl = ast_tree.brick_links[ref_parts[0..-2].join('.')])
+               (tbl = brick_links[ref_parts[0..-2].join('.')])
               s["#{tbl}.#{ref_parts.last}"] = v.last
             else
               s[v.first] = v.last
@@ -1175,34 +1182,6 @@ Might want to add this in your brick.rb:
   end
 end
 
-if ::Brick.enable_routes? && Object.const_defined?('ActionDispatch')
-  require 'brick/route_mapper'
-  ActionDispatch::Routing::RouteSet.class_exec do
-    # In order to defer auto-creation of any routes that already exist, calculate Brick routes only after having loaded all others
-    prepend ::Brick::RouteSet
-  end
-  ActionDispatch::Routing::Mapper.class_exec do
-    include ::Brick::RouteMapper
-  end
-
-  # Do the root route before the Rails Welcome one would otherwise take precedence
-  if (route = ::Brick.config.default_route_fallback).present?
-    action = "#{route}#{'#index' unless route.index('#')}"
-    if ::Brick.config.path_prefix
-      ::Rails.application.routes.append do
-        send(:namespace, ::Brick.config.path_prefix) do
-          send(:root, action)
-        end
-      end
-    elsif ::Rails.application.routes.named_routes.send(:routes)[:root].nil?
-      ::Rails.application.routes.append do
-        send(:root, action)
-      end
-    end
-    ::Brick.established_drf = "/#{::Brick.config.path_prefix}#{action[action.index('#')..-1]}"
-  end
-end
-
 if Object.const_defined?('ActionView')
   require 'brick/frameworks/rails/form_tags'
   require 'brick/frameworks/rails/form_builder'
@@ -1343,10 +1322,15 @@ end
          # Try to require the respective Ruby file
          # ((filename = ActiveSupport::Dependencies.search_for_file(desired_classname.underscore)) &&
          #  (require_dependency(filename) || true) &&
-         ((filename = ActiveSupport::Dependencies.search_for_file(desired_classname.underscore) ||
+         (!anonymous? &&
+          (filename = ActiveSupport::Dependencies.search_for_file(desired_classname.underscore) ||
                       (self != Object && ActiveSupport::Dependencies.search_for_file((desired_classname = requested).underscore))
           ) && (require_dependency(filename) || true) &&
-          (!anonymous? && (possible = self.const_get(args.first)) && possible.name == desired_classname)
+          (filename != Module.instance_variable_get(:@_brick_last_filename) || # Avoid trying the same exact file twice in a row
+           Module.instance_variable_set(:@_brick_last_filename, nil)) &&
+           Module.instance_variable_set(:@_brick_last_filename, filename) &&
+
+          (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)
@@ -1365,6 +1349,7 @@ end
           return possible
         end
       end
+      Module.instance_variable_set(:@_brick_last_filename, nil) # Clear out the check for trying the same exact file twice in a row
     end
     class_name = ::Brick.namify(requested)
     is_avo_present = Object.const_defined?('Avo') && ::Avo.respond_to?(:railtie_namespace)
@@ -1800,6 +1785,18 @@ class Object
             new_model_class.send(:has_many, hmt_name.to_sym, **options)
           end
         end
+
+        # Auto-support Ransack if it's present
+        if self.respond_to?(:ransackable_attributes)
+          def self.ransackable_attributes(auth_object = nil)
+            column_names + _ransackers.keys
+          end
+
+          def self.ransackable_associations(auth_object = nil)
+            reflect_on_all_associations.map { |a| a.name.to_s } + _ransackers.keys
+          end
+        end
+
         code << "end # model #{full_name}\n"
       end # model class definition
       [built_model, code]

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

@@ -209,51 +209,95 @@ function linkSchemas() {
       # paths['app/models'] << 'lib/brick/frameworks/active_record/models'
       config.brick = ActiveSupport::OrderedOptions.new
       ActiveSupport.on_load(:before_initialize) do |app|
-        if ::Rails.application.respond_to?(:reloader)
-          ::Rails.application.reloader.to_prepare { Module.class_exec &::Brick::ADD_CONST_MISSING }
-        else # For Rails < 5.0, just load it once at the start
-          Module.class_exec &::Brick::ADD_CONST_MISSING
+
+        # --------------------------------------------
+        # 1. Load three initializers early
+        #    (inflectsions.rb, brick.rb, apartment.rb)
+        # Very first thing, load inflections since we'll be using .pluralize and .singularize on table and model names
+        if File.exist?(inflections = ::Rails.root&.join('config/initializers/inflections.rb') || '')
+          load inflections
         end
         require 'brick/join_array'
-        is_development = (ENV['RAILS_ENV'] || ENV['RACK_ENV'])  == 'development'
-        ::Brick.enable_models = app.config.brick.fetch(:enable_models, true)
-        ::Brick.enable_controllers = app.config.brick.fetch(:enable_controllers, is_development)
-        ::Brick.enable_views = app.config.brick.fetch(:enable_views, is_development)
-        ::Brick.enable_routes = app.config.brick.fetch(:enable_routes, is_development)
-        ::Brick.skip_database_views = app.config.brick.fetch(:skip_database_views, false)
-
-        # Specific database tables and views to omit when auto-creating models
-        ::Brick.exclude_tables = app.config.brick.fetch(:exclude_tables, [])
-
-        # 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, {})
-
-        # Columns to treat as being metadata for purposes of identifying associative tables for has_many :through
-        ::Brick.metadata_columns = app.config.brick.fetch(:metadata_columns, ['created_at', 'updated_at', 'deleted_at'])
-
-        # Columns for which to add a validate presence: true even though the database doesn't have them marked as NOT NULL
-        ::Brick.not_nullables = app.config.brick.fetch(:not_nullables, [])
-
-        # Additional references (virtual foreign keys)
-        ::Brick.additional_references = app.config.brick.fetch(:additional_references, nil)
-
-        # Custom columns to add to a table, minimally defined with a name and DSL string
-        ::Brick.custom_columns = app.config.brick.fetch(:custom_columns, nil)
-
-        # When table names have specific prefixes, automatically place them in their own module with a table_name_prefix.
-        ::Brick.order = app.config.brick.fetch(:order, {})
+        # Now the Brick initializer since there may be important schema things configured
+        if !::Brick.initializer_loaded && File.exist?(brick_initializer = ::Rails.root&.join('config/initializers/brick.rb') || '')
+          ::Brick.initializer_loaded = load brick_initializer
+
+          # After loading the initializer, add compatibility for ActiveStorage and ActionText if those haven't already been
+          # defined.  (Further JSON configuration for ActiveStorage metadata happens later in the after_initialize hook.)
+          # begin
+            ['ActiveStorage', 'ActionText'].each do |ar_extension|
+              if Object.const_defined?(ar_extension) &&
+                 (extension = Object.const_get(ar_extension)).respond_to?(:table_name_prefix) &&
+                 !::Brick.config.table_name_prefixes.key?(as_tnp = extension.table_name_prefix)
+                ::Brick.config.table_name_prefixes[as_tnp] = ar_extension
+              end
+            end
+          # rescue # NoMethodError
+          # end
 
-        # Skip creating a has_many association for these
-        ::Brick.exclude_hms = app.config.brick.fetch(:exclude_hms, nil)
+          # Support the followability gem:  https://github.com/nejdetkadir/followability
+          if Object.const_defined?('Followability') && !::Brick.config.table_name_prefixes.key?('followability_')
+            ::Brick.config.table_name_prefixes['followability_'] = 'Followability'
+          end
+        end
+        # Load the initializer for the Apartment gem a little early so that if .excluded_models and
+        # .default_schema are specified then we can work with non-tenanted models more appropriately
+        if (apartment = Object.const_defined?('Apartment')) &&
+           File.exist?(apartment_initializer = ::Rails.root.join('config/initializers/apartment.rb'))
+          require 'apartment/adapters/abstract_adapter'
+          Apartment::Adapters::AbstractAdapter.class_exec do
+            if instance_methods.include?(:process_excluded_models)
+              def process_excluded_models
+                # All other models will share a connection (at Apartment.connection_class) and we can modify at will
+                Apartment.excluded_models.each do |excluded_model|
+                  begin
+                    process_excluded_model(excluded_model)
+                  rescue NameError => e
+                    (@bad_models ||= []) << excluded_model
+                  end
+                end
+              end
+            end
+          end
+          unless @_apartment_loaded
+            load apartment_initializer
+            @_apartment_loaded = true
+          end
+        end
 
-        # Has one relationships
-        ::Brick.has_ones = app.config.brick.fetch(:has_ones, nil)
+        if ::Brick.enable_routes? && Object.const_defined?('ActionDispatch')
+          require 'brick/route_mapper'
+          ActionDispatch::Routing::RouteSet.class_exec do
+            # In order to defer auto-creation of any routes that already exist, calculate Brick routes only after having loaded all others
+            prepend ::Brick::RouteSet
+          end
+          ActionDispatch::Routing::Mapper.class_exec do
+            include ::Brick::RouteMapper
+          end
 
-        # accepts_nested_attributes_for relationships
-        ::Brick.nested_attributes = app.config.brick.fetch(:nested_attributes, nil)
+          # Do the root route before the Rails Welcome one would otherwise take precedence
+          if (route = ::Brick.config.default_route_fallback).present?
+            action = "#{route}#{'#index' unless route.index('#')}"
+            if ::Brick.config.path_prefix
+              ::Rails.application.routes.append do
+                send(:namespace, ::Brick.config.path_prefix) do
+                  send(:root, action)
+                end
+              end
+            elsif ::Rails.application.routes.named_routes.send(:routes)[:root].nil?
+              ::Rails.application.routes.append do
+                send(:root, action)
+              end
+            end
+            ::Brick.established_drf = "/#{::Brick.config.path_prefix}#{action[action.index('#')..-1]}"
+          end
+        end
 
-        # Polymorphic associations
-        ::Brick.polymorphics = app.config.brick.fetch(:polymorphics, nil)
+        if ::Rails.application.respond_to?(:reloader)
+          ::Rails.application.reloader.to_prepare { Module.class_exec &::Brick::ADD_CONST_MISSING }
+        else # For Rails < 5.0, just load it once at the start
+          Module.class_exec &::Brick::ADD_CONST_MISSING
+        end
       end
 
       # After we're initialized and before running the rest of stuff, put our configuration in place
@@ -497,20 +541,43 @@ window.addEventListener(\"popstate\", linkSchemas);
               end
             end
           end
-          ::ActiveAdmin::Views::TitleBar.class_exec do
-            alias _brick_build_title_tag build_title_tag
-            def build_title_tag
-              if klass = begin
-                           aa_id = helpers.instance_variable_get(:@current_tab)&.id
-                           ::Brick.relations.fetch(aa_id, nil)&.fetch(:class_name, nil)&.constantize
-                         rescue
-                         end
-                h2((@title + link_to_brick(nil,
-                  BRICK_SVG.html_safe, # This would do well to be sized a bit smaller
-                  { title: "#{@_name} in Brick" }
-                )).html_safe)
-              else
-                _brick_build_title_tag # Revert to the original
+          if (aav = ::ActiveAdmin::Views).const_defined?('TitleBar') # ActiveAdmin < 4.0
+            aav::TitleBar.class_exec do
+              alias _brick_build_title_tag build_title_tag
+              def build_title_tag
+                if klass = begin
+                             aa_id = helpers.instance_variable_get(:@current_tab)&.id
+                             ::Brick.relations.fetch(aa_id, nil)&.fetch(:class_name, nil)&.constantize
+                           rescue
+                           end
+                  h2((@title + link_to_brick(nil,
+                    BRICK_SVG.html_safe, # This would do well to be sized a bit smaller
+                    { title: "#{@_name} in Brick" }
+                  )).html_safe)
+                else
+                  _brick_build_title_tag # Revert to the original
+                end
+              end
+            end
+          else # ActiveAdmin 4.0 or later
+            is_aa_4x = true
+            ::ActiveAdmin::ResourceController.class_exec do
+              include ActionView::Helpers::UrlHelper
+              include ::Brick::Rails::FormTags
+              alias _brick_default_page_title default_page_title
+              def default_page_title
+                dpt = _brick_default_page_title
+                if klass = begin
+                             ::Brick.relations.fetch(@current_menu_item&.id, nil)&.fetch(:class_name, nil)&.constantize
+                           rescue
+                           end
+                  (dpt + link_to_brick(nil,
+                    BRICK_SVG.html_safe,
+                    { title: "#{dpt} in Brick" }
+                  )).html_safe
+                else
+                  dpt
+                end
               end
             end
           end
@@ -523,9 +590,8 @@ window.addEventListener(\"popstate\", linkSchemas);
                 div class: "blank_slate_container", id: "dashboard_default_message" do
                   span class: "blank_slate" do
                     span I18n.t("active_admin.dashboard_welcome.welcome")
-                    small I18n.t("active_admin.dashboard_welcome.call_to_action")
                   end
-                end
+                end unless is_aa_4x
               end
             end
           end
@@ -1402,7 +1468,7 @@ end %>#{"
   end
   \"<tr><td colspan=\\\"#\{td_count}\\\">Children: #\{child_links.join(' ')}</tr>\".html_safe
 end
-%><%= if (page_num = @#{res_name = table_name.pluralize}._brick_page_num)
+%><%= if (page_num = @#{res_name = table_name.pluralize}&._brick_page_num)
            \"<tr><td colspan=\\\"#\{td_count}\\\">Page #\{page_num}</td></tr>\".html_safe
          end %></table>#{template_link}<%
    if description.present? %><span class=\"__brick\"><%=
@@ -1790,11 +1856,12 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
 <link rel=\"stylesheet\" type=\"text/css\" href=\"https://cdn.jsdelivr.net/npm/trix@2.0/dist/trix.min.css\">
 <% end %>
 
-<% # Started with v0.14.4 of vanilla-jsoneditor
+<% # Good up until v0.19.0, and then with v0.20.0 of vanilla-jsoneditor started to get:
+   # Uncaught TypeError: Failed to resolve module specifier \"immutable-json-patch\". Relative references must start with either \"/\", \"./\", or \"../\".
    if @_json_fields_present %>
-<link rel=\"stylesheet\" type=\"text/css\" href=\"https://cdn.jsdelivr.net/npm/vanilla-jsoneditor/themes/jse-theme-default.min.css\">
+<link rel=\"stylesheet\" type=\"text/css\" href=\"https://cdn.jsdelivr.net/npm/vanilla-jsoneditor@0.19.0/themes/jse-theme-default.min.css\">
 <script type=\"module\">
-  import { JSONEditor } from \"https://cdn.jsdelivr.net/npm/vanilla-jsoneditor/index.min.js\";
+  import { JSONEditor } from \"https://cdn.jsdelivr.net/npm/vanilla-jsoneditor@0.19.0/index.min.js\";
   document.querySelectorAll(\"input.jsonpicker\").forEach(function (inp) {
     var jsonDiv;
     if (jsonDiv = document.getElementById(\"_br_json_\" + inp.id)) {

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

@@ -69,8 +69,8 @@ module Brick::Rails::FormTags
 
       if show_aa_button != false && Object.const_defined?('ActiveAdmin')
         ActiveAdmin.application.namespaces.names.each do |ns|
-        out << "
-          <td>#{link_to_brick(
+          out << "
+        <td>#{link_to_brick(
             ::Brick::Rails::AA_PNG.html_safe,
             { index_proc: Proc.new do |aa_model, relation|
                             path_helper = "#{ns}_#{relation.fetch(:auto_prefixed_schema, nil)}#{aa_model.model_name.route_key}_path".to_sym

data/lib/brick/reflect_tables.rb

@@ -31,61 +31,8 @@ module Brick
 
       orig_schema = nil
       if (relations = ::Brick.relations).keys == [:db_name]
-        ::Brick.remove_instance_variable(:@_additional_references_loaded) if ::Brick.instance_variable_defined?(:@_additional_references_loaded)
+        # ::Brick.remove_instance_variable(:@_additional_references_loaded) if ::Brick.instance_variable_defined?(:@_additional_references_loaded)
 
-        # --------------------------------------------
-        # 1. Load three initializers early
-        #    (inflectsions.rb, brick.rb, apartment.rb)
-        # Very first thing, load inflections since we'll be using .pluralize and .singularize on table and model names
-        if File.exist?(inflections = ::Rails.root&.join('config/initializers/inflections.rb') || '')
-          load inflections
-        end
-        # Now the Brick initializer since there may be important schema things configured
-        if !::Brick.initializer_loaded && File.exist?(brick_initializer = ::Rails.root&.join('config/initializers/brick.rb') || '')
-          ::Brick.initializer_loaded = load brick_initializer
-
-          # After loading the initializer, add compatibility for ActiveStorage and ActionText if those haven't already been
-          # defined.  (Further JSON configuration for ActiveStorage metadata happens later in the after_initialize hook.)
-          # begin
-            ['ActiveStorage', 'ActionText'].each do |ar_extension|
-              if Object.const_defined?(ar_extension) &&
-                 (extension = Object.const_get(ar_extension)).respond_to?(:table_name_prefix) &&
-                 !::Brick.config.table_name_prefixes.key?(as_tnp = extension.table_name_prefix)
-                ::Brick.config.table_name_prefixes[as_tnp] = ar_extension
-              end
-            end
-          # rescue # NoMethodError
-          # end
-
-          # Support the followability gem:  https://github.com/nejdetkadir/followability
-          if Object.const_defined?('Followability') && !::Brick.config.table_name_prefixes.key?('followability_')
-            ::Brick.config.table_name_prefixes['followability_'] = 'Followability'
-          end
-        end
-        # Load the initializer for the Apartment gem a little early so that if .excluded_models and
-        # .default_schema are specified then we can work with non-tenanted models more appropriately
-        if (apartment = Object.const_defined?('Apartment')) &&
-           File.exist?(apartment_initializer = ::Rails.root.join('config/initializers/apartment.rb'))
-          require 'apartment/adapters/abstract_adapter'
-          Apartment::Adapters::AbstractAdapter.class_exec do
-            if instance_methods.include?(:process_excluded_models)
-              def process_excluded_models
-                # All other models will share a connection (at Apartment.connection_class) and we can modify at will
-                Apartment.excluded_models.each do |excluded_model|
-                  begin
-                    process_excluded_model(excluded_model)
-                  rescue NameError => e
-                    (@bad_models ||= []) << excluded_model
-                  end
-                end
-              end
-            end
-          end
-          unless @_apartment_loaded
-            load apartment_initializer
-            @_apartment_loaded = true
-          end
-        end
         # Only for Postgres  (Doesn't work in sqlite3 or MySQL)
         # puts ActiveRecord::Base.execute_sql("SELECT current_setting('SEARCH_PATH')").to_a.inspect
 
@@ -438,7 +385,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
         loop do
           klass = Object
           proposed_name_parts.each do |part|
-            if klass.const_defined?(part)
+            if klass.const_defined?(part) && klass.name != part
               begin
                 klass = klass.const_get(part)
               rescue NoMethodError => e

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -232,10 +232,6 @@ module Brick
                 )
               )
             )
-        # unless a.polymorphic? || (!a.belongs_to? && (through = a.options[:through])) ||
-        #        (a.klass && ::Brick.config.exclude_tables.exclude?(a.klass.table_name) &&
-        #          (!a.belongs_to? || (same_type = (fk_type = model_cols[a.foreign_key.to_s]&.type) == pk_type))
-        #        )
           if same_type == false # We really do want to test specifically for false here, and not nil!
             puts "WARNING:
   Foreign key column #{a.klass.table_name}.#{a.foreign_key} is #{fk_type}, but the primary key it relates to, #{primary_klass.table_name}.#{a_pk}, is #{pk_type}.
@@ -1564,9 +1560,7 @@ module ActiveRecord
             used_cols = {}
             # Find and expand out all column names being used in select(...)
             new_select_values = relation.select_values.map(&:to_s).each_with_object([]) do |col, s|
-              if col.include?(' ') # Some expression? (No chance for a simple column reference)
-                s << col # Just pass it through
-              else
+              unless col.include?(' ') # Pass it through if it's some expression (No chance for a simple column reference)
                 col = if (col_parts = col.split('.')).length == 1
                         [col]
                       else
@@ -1574,6 +1568,7 @@ module ActiveRecord
                       end
                 used_cols[col] = nil
               end
+              s << col
             end
             if new_select_values.present?
               relation.select_values = new_select_values

data/lib/generators/brick/install_generator.rb

@@ -171,7 +171,7 @@ if ActiveRecord::Base.respond_to?(:brick_select) && !::Brick.initializer_loaded
 
   # # Custom path prefix to apply to all auto-generated Brick routes.  Also causes auto-generated controllers
   # # to be created inside a module with the same name.
-  # ::Brick.path_prefix = 'admin'
+  # ::Brick.path_prefix = 'brick'
 
   # # Normally all are enabled in development mode, and for security reasons only models are enabled in production
   # # and test.  This allows you to either (a) turn off models entirely, or (b) enable controllers, views, and routes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.204
+  version: 1.0.206
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-11 00:00:00.000000000 Z
+date: 2024-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord