brick 1.0.108 → 1.0.110

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e9a085e3f9ba811623d8ebc5d840018348d207b6b1ecab97c066894c44c6ab0
-  data.tar.gz: 83f32dc71791730d7370f3375b3c19e6cc00e8062efe5b01bdb4cf5aa40b92b9
+  metadata.gz: 3d11240139b576ead983fbe9811f4476b8819878068c46db852b515fbc0849c6
+  data.tar.gz: 2db932779fcd8517f7e5be524ce387061d4e8cab193715be76893dc1e675d1c9
 SHA512:
-  metadata.gz: dda58c12995437cb95ce60224543d64ef2ed16b0792a083e0def39e7be4569ceaaad86098f6470daf45c358db1d10a1ff350195c0c61ccd3363cbcfae0c344c2
-  data.tar.gz: 673a82fbbd268c4c8ba590c8eb980fe6e71a62caff710d32ff3b21b3c67927a22ec02380d5d8f8366a1dcadaece238aab3e737f92e879de9da5893dcde0251fa
+  metadata.gz: dd22a1ab8d2b13f2d289fe02262ae8aecb3be921094bbb5dd0392fe5cd46ecadda259e72a18c3ecb7daea0fd5f5a50d697383a4bb949b068976e3b6007769d04
+  data.tar.gz: 39d26f6c99511d3651003c660fed495223ebd4fb34865b1eaa3b8554e294ed0fb3672b17e7dc43ca43fecbd1b7dda2ec6b9a4371025880e12c83694f45557173

data/lib/brick/compatibility.rb

@@ -42,9 +42,36 @@ end
 # file by having the line "require 'brick/compatibility'" to be the last line in that
 # file.
 require 'bigdecimal'
-if ::Gem::Version.new(RUBY_VERSION) >= ::Gem::Version.new('2.6') &&
-   ActiveRecord.version < ::Gem::Version.new('5.0')
-  def BigDecimal.new(*args, **kwargs)
-    BigDecimal(*args, **kwargs)
+if ActiveRecord.version < ::Gem::Version.new('5.0')
+  if ::Gem::Version.new(RUBY_VERSION) >= ::Gem::Version.new('2.6')
+    def BigDecimal.new(*args, **kwargs)
+      BigDecimal(*args, **kwargs)
+    end
+
+    if ::Gem::Version.new(RUBY_VERSION) >= ::Gem::Version.new('3.1')
+      # @@schemes fix for global_id gem < 1.0
+      URI.class_variable_set(:@@schemes, {}) unless URI.class_variables.include?(:@@schemes)
+      if Gem::Specification.all_names.find { |g| g.start_with?('puma-') }
+        require 'rack/handler/puma'
+        module Rack::Handler::Puma
+          class << self
+            alias _brick_run run
+            def run(app, *args, **options)
+              options.merge!(args.pop) if args.last.is_a?(Hash)
+              _brick_run(app, **options)
+            end
+          end
+        end
+      end
+
+      require 'json'
+      if JSON::Parser.method(:initialize).parameters.length < 2 && JSON.method(:parse).arity == -2
+        JSON.class_exec do
+          def self.parse(source, opts = {})
+            ::JSON::Parser.new(source, **opts).parse
+          end
+        end
+      end
+    end
   end
 end

data/lib/brick/extensions.rb

@@ -261,9 +261,16 @@ module ActiveRecord
       assoc_html_name ? "#{assoc_name}-#{link}".html_safe : link
     end
 
-    def self._brick_index(mode = nil, separator = '_')
+    # Providing a relation object allows auto-modules built from table name prefixes to work
+    def self._brick_index(mode = nil, separator = '_', relation = nil)
       tbl_parts = ((mode == :singular) ? table_name.singularize : table_name).split('.')
       tbl_parts.shift if ::Brick.apartment_multitenant && tbl_parts.length > 1 && tbl_parts.first == ::Brick.apartment_default_tenant
+      if (aps = relation&.fetch(:auto_prefixed_schema, nil)) && tbl_parts.last.start_with?(aps)
+        last_part = tbl_parts.last[aps.length..-1]
+        aps = aps[0..-2] if aps[-1] == '_'
+        tbl_parts[-1] = aps
+        tbl_parts << last_part
+      end
       tbl_parts.unshift(::Brick.config.path_prefix) if ::Brick.config.path_prefix
       index = tbl_parts.map(&:underscore).join(separator)
       # Rails applies an _index suffix to that route when the resource name is singular
@@ -421,7 +428,10 @@ module ActiveRecord
       is_distinct = nil
       wheres = {}
       params.each do |k, v|
-        next if ['_brick_schema', '_brick_order', 'controller', 'action'].include?(k)
+        next if ['_brick_schema', '_brick_order',
+                 '_brick_erd', '_brick_exclude', '_brick_unexclude',
+                 '_brick_page', '_brick_page_size', '_brick_offset', '_brick_limit',
+                 '_brick_is_api', 'controller', 'action'].include?(k)
 
         if (where_col = (ks = k.split('.')).last)[-1] == '!'
           where_col = where_col[0..-2]
@@ -448,7 +458,10 @@ module ActiveRecord
         # %%% Have once gotten this error with MSSQL referring to http://localhost:3000/warehouse/cold_room_temperatures__archive
         #     ActiveRecord::StatementInvalid (TinyTds::Error: DBPROCESS is dead or not enabled)
         #     Relevant info here:  https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/issues/402
+        is_api = params['_brick_is_api']
         columns.each do |col|
+          next if (col.type.nil? || col.type == :binary) && is_api
+
           col_alias = " AS #{col.name}_" if (col_name = col.name) == 'class'
           selects << if is_mysql
                        "`#{tbl_no_schema}`.`#{col_name}`#{col_alias}"
@@ -999,7 +1012,8 @@ Module.class_exec do
 
              # MODULE
              elsif (::Brick.enable_models? || ::Brick.enable_controllers?) && # Schema match?
-                   base_module == Object && # %%% This works for Person::Person -- but also limits us to not being able to allow more than one level of namespacing
+                   # %%% This works for Person::Person -- but also limits us to not being able to allow more than one level of namespacing
+                   (base_module == Object || (camelize_prefix && base_module == Object.const_get(camelize_prefix))) &&
                    (schema_name = [(singular_table_name = class_name.underscore),
                                    (table_name = singular_table_name.pluralize),
                                    ::Brick.is_oracle ? class_name.upcase : class_name,
@@ -1431,7 +1445,7 @@ class Object
       is_postgres = ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
       is_mysql = ['Mysql2', 'Trilogy'].include?(ActiveRecord::Base.connection.adapter_name)
 
-      code = +"class #{class_name} < #{controller_base&.name || 'ApplicationController'}\n"
+      code = +"class #{namespace}::#{class_name} < #{controller_base&.name || 'ApplicationController'}\n"
       built_controller = Class.new(controller_base || ActionController::Base) do |new_controller_class|
         (namespace || Object).const_set(class_name.to_sym, new_controller_class)
 
@@ -1538,9 +1552,13 @@ class Object
             end
             if (current_api_root || is_openapi) &&
                !params&.key?('_brick_schema') &&
-               (referrer_params = request.env['HTTP_REFERER']&.split('?')&.last&.split('&')&.map { |x| x.split('=') }).present?
+               (referrer_params = request.env['HTTP_REFERER']&.split('?')&.last&.split('&')&.each_with_object({}) do |x, s|
+                 if (kv = x.split('=')).length > 1
+                   s[kv.first] = kv[1..-1].join('=')
+                 end
+               end).present?
               if params
-                referrer_params.each { |k, v| params.send(:parameters)[k] = v }
+                referrer_params.each { |k, v| (params.respond_to?(:parameters) ? send(:parameters) : params)[k] = v }
               else
                 api_params = referrer_params&.to_h
               end
@@ -1651,11 +1669,12 @@ class Object
             order_by, _ = model._brick_calculate_ordering(ordering, true) # Don't do the txt part
 
             ar_relation = ActiveRecord.version < Gem::Version.new('4') ? model.preload : 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 = {},
                                                       join_array = ::Brick::JoinArray.new)
 
-            if request.format == :js || current_api_root # Asking for JSON?
+            if is_api # Asking for JSON?
               # Apply column renaming
               data = ar_relation.respond_to?(:_select!) ? ar_relation.dup._select!(*selects) : ar_relation.select(selects)
               if data.present? &&
@@ -1667,13 +1686,16 @@ class Object
                 end
               end
 
-              # %%% Still need to figure out column filtering and transformations
+              # # %%% 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.last[:cols]
+              #                 object_columns = (relation = model&._brick_relation)[:cols]
               #                 begin
               #                   num_args = column_filter.arity.negative? ? 5 : column_filter.arity
               #                   # object_name, api_version, columns, data
-              #                   column_filter.call(*[relation.first, api_ver_path, object_columns, nil][0...num_args])
+              #                   api_ver_path = request.path[0..-relation[:resource].length]
+              #                   # Call the api_column_filter in the context of this auto-built controller
+              #                   instance_exec(*[relation[:resource], relation, api_ver_path, object_columns, data][0...num_args], &column_filter)
               #                 rescue StandardError => e
               #                   puts "::Brick.api_column_filter Proc error: #{e.message}"
               #                 end
@@ -1685,7 +1707,6 @@ class Object
               #           else
               #             relation.last[:cols]
               #           end
-              # binding.pry
 
               render inline: { data: data }.to_json, content_type: ['*/*', 'text/html'].include?(request.format) ? 'application/json' : request.format
               return
@@ -1984,7 +2005,6 @@ end.class_exec do
 
     # return if ActiveRecord::Base.connection.current_database == 'postgres'
 
-    initializer_loaded = false
     orig_schema = nil
     if (relations = ::Brick.relations).empty?
       # Very first thing, load inflections since we'll be using .pluralize and .singularize on table and model names
@@ -1993,7 +2013,7 @@ end.class_exec do
       end
       # Now the Brick initializer since there may be important schema things configured
       if File.exist?(brick_initializer = ::Rails.root.join('config/initializers/brick.rb'))
-        initializer_loaded = load brick_initializer
+        ::Brick.initializer_loaded = load brick_initializer
       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
@@ -2260,13 +2280,22 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
       schema_names.shift if ::Brick.apartment_multitenant && schema_names.first == ::Brick.apartment_default_tenant
       v[:schema] = schema_names.join('.') unless schema_names.empty?
       # %%% If more than one schema has the same table name, will need to add a schema name prefix to have uniqueness
-      v[:resource] = rel_name.last
       if (singular = rel_name.last.singularize).blank?
         singular = rel_name.last
       end
-      v[:class_name] = (schema_names + [singular]).map(&:camelize).join('::')
+      name_parts = if (tnp = ::Brick.config.table_name_prefixes
+                                    .find { |k1, _v1| singular.start_with?(k1) && singular.length > k1.length }
+                      ).present?
+                     v[:auto_prefixed_schema] = tnp.first
+                     v[:resource] = rel_name.last[(tnp_length = tnp.first.length)..-1]
+                     [tnp.last, singular[tnp_length..-1]]
+                   else
+                     v[:resource] = rel_name.last
+                     [singular]
+                   end
+      v[:class_name] = (schema_names + name_parts).map(&:camelize).join('::')
     end
-    ::Brick.load_additional_references if initializer_loaded
+    ::Brick.load_additional_references if ::Brick.initializer_loaded
 
     if orig_schema && (orig_schema = (orig_schema - ['pg_catalog', 'pg_toast', 'heroku_ext']).first)
       puts "Now switching back to \"#{orig_schema}\" schema."
@@ -2648,8 +2677,10 @@ module Brick
     end
 
     def find_col_renaming(api_ver_path, relation_name)
-      (column_renames = ::Brick.config.api_column_renaming&.fetch(api_ver_path, nil) ||
-                        ::Brick.config.api_column_renaming)&.fetch(relation_name, nil)
+      ::Brick.config.api_column_renaming&.fetch(
+        api_ver_path,
+        ::Brick.config.api_column_renaming&.fetch(relation_name, nil)
+      )
     end
 
     def _class_pk(dotted_name, multitenant)

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

@@ -10,10 +10,13 @@ module Brick
   if (param === undefined || param === null || param === -1) {
     hrefParts = hrefParts[0].split(\"://\");
     var pathParts = hrefParts[hrefParts.length - 1].split(\"/\").filter(function (pp) {return pp !== \"\";});
-    if (value === undefined)
+    if (value === undefined) {
       // A couple possibilities if it's namespaced, starting with two parts in the path -- and then try just one
-      return [pathParts.slice(1, 3).join('/'), pathParts.slice(1, 2)[0]];
-    else {
+      if (pathParts.length > 3)
+        return [pathParts.slice(1, 4).join('/'), pathParts.slice(1, 3).join('/')];
+      else
+        return [pathParts.slice(1, 3).join('/'), pathParts[1]];
+    } else {
       var queryString = param ? \"?\" + params.join(\"&\") : \"\";
       return hrefParts[0] + \"://\" + pathParts[0] + \"/\" + value + queryString;
     }
@@ -187,7 +190,8 @@ function linkSchemas() {
                                  s[r.name[0..-9]] = nil if r.name.end_with?('Resource')
                                end
                     ::Brick.relations.each do |k, v|
-                      unless existing.key?(class_name = v[:class_name]) || Brick.config.exclude_tables.include?(k) || class_name.blank?
+                      unless existing.key?(class_name = v[:class_name]) || Brick.config.exclude_tables.include?(k) ||
+                             class_name.blank? || class_name.include?('::')
                         Object.const_get("#{class_name}Resource")
                       end
                     end
@@ -452,11 +456,22 @@ window.addEventListener(\"popstate\", linkSchemas);
               # %%% If we are not auto-creating controllers (or routes) then omit by default, and if enabled anyway, such as in a development
               # environment or whatever, then get either the controllers or routes list instead
               prefix = "#{::Brick.config.path_prefix}/" if ::Brick.config.path_prefix
-              table_options = (::Brick.relations.keys - ::Brick.config.exclude_tables).each_with_object({}) do |tbl, s|
-                                if (tbl_parts = tbl.split('.')).first == apartment_default_schema
-                                  tbl = tbl_parts.last
+              table_options = ::Brick.relations.each_with_object({}) do |rel, s|
+                                next if ::Brick.config.exclude_tables.include?(rel.first)
+
+                                tbl_parts = rel.first.split('.')
+                                if (aps = rel.last.fetch(:auto_prefixed_schema, nil))
+                                  tbl_parts << tbl_parts.last[aps.length..-1]
+                                  aps = aps[0..-2] if aps[-1] == '_'
+                                  tbl_parts[-2] = aps
+                                end
+                                if tbl_parts.first == apartment_default_schema
+                                  tbl_parts.shift
                                 end
-                                s[tbl] = nil
+                                # %%% When table_name_prefixes are use then during rendering empty non-TNP
+                                # entries get added at some point when an attempt is made to find the table.
+                                # Will have to hunt that down at some point.
+                                s[tbl_parts.join('.')] = nil unless rel.last[:cols].empty?
                               end.keys.sort.each_with_object(+'') do |v, s|
                                 s << "<option value=\"#{prefix}#{v.underscore.gsub('.', '/')}\">#{v}</option>"
                               end.html_safe
@@ -881,7 +896,8 @@ if (grid) {
   // });
 }
 function setHeaderSizes() {
-  document.getElementById(\"titleBox\").style.width = grid.clientWidth;
+  if (grid.clientWidth > window.outerWidth)
+    document.getElementById(\"titleBox\").style.width = grid.clientWidth;
   // console.log(\"start\");
   // See if the headerTop is already populated
   // %%% Grab the TRs from headerTop, clear it out, do this stuff, add them back
@@ -1136,12 +1152,13 @@ erDiagram
   <td><h1><%= td_count = 2
               model.name %></h1></td>
   <td id=\"imgErd\" title=\"Show ERD\"></td>
-  <% if Object.const_defined?('Avo') && ::Avo.respond_to?(:railtie_namespace)
+  <% if Object.const_defined?('Avo') && ::Avo.respond_to?(:railtie_namespace) && model.name.exclude?('::')
        td_count += 1 %>
     <td><%= link_to_brick(
         avo_svg,
-        { index_proc: Proc.new do |avo_model|
-                        ::Avo.railtie_routes_url_helpers.send(\"resources_#\{model.model_name.route_key}_path\".to_sym)
+        { index_proc: Proc.new do |avo_model, relation|
+                        path_helper = \"resources_#\{relation.fetch(:auto_prefixed_schema, nil)}#\{model.model_name.route_key}_path\".to_sym
+                        ::Avo.railtie_routes_url_helpers.send(path_helper) if ::Avo.railtie_routes_url_helpers.respond_to?(path_helper)
                       end,
           title: \"#\{model.name} in Avo\" }
       ) %></td>
@@ -1328,8 +1345,9 @@ erDiagram
 <% if Object.const_defined?('Avo') && ::Avo.respond_to?(:railtie_namespace) %>
   <td><%= link_to_brick(
       avo_svg,
-      { show_proc: Proc.new do |obj|
-                     ::Avo.railtie_routes_url_helpers.send(\"resources_#\{obj.class.base_class.model_name.singular_route_key}_path\".to_sym, obj)
+      { show_proc: Proc.new do |obj, relation|
+                     path_helper = \"resources_#\{relation.fetch(:auto_prefixed_schema, nil)}#\{obj.class.base_class.model_name.singular_route_key}_path\".to_sym
+                     ::Avo.railtie_routes_url_helpers.send(path_helper, obj) if ::Avo.railtie_routes_url_helpers.respond_to?(path_helper)
                    end,
         title: \"#\{page_title} in Avo\" }
     ) %></td>
@@ -1408,8 +1426,8 @@ end
             \"<span class=\\\"orphan\\\">Orphaned ID: #\{val}</span>\".html_safe
           end %>
     <% else
-      col_type = col.sql_type == 'geography' ? col.sql_type : col.type
-      case (col_type ||= col.sql_type)
+      col_type = col&.sql_type == 'geography' ? col.sql_type : col&.type
+      case (col_type ||= col&.sql_type)
       when :string, :text %>
         <% if is_bcrypt?(val) # || .readonly?
              is_revert = false %>
@@ -1489,9 +1507,9 @@ end
                        # association that points to an STI model then filtering for the __able_type column is done
                        # with a .where(). And the polymorphic class name it points to is the base class name of
                        # the STI model instead of its subclass.
-                       if (poly_type = #{poly_type.inspect}) &&
-                           @#{obj_name}.respond_to?(:#{@_brick_model.inheritance_column}) &&
-                           (base_type = collection.where_values_hash[poly_type])
+                       poly_type = #{poly_type.inspect}
+                       if poly_type && @#{obj_name}.respond_to?(:#{@_brick_model.inheritance_column}) &&
+                          (base_type = collection.where_values_hash[poly_type])
                          collection = collection.rewhere(poly_type => [base_type, @#{obj_name}.#{@_brick_model.inheritance_column}])
                        end"
       end

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

@@ -162,8 +162,9 @@ module Brick::Rails::FormTags
                    @_brick_model
     # If not provided, do a best-effort to automatically determine the resource class or object
     filter_parts = []
+    rel_name = nil
     klass_or_obj ||= begin
-                       klass, sti_type = ::Brick.ctrl_to_klass(controller_path)
+                       klass, sti_type, rel_name = ::Brick.ctrl_to_klass(controller_path)
                        if klass
                          type_col = klass.inheritance_column # Usually 'type'
                          filter_parts << "#{type_col}=#{sti_type}" if sti_type && klass.column_names.include?(type_col)
@@ -202,11 +203,11 @@ module Brick::Rails::FormTags
       app_routes = Rails.application.routes # In case we're operating in another engine, reference the application since Brick routes are placed there.
       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) : "#{app_routes.path_for(controller: klass_or_obj.base_class._brick_index(nil, '/'), 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), 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) : "#{app_routes.path_for(controller: klass_or_obj.class.base_class._brick_index(nil, '/'), 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), 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/version_number.rb

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

data/lib/brick.rb

@@ -135,7 +135,7 @@ module Brick
       @existing_stis ||= Brick.config.sti_namespace_prefixes.each_with_object({}) { |snp, s| s[snp.first[2..-1]] = snp.last unless snp.first.end_with?('::') }
     end
 
-    attr_accessor :default_schema, :db_schemas, :routes_done, :is_oracle, :is_eager_loading, :auto_models
+    attr_accessor :default_schema, :db_schemas, :routes_done, :is_oracle, :is_eager_loading, :auto_models, :initializer_loaded
 
     def set_db_schema(params = nil)
       # If Apartment::Tenant.current is not still the default (usually 'public') then an elevator has brought us into
@@ -601,7 +601,7 @@ In config/initializers/brick.rb appropriate entries would look something like:
     def display_classes(prefix, rels, max_length)
       rels.sort.each do |rel|
         (::Brick.auto_models ||= []) << rel.first
-        puts "#{rel.first}#{' ' * (max_length - rel.first.length)}  /#{prefix}#{rel.last}"
+        puts "#{rel.first}#{' ' * (max_length - rel.first.length)}  /#{prefix}#{"#{rel[1]}/" if rel[1]}#{rel.last}"
       end
       puts "\n"
     end
@@ -620,16 +620,21 @@ In config/initializers/brick.rb appropriate entries would look something like:
       end
 
       c_path_parts = ctrl_path.split('/')
+      found = nil
       while c_path_parts.present?
         possible_c_path = c_path_parts.join('.')
         possible_c_path_singular = c_path_parts[0..-2] + [c_path_parts.last.singularize]
         possible_sti = possible_c_path_singular.join('/').camelize
         break if (
-                   res_name = res_names[possible_c_path] ||
+                   res_name = res_names[found = possible_c_path] ||
                               ((klass = Brick.config.sti_namespace_prefixes.key?("::#{possible_sti}") && possible_sti.constantize) &&
                                (sti_type = possible_sti)) ||
                               # %%% Used to have the more flexible:  (DidYouMean::SpellChecker.new(dictionary: res_names.keys).correct(possible_c_path)).first
-                              res_names[possible_c_path] || res_names[possible_c_path_singular.join('.')]
+                              res_names[found = possible_c_path] || res_names[found = possible_c_path_singular.join('.')] ||
+                              ((::Brick.config.table_name_prefixes.key?(tn_prefix = c_path_parts.first) ||
+                                ::Brick.config.table_name_prefixes.key?(tn_prefix = "#{c_path_parts.first}_")) &&
+                               res_names[found = tn_prefix + c_path_parts.last]
+                              )
                  ) &&
                  (
                    klass ||
@@ -638,7 +643,7 @@ In config/initializers/brick.rb appropriate entries would look something like:
                  )
         c_path_parts.shift
       end
-      [klass, sti_type]
+      [klass, sti_type, found]
     end
   end
 
@@ -657,10 +662,14 @@ In config/initializers/brick.rb appropriate entries would look something like:
           table_class_length = 38 # Length of "Classes that can be built from tables:"
           view_class_length = 37 # Length of "Classes that can be built from views:"
 
-          brick_routes_create = lambda do |schema_name, res_name, options|
-            if schema_name # && !Object.const_defined('Apartment')
-              send(:namespace, schema_name) do
-                send(:resources, res_name.to_sym, **options)
+          brick_namespace_create = lambda do |path_names, res_name, options|
+            if path_names&.present?
+              if (path_name = path_names.pop).is_a?(Array)
+                module_name = path_name[1]
+                path_name = path_name.first
+              end
+              send(:scope, { module: module_name || path_name, path: path_name, as: path_name }) do
+                brick_namespace_create.call(path_names, res_name, options)
               end
             else
               send(:resources, res_name.to_sym, **options)
@@ -676,15 +685,49 @@ In config/initializers/brick.rb appropriate entries would look something like:
                            end
           versioned_views = {} # Track which views have already been done for each api_root
           ::Brick.relations.each do |k, v|
-            next if !(controller_name = v.fetch(:resource, nil)&.pluralize) || existing_controllers.key?(controller_name)
-
-            object_name = k.split('.').last # Take off any first schema part
             if (schema_name = v.fetch(:schema, nil))
               schema_prefix = "#{schema_name}."
             end
+
+            next if !(resource_name = v.fetch(:resource, nil)) ||
+                    existing_controllers.key?(controller_name = (
+                                                resource_name = "#{schema_prefix&.tr('.', '/')}#{resource_name}"
+                                             ).pluralize)
+
+            object_name = k.split('.').last # Take off any first schema part
+
+            full_schema_prefix = if (aps = v.fetch(:auto_prefixed_schema, nil))
+                                   aps = aps[0..-2] if aps[-1] == '_'
+                                   (schema_prefix&.dup || +'') << "#{aps}."
+                                 else
+                                   schema_prefix
+                                 end
+
+            # Track routes being built
+            if (class_name = v.fetch(:class_name, nil))
+              if v.key?(:isView)
+                view_class_length = class_name.length if class_name.length > view_class_length
+                views
+              else
+                table_class_length = class_name.length if class_name.length > table_class_length
+                tables
+              end << [class_name, aps, resource_name]
+            end
+
             options = {}
             options[:only] = [:index, :show] if v.key?(:isView)
-            # First do the API routes if necessary
+
+            # First do the normal routes
+            prefixes = []
+            prefixes << [aps, v[:class_name]&.split('::')[-2]&.underscore] if aps
+            prefixes << schema_name if schema_name
+            prefixes << path_prefix if path_prefix
+            brick_namespace_create.call(prefixes, v[:resource], options)
+            sti_subclasses.fetch(class_name, nil)&.each do |sc| # Add any STI subclass routes for this relation
+              brick_namespace_create.call(prefixes, sc.underscore.tr('/', '_').pluralize, options)
+            end
+
+            # Now the API routes if necessary
             full_resource = nil
             ::Brick.api_roots&.each do |api_root|
               api_done_views = (versioned_views[api_root] ||= {})
@@ -742,7 +785,7 @@ In config/initializers/brick.rb appropriate entries would look something like:
                 proc_result = if (filter = ::Brick.config.api_filter).is_a?(Proc)
                                 begin
                                   num_args = filter.arity.negative? ? 6 : filter.arity
-                                  filter.call(*[unversioned, k, actions, api_ver_num, found, test_ver_num][0...num_args])
+                                  filter.call(*[unversioned, k, view_relation, actions, api_ver_num, found, test_ver_num][0...num_args])
                                 rescue StandardError => e
                                   puts "::Brick.api_filter Proc error: #{e.message}"
                                 end
@@ -786,9 +829,8 @@ In config/initializers/brick.rb appropriate entries would look something like:
                 # view_ver_num = if (first_part = k.split('_').first) =~ /^v[\d_]+/
                 #                  first_part[1..-1].gsub('_', '.').to_i
                 #                end
-
                 controller_name = if (last = view_relation.fetch(:resource, nil)&.pluralize)
-                                    "#{schema_prefix}#{last}"
+                                    "#{full_schema_prefix}#{last}"
                                   else
                                     found
                                   end.tr('.', '/')
@@ -811,33 +853,6 @@ In config/initializers/brick.rb appropriate entries would look something like:
                 end
               end
             end
-
-            # Track routes being built
-            if (class_name = v.fetch(:class_name, nil))
-              if v.key?(:isView)
-                view_class_length = class_name.length if class_name.length > view_class_length
-                views
-              else
-                table_class_length = class_name.length if class_name.length > table_class_length
-                tables
-              end << [class_name, "#{schema_prefix&.tr('.', '/')}#{v[:resource]}"]
-            end
-
-            # Now the normal routes
-            if path_prefix
-              # Was:  send(:scope, path: path_prefix) do
-              send(:namespace, path_prefix) do
-                brick_routes_create.call(schema_name, v[:resource], options)
-                sti_subclasses.fetch(class_name, nil)&.each do |sc| # Add any STI subclass routes for this relation
-                  brick_routes_create.call(schema_name, sc.underscore.tr('/', '_').pluralize, options)
-                end
-              end
-            else
-              brick_routes_create.call(schema_name, v[:resource], options)
-              sti_subclasses.fetch(class_name, nil)&.each do |sc| # Add any STI subclass routes for this relation
-                brick_routes_create.call(schema_name, sc.underscore.tr('/', '_').pluralize, options)
-              end
-            end
           end
 
           if ::Brick.config.add_status && instance_variable_get(:@set).named_routes.names.exclude?(:brick_status)
@@ -857,7 +872,7 @@ In config/initializers/brick.rb appropriate entries would look something like:
             if Object.const_defined?('Rswag::Ui')
               rswag_path = ::Rails.application.routes.routes.find { |r| r.app.app == Rswag::Ui::Engine }&.instance_variable_get(:@path_formatter)&.instance_variable_get(:@parts)&.join
               first_endpoint_parts = nil
-              (doc_endpoints = Rswag::Ui.config.config_object[:urls]&.uniq!)&.each do |doc_endpoint|
+              (doc_endpoints = Rswag::Ui.config.config_object[:urls])&.each do |doc_endpoint|
                 puts "Mounting OpenApi 3.0 documentation endpoint for \"#{doc_endpoint[:name]}\" on #{doc_endpoint[:url]}"
                 send(:get, doc_endpoint[:url], { to: 'brick_openapi#index' })
                 endpoint_parts = doc_endpoint[:url]&.split('/')
@@ -1192,8 +1207,13 @@ ActiveSupport.on_load(:active_record) do
     arsc.class_exec do
       def self.create(connection, callable = nil, &block)
         relation = (callable || block).call ::ActiveRecord::StatementCache::Params.new
-        bind_map = ::ActiveRecord::StatementCache::BindMap.new relation.bound_attributes
-        query_builder = connection.cacheable_query(self, relation.arel)
+        bind_map = ::ActiveRecord::StatementCache::BindMap.new(
+                     # AR <= 4.2 uses relation.bind_values
+                     relation.respond_to?(:bound_attributes) ? relation.bound_attributes : relation.bind_values
+                   )
+        options = [self, relation.arel]
+        options.shift if connection.method(:cacheable_query).arity == 1 # Rails <= 5.0
+        query_builder = connection.cacheable_query(*options)
         new query_builder, bind_map
       end
     end
@@ -1237,7 +1257,8 @@ ActiveSupport.on_load(:active_record) do
     end
   end
 
-  if Psych.respond_to?(:unsafe_load) && ActiveRecord.version < ::Gem::Version.new('6.1')
+  if ActiveRecord.version < ::Gem::Version.new('6.1') &&
+     Psych.method(:load).parameters.any? { |param| param.first == :key && param.last == :aliases }
     Psych.class_exec do
       class << self
         alias _original_load load
@@ -1279,7 +1300,9 @@ ActiveSupport.on_load(:active_record) do
       def initialize(base, associations, joins, eager_loading: true)
         araat = ::ActiveRecord::Associations::AliasTracker
         if araat.respond_to?(:create_with_joins) # Rails 5.0 and 5.1
-          @alias_tracker = araat.create_with_joins(base.connection, base.table_name, joins)
+          cwj_options = [base.connection, base.table_name, joins]
+          cwj_options << base.type_caster if araat.method(:create_with_joins).arity > 3 # Rails <= 5.1
+          @alias_tracker = araat.create_with_joins(*cwj_options)
           @eager_loading = eager_loading # (Unused in Rails 5.0)
         else # Rails 4.2
           @alias_tracker = araat.create(base.connection, joins)
@@ -1648,21 +1671,24 @@ if ActiveRecord.version < ::Gem::Version.new('6.0') && ruby_version >= ::Gem::Ve
   end
 
   require 'active_model'
-  require 'active_model/type'
-  require 'active_model/type/value'
-  class ActiveModel::Type::Value
-    def initialize(*args, precision: nil, limit: nil, scale: nil)
-      @precision = precision
-      @scale = scale
-      @limit = limit
+  begin
+    require 'active_model/type'
+    require 'active_model/type/value'
+    class ActiveModel::Type::Value
+      def initialize(*args, precision: nil, limit: nil, scale: nil)
+        @precision = precision
+        @scale = scale
+        @limit = limit
+      end
     end
+  rescue LoadError => e # AR <= 4.2 doesn't have ActiveModel::Type
   end
 
   if Object.const_defined?('I18n')
     module I18n::Base
       alias _brick_translate translate
       def translate(key = nil, *args, throw: false, raise: false, locale: nil, **options)
-        options.merge!(args.pop) if args.length > 0 && args.last.is_a?(Hash)
+        options.merge!(args.pop) if args.last.is_a?(Hash)
         _brick_translate(key = nil, throw: false, raise: false, locale: nil, **options)
       end
     end
@@ -1673,8 +1699,12 @@ if ActiveRecord.version < ::Gem::Version.new('6.0') && ruby_version >= ::Gem::Ve
 
     # Creates the authenticity token for the current request.
     def form_authenticity_token(*args, form_options: {}) # :doc:
-      form_options.merge!(args.pop) if args.length > 0 && args.last.is_a?(Hash)
-      masked_authenticity_token(session, form_options: form_options)
+      if method(:masked_authenticity_token).arity == 1
+        masked_authenticity_token(session) # AR <= 4.2 doesn't use form_options
+      else
+        form_options.merge!(args.pop) if args.last.is_a?(Hash)
+        masked_authenticity_token(session, form_options: form_options)
+      end
     end
   end
 
@@ -1684,7 +1714,7 @@ if ActiveRecord.version < ::Gem::Version.new('6.0') && ruby_version >= ::Gem::Ve
         encrypted = if method(:_encrypt).arity == 1
                       _encrypt(value) # Rails <= 5.1
                     else
-                      if args.length > 0 && args.last.is_a?(Hash)
+                      if args.last.is_a?(Hash)
                         expires_at ||= args.last[:expires_at]
                         expires_in ||= args.last[:expires_in]
                         purpose ||= args.last[:purpose]
@@ -1697,7 +1727,7 @@ if ActiveRecord.version < ::Gem::Version.new('6.0') && ruby_version >= ::Gem::Ve
     if const_defined?('Messages')
       class Messages::Metadata
         def self.wrap(message, *args, expires_at: nil, expires_in: nil, purpose: nil)
-          if args.length > 0 && args.last.is_a?(Hash)
+          if args.last.is_a?(Hash)
             expires_at ||= args.last[:expires_at]
             expires_in ||= args.last[:expires_in]
             purpose ||= args.last[:purpose]

data/lib/generators/brick/install_generator.rb

@@ -139,7 +139,7 @@ module Brick
 # Settings for the Brick gem
 # (By default this auto-creates models, controllers, views, and routes on-the-fly.)
 
-if ActiveRecord::Base.respond_to?(:brick_select)
+if ActiveRecord::Base.respond_to?(:brick_select) && !::Brick.initializer_loaded
   # Mode -- generally :on or :off, or only in :development.  Also available is :diag_env which enables only
   # when the environment variable BRICK is set.
   Brick.mode = :development

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.108
+  version: 1.0.110
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-21 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord