brick 1.0.191 → 1.0.192

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 193982ca353a787d619e46d02b5d7a671c2b05936a2bf96c7f4c92fbba2b467c
-  data.tar.gz: 065f9abdc32f6d6413caf955ab7f01cd2a300b24532f215471aadf82ec9bdc93
+  metadata.gz: 148c8f46702d06322322c04487a1045e6d7a3927611394a84ffe138be78adb5e
+  data.tar.gz: 716bfaae50dc99809bc3aee4eecf5ff1c44325bca54271db225a765cdd97fb56
 SHA512:
-  metadata.gz: 363c321fac7e13b4ccbe4bd9ed8b10f1a525641c0da3db0c5ee2bc49f6b1a7b0b0254c11fdb9d42c4ab2ab2c9c7e673a4f6c25e063315bcafcede48cc3096692
-  data.tar.gz: 9f27685f8621482b2130a66d5c7d149d41b108dc73f800d060f26ab757f09f06bb3c675b22db0dc37e666a55cdcd0b5ead274232913893d48881809cbf58e72e
+  metadata.gz: d97d94ed8d951718b34d1fc0d3ee8d023b3765bafc759fd41161155c927014ddec54a67e371363bbb17b18a614f4be16862d9cb51be313438050a3ce6e3356a2
+  data.tar.gz: efbd8b062eccd5d5441aa8e9fe6162bce076e188761f5c7877f9ca454899fc13873fa6cdf4db21cd2154e24c824487f56a085f41402432bd99486e17213e7f00

data/lib/brick/extensions.rb

@@ -82,8 +82,10 @@ module ActiveRecord
 
       def json_column?(col)
         col.type == :json || ::Brick.config.json_columns[table_name]&.include?(col.name) ||
-        (respond_to?(:attribute_types) && (attr_types = attribute_types[col.name]).respond_to?(:coder) &&
-         (attr_types.coder.is_a?(Class) ? attr_types.coder : attr_types.coder&.class)&.name&.end_with?('JSON'))
+        (
+          respond_to?(:attribute_types) && (attr_types = attribute_types[col.name]).respond_to?(:coder) &&
+          (attr_types.coder.is_a?(Class) ? attr_types.coder : attr_types.coder&.class)&.name&.end_with?('JSON')
+        )
       end
 
       def brick_foreign_type(assoc)
@@ -284,7 +286,10 @@ module ActiveRecord
                         end
                         this_obj&.to_s || ''
                       end
-              is_brackets_have_content = true unless datum.blank?
+              begin
+                is_brackets_have_content = true unless datum.blank?
+              rescue
+              end
               output << (datum || '')
               bracket_name = nil
             else
@@ -1357,7 +1362,7 @@ end
                    end
                  rescue NameError # If the const_get for the model has failed...
                    skip_controller = true
-                   # ... then just fall through and allow it to fail when trying to loading the ____Controller class normally.
+                   # ... then just fall through and allow it to fail when trying to load the ____Controller class normally.
                  end
                end
                unless skip_controller
@@ -1742,7 +1747,7 @@ class Object
                 options[:optional] = true if assoc.key?(:optional)
                 if assoc.key?(:polymorphic) ||
                    # If a polymorphic association is missing but could be established then go ahead and put it into place.
-                   relations[assoc[:inverse_table]][:class_name].constantize.reflect_on_all_associations.find { |inv_assoc| !inv_assoc.belongs_to? && inv_assoc.options[:as].to_s == assoc[:assoc_name] }
+                   relations.fetch(assoc[:inverse_table], nil)&.fetch(:class_name, nil)&.constantize&.reflect_on_all_associations&.find { |inv_assoc| !inv_assoc.belongs_to? && inv_assoc.options[:as].to_s == assoc[:assoc_name] }
                   assoc[:polymorphic] ||= true
                   options[:polymorphic] = true
                 else
@@ -2645,6 +2650,10 @@ end.class_exec do
     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)
+
+      # --------------------------------------------
+      # 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
@@ -2695,6 +2704,8 @@ end.class_exec do
       # Only for Postgres  (Doesn't work in sqlite3 or MySQL)
       # puts ActiveRecord::Base.execute_sql("SELECT current_setting('SEARCH_PATH')").to_a.inspect
 
+      # ---------------------------
+      # 2. Figure out schema things
       is_postgres = nil
       is_mssql = ActiveRecord::Base.connection.adapter_name == 'SQLServer'
       case ActiveRecord::Base.connection.adapter_name
@@ -2767,6 +2778,8 @@ end.class_exec do
 
       ::Brick.db_schemas ||= {}
 
+      # ---------------------
+      # 3. Tables and columns
       # %%% Retrieve internal ActiveRecord table names like this:
       # ActiveRecord::Base.internal_metadata_table_name, ActiveRecord::Base.schema_migrations_table_name
       # For if it's not SQLite -- so this is the Postgres and MySQL version
@@ -2896,20 +2909,34 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
       #   end
       # end
       # schema = ::Brick.default_schema # Reset back for this next round of fun
+
+      # ---------------------------------------------
+      # 4. Foreign key info
+      # (done in two parts which get JOINed together in Ruby code)
       kcus = nil
+      entry_type = nil
       case ActiveRecord::Base.connection.adapter_name
       when 'PostgreSQL', 'Mysql2', 'Trilogy', 'SQLServer'
-        # All KCUs -- use this to virtually JOIN against fk_references in Ruby code
+        # Part 1 -- all KCUs
         sql = "SELECT CONSTRAINT_CATALOG, CONSTRAINT_SCHEMA, CONSTRAINT_NAME, ORDINAL_POSITION,
                       TABLE_NAME, COLUMN_NAME
               FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE#{"
-              WHERE CONSTRAINT_SCHEMA = COALESCE(current_setting('SEARCH_PATH'), 'public')" if is_postgres && schema }"
+              WHERE CONSTRAINT_SCHEMA = COALESCE(current_setting('SEARCH_PATH'), 'public')" if is_postgres && schema }#{"
+              WHERE CONSTRAINT_SCHEMA = '#{ActiveRecord::Base.connection.current_database&.tr("'", "''")}'" if is_mysql
+              }"
         kcus = ActiveRecord::Base.execute_sql(sql).each_with_object({}) do |v, s|
-                 key = "#{v.fetch('constraint_name', v[2])}.#{v.fetch('constraint_schema', v[1])}.#{v.fetch('constraint_catalog', v[0])}.#{v.fetch('ordinal_position', v[3])}"
-                 key << ".#{v.fetch('table_name', v[4])}.#{v.fetch('column_name', v[5])}" unless is_postgres || is_mssql
-                 s[key] = [v.fetch('constraint_schema', v[1]), v.fetch('table_name', v[4])]
+                 if (entry_type ||= v.is_a?(Array) ? :array : :hash) == :hash
+                   key = "#{v['constraint_name']}.#{v['constraint_schema']}.#{v['constraint_catalog']}.#{v['ordinal_position']}"
+                   key << ".#{v['table_name']}.#{v['column_name']}" unless is_postgres || is_mssql
+                   s[key] = [v['constraint_schema'], v['table_name']]
+                 else # Array
+                   key = "#{v[2]}.#{v[1]}.#{v[0]}.#{v[3]}"
+                   key << ".#{v[4]}.#{v[5]}" unless is_postgres || is_mssql
+                   s[key] = [v[1], v[4]]
+                 end
                end
 
+        # Part 2 -- fk_references
         sql = "SELECT kcu.CONSTRAINT_SCHEMA, kcu.TABLE_NAME, kcu.COLUMN_NAME,
             #{# These will get filled in with real values (effectively doing the JOIN in Ruby)
               is_postgres || is_mssql ? 'NULL as primary_schema, NULL as primary_table' :
@@ -2921,7 +2948,8 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
               ON kcu.CONSTRAINT_CATALOG = rc.CONSTRAINT_CATALOG
               AND kcu.CONSTRAINT_SCHEMA = rc.CONSTRAINT_SCHEMA
               AND kcu.CONSTRAINT_NAME = rc.CONSTRAINT_NAME#{"
-          WHERE kcu.CONSTRAINT_SCHEMA = COALESCE(current_setting('SEARCH_PATH'), 'public')" if is_postgres && schema }"
+          WHERE kcu.CONSTRAINT_SCHEMA = COALESCE(current_setting('SEARCH_PATH'), 'public')" if is_postgres && schema}#{"
+          WHERE kcu.CONSTRAINT_SCHEMA = '#{ActiveRecord::Base.connection.current_database&.tr("'", "''")}'" if is_mysql}"
         fk_references = ActiveRecord::Base.execute_sql(sql)
       when 'SQLite'
         sql = "SELECT NULL AS constraint_schema, m.name, fkl.\"from\", NULL AS primary_schema, fkl.\"table\", m.name || '_' || fkl.\"from\" AS constraint_name
@@ -2952,8 +2980,10 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
       ::Brick.default_schema ||= 'public' if is_postgres
       fk_references&.each do |fk|
         fk = fk.values unless fk.is_a?(Array)
-        # Virtually JOIN against fk_references in order to change out the primary schema and primary table
-        if (kcu = kcus&.fetch("#{fk[6]}.#{fk[7]}.#{fk[8]}.#{fk[9]}", nil))
+        # Virtually JOIN KCUs to fk_references in order to fill in the primary schema and primary table
+        kcu_key = "#{fk[6]}.#{fk[7]}.#{fk[8]}.#{fk[9]}"
+        kcu_key << ".#{fk[3]}.#{fk[4]}" unless is_postgres || is_mssql
+        if (kcu = kcus&.fetch(kcu_key, nil))
           fk[3] = kcu[0]
           fk[4] = kcu[1]
         end
@@ -3044,24 +3074,39 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
     ::Brick.load_additional_references if ::Brick.initializer_loaded
 
     if is_postgres
+      params = []
       ActiveRecord::Base.execute_sql("-- inherited and partitioned tables counts
-      SELECT parent.relname,
+      SELECT n.nspname, parent.relname,
         ((SUM(child.reltuples::float) / greatest(SUM(child.relpages), 1))) *
         (SUM(pg_relation_size(child.oid))::float / (current_setting('block_size')::float))::integer AS rowcount
       FROM pg_inherits
         INNER JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
         INNER JOIN pg_class child ON pg_inherits.inhrelid = child.oid
-      GROUP BY parent.relname, child.reltuples, child.relpages, child.oid
+        INNER JOIN pg_catalog.pg_namespace n ON n.oid = parent.relnamespace#{
+    if schema
+      params = params << schema
+      "
+      WHERE n.nspname = COALESCE(?, 'public')"
+    end}
+      GROUP BY n.nspname, parent.relname, child.reltuples, child.relpages, child.oid
 
       UNION ALL
 
       -- table count
-      SELECT relname,
-        (reltuples::float / greatest(relpages, 1)) *
+      SELECT n.nspname, pg_class.relname,
+        (pg_class.reltuples::float / greatest(pg_class.relpages, 1)) *
           (pg_relation_size(pg_class.oid)::float / (current_setting('block_size')::float))::integer AS rowcount
       FROM pg_class
-      GROUP BY relname, reltuples, relpages, oid").each do |tblcount|
-        relations.fetch(tblcount['relname'], nil)&.[]=(:rowcount, tblcount['rowcount'].round)
+        INNER JOIN pg_catalog.pg_namespace n ON n.oid = pg_class.relnamespace#{
+    if schema
+      params = params << schema
+      "
+      WHERE n.nspname = COALESCE(?, 'public')"
+    end}
+      GROUP BY n.nspname, pg_class.relname, pg_class.reltuples, pg_class.relpages, pg_class.oid", params).each do |tblcount|
+        # %%% What is the default schema here?
+        prefix = "#{tblcount['nspname']}." unless tblcount['nspname'] == (schema || 'public')
+        relations.fetch("#{prefix}#{tblcount['relname']}", nil)&.[]=(:rowcount, tblcount['rowcount'].to_i.round)
       end
     end
 
@@ -3430,7 +3475,7 @@ module Brick
       separator ||= '_'
       res_name = (tbl_name_parts = tbl_name.split('.'))[0..-2].first
       res_name << '.' if res_name
-      (res_name ||= +'') << (relation || ::Brick.relations.fetch(tbl_name, nil)&.fetch(:resource, nil) || tbl_name_parts.last)
+      (res_name ||= +'') << (relation || ::Brick.relations.fetch(tbl_name, nil))&.fetch(:resource, nil) || tbl_name_parts.last
 
       res_parts = ((mode == :singular) ? res_name.singularize : res_name).split('.')
       res_parts.shift if ::Brick.apartment_multitenant && res_parts.length > 1 && res_parts.first == ::Brick.apartment_default_tenant

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

@@ -345,7 +345,8 @@ function linkSchemas() {
                                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?('::')
+                             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
                     end
@@ -1583,7 +1584,13 @@ end %>#{"
 #{schema_options}" if schema_options}
 <select id=\"tbl\">#{table_options}</select>
 <table id=\"resourceName\"><td><h1><%= page_title %></h1></td>
-<% if Object.const_defined?('Avo') && ::Avo.respond_to?(:railtie_namespace) %>
+<% rel = Brick.relations[#{model_name}.table_name]
+   if (in_app = rel.fetch(:existing, nil)&.fetch(:show, nil))
+     in_app = send(\"#\{in_app}_path\", #{pk.is_a?(String) ? "obj.#{pk}" : '[' + pk.map { |pk_part| "obj.#{pk_part}" }.join(', ') + ']' }) if in_app.is_a?(Symbol) %>
+     <td><%= link_to(::Brick::Rails::IN_APP.html_safe, in_app) %></td>
+<% end
+
+   if Object.const_defined?('Avo') && ::Avo.respond_to?(:railtie_namespace) %>
   <td><%= link_to_brick(
       ::Brick::Rails::AVO_SVG.html_safe,
       { show_proc: Proc.new do |obj, relation|
@@ -1608,7 +1615,7 @@ end %>#{"
    end %>
 </table>
 <%
-if (description = (relation = Brick.relations[#{model_name}.table_name])&.fetch(:description, nil)) %>
+if (description = rel&.fetch(:description, nil)) %>
   <span class=\"__brick\"><%= description %></span><br><%
 end
 %><%= link_to \"(See all #\{model_name.pluralize})\", see_all_path, { class: '__brick' } %>
@@ -1939,6 +1946,7 @@ document.querySelectorAll(\"input, select\").forEach(function (inp) {
         end
 
         if ::Brick.enable_routes?
+          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

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

@@ -148,7 +148,8 @@ module Brick::Rails::FormBuilder
       '(hidden)'
     else
       if val.is_a?(String)
-        val = val.dup.force_encoding('UTF-8').strip
+        return ::Brick::Rails.display_binary(val) unless (val_utf8 = val.dup.force_encoding('UTF-8')).valid_encoding?
+        val = val_utf8.strip
         return CGI.escapeHTML(val) if is_xml
   
         if val.length > max_len

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

@@ -2,7 +2,7 @@ module Brick::Rails::FormTags
   # Our super speedy grid
   def brick_grid(relation = nil, sequence = nil, inclusions = nil, exclusions = nil,
                  cols = {}, bt_descrip: nil, poly_cols: nil, bts: {}, hms_keys: [], hms_cols: {},
-                 show_header: nil, show_row_count: nil, show_erd_button: nil, show_new_button: nil, show_avo_button: nil, show_aa_button: nil)
+                 show_header: nil, show_row_count: nil, show_erd_button: nil, show_in_app_button: nil, show_new_button: nil, show_avo_button: nil, show_aa_button: nil)
     # When a relation is not provided, first see if one exists which matches the controller name
     unless (relation ||= instance_variable_get("@#{controller_name}".to_sym))
       # Failing that, dig through the instance variables with hopes to find something that is an ActiveRecord::Relation
@@ -33,6 +33,7 @@ module Brick::Rails::FormTags
     out = +"<div id=\"headerTopContainer\"><table id=\"headerTop\"></table>
 "
     klass = relation.klass
+    rel = ::Brick.relations&.fetch(relation.table_name, nil)
     unless show_header == false
       out << "  <div id=\"headerTopAddNew\">
     <div id=\"headerButtonBox\">
@@ -43,6 +44,11 @@ module Brick::Rails::FormTags
       end
       unless show_erd_button == false
         out << "      <div id=\"imgErd\" title=\"Show ERD\"></div>
+"
+      end
+      if rel && show_in_app_button != false && (in_app = rel.fetch(:existing, nil)&.fetch(:index, nil))
+        in_app = send("#{in_app}_path") if in_app.is_a?(Symbol)
+        out << "      <td title=\"Show in app\">#{link_to(::Brick::Rails::IN_APP.html_safe, in_app)}</td>
 "
       end
       if show_avo_button != false && Object.const_defined?('Avo') && ::Avo.respond_to?(:railtie_namespace) && klass.name.exclude?('::')
@@ -254,7 +260,7 @@ module Brick::Rails::FormTags
       out << '</tr>'
       row_count += 1
     end
-    if (total_row_count = ::Brick.relations[table_name].fetch(:rowcount, nil))
+    if rel && (total_row_count = rel.fetch(:rowcount, nil))
       total_row_count = total_row_count > row_count ? " (out of #{total_row_count})" : nil
     end
     out << "  </tbody>

data/lib/brick/frameworks/rails.rb

@@ -15,4 +15,10 @@ module ::Brick::Rails
 
   AA_PNG = "<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEEAAAAgCAYAAABNXxW6AAAMPmlDQ1BJQ0MgUHJvZmlsZQAASImVVwdYU8kWnluSkEBooUsJvQkiNYCUEFoA6V1UQhIglBgDQcVeFhVcu1jAhq6KKFhpFhRRLCyKvS8WVJR1sWBX3qSArvvK9873zb3//efMf86cO7cMAGonOCJRHqoOQL6wUBwbEkBPTkmlk54CBOgCGsAAgcMtEDGjoyMAtKHz3+3ddegN7YqDVOuf/f/VNHj8Ai4ASDTEGbwCbj7EhwDAK7kicSEARClvPqVQJMWwAS0xTBDiRVKcJceVUpwhx/tkPvGxLIjbAFBS4XDEWQCoXoI8vYibBTVU+yF2EvIEQgDU6BD75udP4kGcDrEN9BFBLNVnZPygk/U3zYxhTQ4naxjL5yIzpUBBgSiPM+3/LMf/tvw8yVAMK9hUssWhsdI5w7rdzJ0ULsUqEPcJMyKjINaE+IOAJ/OHGKVkS0IT5P6oIbeABWsGdCB24nECwyE2hDhYmBcZoeAzMgXBbIjhCkGnCgrZ8RDrQbyIXxAUp/DZIp4Uq4iF1meKWUwFf5YjlsWVxrovyU1gKvRfZ/PZCn1MtTg7PgliCsQWRYLESIhVIXYsyI0LV/iMKc5mRQ75iCWx0vwtII7lC0MC5PpYUaY4OFbhX5pfMDRfbEu2gB2pwAcKs+ND5fXB2rgcWf5wLtglvpCZMKTDL0iOGJoLjx8YJJ879owvTIhT6HwQFQbEysfiFFFetMIfN+PnhUh5M4hdC4riFGPxxEK4IOX6eKaoMDpenidenMMJi5bngy8HEYAFAgEdSGDLAJNADhB09jX0wSt5TzDgADHIAnzgoGCGRiTJeoTwGAeKwZ8Q8UHB8LgAWS8fFEH+6zArPzqATFlvkWxELngCcT4IB3nwWiIbJRyOlggeQ0bwj+gc2Lgw3zzYpP3/nh9ivzNMyEQoGMlQRLrakCcxiBhIDCUGE21xA9wX98Yj4NEfNmecgXsOzeO7P+EJoYvwkHCN0E24NVEwT/xTlmNBN9QPVtQi48da4FZQ0w0PwH2gOlTGdXAD4IC7wjhM3A9GdoMsS5G3tCr0n7T/NoMf7obCj+xERsm6ZH+yzc8jVe1U3YZVpLX+sT7yXDOG680a7vk5PuuH6vPgOfxnT2wRdhBrx05i57CjWAOgYy1YI9aBHZPi4dX1WLa6hqLFyvLJhTqCf8QburPSShY41Tj1On2R9xXyp0rf0YA1STRNLMjKLqQz4ReBT2cLuY4j6c5Ozi4ASL8v8tfXmxjZdwPR6fjOzf8DAJ+WwcHBI9+5sBYA9nvAx7/pO2fDgJ8OZQDONnEl4iI5h0sPBPiWUINPmj4wBubABs7HGbgDb+APgkAYiALxIAVMgNlnw3UuBlPADDAXlIAysBysARvAZrAN7AJ7wQHQAI6Ck+AMuAAugWvgDlw9PeAF6AfvwGcEQUgIFaEh+ogJYonYI84IA/FFgpAIJBZJQdKRLESISJAZyHykDFmJbEC2ItXIfqQJOYmcQ7qQW8gDpBd5jXxCMVQF1UKNUCt0FMpAmWg4Go+OR7PQyWgxugBdiq5Dq9A9aD16Er2AXkO70RfoAAYwZUwHM8UcMAbGwqKwVCwTE2OzsFKsHKvCarFmeJ+vYN1YH/YRJ+I0nI47wBUciifgXHwyPgtfgm/Ad+H1eBt+BX+A9+PfCFSCIcGe4EVgE5IJWYQphBJCOWEH4TDhNHyWegjviESiDtGa6AGfxRRiDnE6cQlxI7GOeILYRXxEHCCRSPoke5IPKYrEIRWSSkjrSXtILaTLpB7SByVlJRMlZ6VgpVQlodI8pXKl3UrHlS4rPVX6TFYnW5K9yFFkHnkaeRl5O7mZfJHcQ/5M0aBYU3wo8ZQcylzKOkot5TTlLuWNsrKymbKncoyyQHmO8jrlfcpnlR8of1TRVLFTYamkqUhUlqrsVDmhckvlDZVKtaL6U1OphdSl1GrqKep96gdVmqqjKluVpzpbtUK1XvWy6ks1spqlGlNtglqxWrnaQbWLan3qZHUrdZY6R32WeoV6k/oN9QENmsZojSiNfI0lGrs1zmk80yRpWmkGafI0F2hu0zyl+YiG0cxpLBqXNp+2nXaa1qNF1LLWYmvlaJVp7dXq1OrX1tR21U7UnqpdoX1Mu1sH07HSYevk6SzTOaBzXeeTrpEuU5evu1i3Vvey7nu9EXr+eny9Ur06vWt6n/Tp+kH6ufor9Bv07xngBnYGMQZTDDYZnDboG6E1wnsEd0TpiAMjbhuihnaGsYbTDbcZdhgOGBkbhRiJjNYbnTLqM9Yx9jfOMV5tfNy414Rm4msiMFlt0mLynK5NZ9Lz6OvobfR+U0PTUFOJ6VbTTtPPZtZmCWbzzOrM7plTzBnmmearzVvN+y1MLMZazLCosbhtSbZkWGZbrrVst3xvZW2VZLXQqsHqmbWeNdu62LrG+q4N1cbPZrJNlc1VW6ItwzbXdqPtJTvUzs0u267C7qI9au9uL7DfaN81kjDSc6RwZNXIGw4qDkyHIocahweOOo4RjvMcGxxfjrIYlTpqxaj2Ud+c3JzynLY73RmtOTps9LzRzaNfO9s5c50rnK+6UF2CXWa7NLq8crV35btucr3pRnMb67bQrdXtq7uHu9i91r3Xw8Ij3aPS4wZDixHNWMI460nwDPCc7XnU86OXu1eh1wGvv7wdvHO9d3s/G2M9hj9m+5hHPmY+HJ+tPt2+dN903y2+3X6mfhy/Kr+H/ub+PP8d/k+Ztswc5h7mywCnAHHA4YD3LC/WTNaJQCwwJLA0sDNIMyghaEPQ/WCz4KzgmuD+ELeQ6SEnQgmh4aErQm+wjdhcdjW7P8wjbGZYW7hKeFz4hvCHEXYR4ojmsejYsLGrxt6NtIwURjZEgSh21Kqoe9HW0ZOjj8QQY6JjKmKexI6OnRHbHkeLmxi3O+5dfED8svg7CTYJkoTWRLXEtMTqxPdJgUkrk7qTRyXPTL6QYpAiSGlMJaUmpu5IHRgXNG7NuJ40t7SStOvjrcdPHX9ugsGEvAnHJqpN5Ew8mE5IT0rfnf6FE8Wp4gxksDMqM/q5LO5a7gueP281r5fvw1/Jf5rpk7ky81mWT9aqrN5sv+zy7D4BS7BB8ConNGdzzvvcqNyduYN5SXl1+Ur56flNQk1hrrBtkvGkqZO6RPaiElH3ZK/Jayb3i8PFOwqQgvEFjYVa8Ee+Q2Ij+UXyoMi3qKLow5TEKQenakwVTu2YZjdt8bSnxcHFv03Hp3Ont84wnTF3xoOZzJlbZyGzMma1zjafvWB2z5yQObvmUubmzv19ntO8lfPezk+a37zAaMGcBY9+CfmlpkS1RFxyY6H3ws2L8EWCRZ2LXRavX/ytlFd6vsyprLzsyxLukvO/jv513a+DSzOXdi5zX7ZpOXG5cPn1FX4rdq3UWFm88tGqsavqV9NXl65+u2bimnPlruWb11LWStZ2r4tY17jeYv3y9V82ZG+4VhFQUVdpWLm48v1G3sbLm/w31W422ly2+dMWwZabW0O21ldZVZVvI24r2vZke+L29t8Yv1XvMNhRtuPrTuHO7l2xu9qqPaqrdxvuXlaD1khqevek7bm0N3BvY61D7dY6nbqyfWCfZN/z/en7rx8IP9B6kHGw9pDlocrDtMOl9Uj9tPr+huyG7saUxq6msKbWZu/mw0ccj+w8anq04pj2sWXHKccXHB9sKW4ZOCE60Xcy6+Sj1omtd04ln7raFtPWeTr89NkzwWdOtTPbW876nD16zutc03nG+YYL7hfqO9w6Dv/u9vvhTvfO+oseFxsveV5q7hrTdfyy3+WTVwKvnLnKvnrhWuS1rusJ12/eSLvRfZN389mtvFuvbhfd/nxnzl3C3dJ76vfK7xver/rD9o+6bvfuYw8CH3Q8jHt45xH30YvHBY+/9Cx4Qn1S/tTkafUz52dHe4N7Lz0f97znhejF576SPzX+rHxp8/LQX/5/dfQn9/e8Er8afL3kjf6bnW9d37YORA/cf5f/7vP70g/6H3Z9ZHxs/5T06ennKV9IX9Z9tf3a/C38293B/MFBEUfMkf0KYLChmZkAvN4JADUFABrcn1HGyfd/MkPke1YZAv8Jy/eIMnMHoBb+v8f0wb+bGwDs2w63X1BfLQ2AaCoA8Z4AdXEZbkN7Ndm+UmpEuA/Ywv6akZ8B/o3J95w/5P3zGUhVXcHP538Bjs98Nq8UJCYAAACEZVhJZk1NACoAAAAIAAYBBgADAAAAAQACAAABEgADAAAAAQABAAABGgAFAAAAAQAAAFYBGwAFAAAAAQAAAF4BKAADAAAAAQACAACHaQAEAAAAAQAAAGYAAAAAAAAASAAAAAEAAABIAAAAAQACoAIABAAAAAEAAABBoAMABAAAAAEAAAAgAAAAAMvlv6wAAAAJcEhZcwAACxMAAAsTAQCanBgAAAMXaVRYdFhNTDpjb20uYWRvYmUueG1wAAAAAAA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJYTVAgQ29yZSA2LjAuMCI+CiAgIDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiCiAgICAgICAgICAgIHhtbG5zOnRpZmY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vdGlmZi8xLjAvIgogICAgICAgICAgICB4bWxuczpleGlmPSJodHRwOi8vbnMuYWRvYmUuY29tL2V4aWYvMS4wLyI+CiAgICAgICAgIDx0aWZmOkNvbXByZXNzaW9uPjE8L3RpZmY6Q29tcHJlc3Npb24+CiAgICAgICAgIDx0aWZmOlJlc29sdXRpb25Vbml0PjI8L3RpZmY6UmVzb2x1dGlvblVuaXQ+CiAgICAgICAgIDx0aWZmOlhSZXNvbHV0aW9uPjcyPC90aWZmOlhSZXNvbHV0aW9uPgogICAgICAgICA8dGlmZjpZUmVzb2x1dGlvbj43MjwvdGlmZjpZUmVzb2x1dGlvbj4KICAgICAgICAgPHRpZmY6T3JpZW50YXRpb24+MTwvdGlmZjpPcmllbnRhdGlvbj4KICAgICAgICAgPHRpZmY6UGhvdG9tZXRyaWNJbnRlcnByZXRhdGlvbj4yPC90aWZmOlBob3RvbWV0cmljSW50ZXJwcmV0YXRpb24+CiAgICAgICAgIDxleGlmOlBpeGVsWERpbWVuc2lvbj4xMzM8L2V4aWY6UGl4ZWxYRGltZW5zaW9uPgogICAgICAgICA8ZXhpZjpQaXhlbFlEaW1lbnNpb24+NjU8L2V4aWY6UGl4ZWxZRGltZW5zaW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KwTPR3wAAEI5JREFUaN7NWWlUVFe2hqgdTWumto1J1jJJx+6YzmiMGhChmGeReYZClBkEgaKKYrjUPFGMBRQgKCpPcYyJOEQkJpqoMSZpxbRPly5bgyadxGeMZjDxvG9f6tIlDzXa/ePVWleqzrDPPt/+zrf3uTo43MUnMjJyjP1vjuPuc/j3P44jfvM2CwoKgmNjY10c/j99hA2npaU9lJiYKI6JiZlJv0Ui0dh7tQlQfwd74wQbwl+0TUtKTLwSHx/P4uLi4v+DgN/7R2BAbm7u/dh8d3JyMkOUPk1KSppG7f7+/vffq017kAkQ+g7bk6Ojo/+enZ1N6xjsQHAchTn2jHK8C8bdG13hUHKyWMywebZo0SIGQBS2CI4fbSKBg409EBwczD9CpK1W6zjbvOmItgqAzBI2SkDTdzDgVTypWPMxGzvG2eyNE4vF4wVbBCb9pr/UR+yy9536aB6145kwEvy7ipjZbJ4QGBh4QKlUsJUrOn9GO0XpCByfKFDbLqpjRzhjH/EH6C9jbPKyZQX74TgDEK2380FgyJ3YNLLvVvNu1X5HFuAIBCIyTKNWfdK3e1dbRno6i4iIuL5kyZJQ26ITRmoENvcgaP0antl4XrQ/13K5rG7p0qUEAEtMTDgHVjWAXXUajboR4FrwuwnrrcUTQ+OhQ8/jew768vGEL1iwgGdISUnJQ1FRUbGwb0K/Go/XCNCnwrfEgICApWli8Uv2enRXYmijZ49YnMIARtK+ffsmweGvExISGOjWIgAmGIayT4CjxdjIWQKOHtosbQ7dfBQWLlx4ICYmlvqu0vFKSUlhmMfa21uZTXNYVlYW/W2j8dhkLo0jW7RueHh4ni2qLgCI0QNfGAB5R/A5PDwqGcfwAo4YKyosZGFhYSwgIEgLFt53N4y4z8aCZ2GcFRcVsY8/PvAytRkN+n1EZWz0aEZGxtP29ITDNdSHeQNwGl/TCsQ2LcH3uUPHy1SQl5f7K7UBjAOYG5eenp5SUSEPVSqrOtLT025QH0Aw2YD9E4C/Rn4QWE1NjTJboB7Oy8vbTxpFQIBd6QJo1FaQn/+NVFoc3dzcHFVdbTqZB0BCQkKMv+VI3cQCGC9DpmIVFeVf79q1fevO7dss7a3WM+QQRUaclJQljEWUXgEwLB7RKisre05oh9K/BrCWoO0Z+r1v37vucnnp5RQ4CodX2q+NNWILC5fxEReyA30KCwvVxKjFixczpVKZLbTn5GRZqA0Af0C/KWuFhoZeAchsy+ZNO69cuTLl8OHDkz/+6KBKq9UwVze3qwAugMaScN4RBKD+KEA4RSAQZcvK5KyysoIRonCepy4c29nT0zNmiILh2eQQx1UcP3/+/B+E1CrY7e3t5b9vf/ttX5m05AoxhI4atfX39/N6snFjT9oyRJsiC0CHo6ZWqx/HBi9Te3h4ZBW1SSSSJwDWRWJNfn5+ok2Lkul3fHzcD/nQnaV5eYw0jICltEv+Yd2+254BnJlhQczNyhWnpqYSlb+Pi0t4393ds9/b27d/QUjIHrSdpk1g0e9h2JvGh4VFVCLiTKNS/u3w4fcep7aOjo4/Go3G3+PrGKRHPjvs7O31kEiKL5FDgcHB3dR2oLf3Qfq7fv3adAEE4TgIegOKa8kfAPe+rX0W0R5AfCL4DL8W01z49TPsn4WNoxg/AJ8/WrgwtA9jj2Avq9H32B1ZQFHLyEg/aqvcSqjNYuEmIup8JkhPT3WNior+ChmCYeOdNsGLJWDg6IW2toZnRtru7OwcPxT1HdMRpaPkLFi1xX7MhnXrMgQQsMlq+7OLdabAn6t05IqLi5/F2noCAWvGCPPx252YgPnX62tq4m3N91OapxRNNcttawZ7FnR1dUZSVMGtH2tqapxGG4/N7kpMTGI5OdlfI2uQBozFMflnGoBZsiS1p76+3u2DvXud339/zysjBXdxauqHiAyr4ioGT588kf3FF1/wpfjOndtjUEPwGQLnvNw2Z6zgNAJSSkDn5mbvwRH9Cdr0iX16pg1i7n4KDvzrt1gss++qkhRAwCJTodYXKRqEdGZmxptC+hPEBHSKJp2geoGyAYD4lM4/QAghUSPaZmdnsTJ5KZPJpKQp72RmZj5il3bjaaNoY0ajgZXKpD/XVJv2FhTk/13IJtCc72Bn+oj7yzjM+4xSny0FzxmpPVRXYMwA9sDrAeydiIqO/pDSdkxMnPFOl0BHW4k8A4gO0iLkKCavs2OJoy0N0SYu0xgCKyoq5rCQLiMSxKKY+IQVsfHxxyKjo48hWidBY7kgoEJUk5Li/dG3XuThcQi5/NvuNatp8zfCwyOuwe4ZrLsdY4Us4yg4jXVfRt8H0QkJOSOKNPsyfzKeLLJBqRz2TiA4p4lJv+km7A9U48Tpf45JSJhPN0ZUaJNGXlTIABycBsMijHGmRR3sjpPdZ5J9lG5Bw/v7tm17CqnsJUqzVGnC5tO3o7B9dep/s/3/c5mi+w2xEMfzt132Zt1lbT3yE89xD7pIlSIXuTaSW73xjd9Si9zrpS6zaflzQIDfmAh3Fvsx93RZsokCv4C3RP+Ep0zjJFB3NIM2Joyxj4SoVP3ifKnq+BsSBfNT1bHS9lX//dmpU1P4KtGWVUZuyM4+gXIf2RUeW7QdRwMhQmGY71uuu+wmU20nf0cBwkGwIaxB3+8EPm/ctVz3kqdc86W7TP2TSKqWU9sLHHfbC8fw4iRa6poW7zId81I3MHnHmoETg4OTqatnYOB3Dv+ZD++nu0zj5qdvZgGmVuYh0yzhWWy7pf7b7w3cS9UbnCpNzK1MzzxK1Vf8OO3Q3eAOQMyT6HndWNbY+heRTP05OVje0X1AAIFDofS0mBs/0g4dP75thJ4MMa1nzK0iR+xzk6qLEawmH844ZYi1PWMiIb5OBeYJIwLnSIGKHBJmx9uCML9U/do8qYrJV65lkrZVbPoyjoUpq/lcTYZHOxL+ubzYDItRAYoSZ4niWFB1GyvrWHNIAEG4vfHOwhl/Eil7/SHKwnEO5fP0EUI6K8067k75feRR4IlptY7j/bPr48GI7BlzSxZ4yrUWJ87M2rZu72/c8ObZByQaFlxpOCikR/vJIw2Ja5qfjqiq9oxW18jBhPO+OgsrW77myGenLvJRKmrumuIl14W4SrUzb3oBwtVNC8ARHC0ywZz1gVttPNlQ/yw0KEYkUyWLpNrpw6nRZJrsW6ENdy5Sv3jTOmbzo4FS7SO3Ao03HqrR/MFVproUrm1gndv3hGm71y8OMrYwUO5aCGf0smeDIIjEBK8yXaabTH3w1WXcxefyK5iLXMfmSZTXfJS1JIzHz1y69DCNdSlR9c5Dnwf0Iq22rXBRdcsrs4u4TWDNtziCl1yl6v259e1zBgYGJjpJlIo5RVUnoEkn0XfKq1wXZb+uk0SV/1JhFXOXa5mPup652TRBxJkmzypS9LkgkNClS0vqWpcmGZtenlPI7XEqVpxzk6ouQEtWCEd3llVgmO3M+ZTpUz1U9Szd3PwPvv2x0ClJZitzKtUyvwoD//KEaCogmAs6Q51XemKz3gozy7Z0sJL21SzBaGHIDj8QCPL21ccOnTkzlcbnW9pVUdp65l5pZHH6hp8COROLMjaxKIOF+VRVszlyPUutbv6f1Oqmb4O1jSwBa3uh3Z3DA5B8ivhLGP/JMlheLWho/8azwsg8KgzMq1S9yHZuxi2tazUn1LSxeSVKlmSysEDOyML0FhZnauL9JH89S9WWUUXBS679cG65kVm3bBs88+Vg+nufHVVXdnazJ6ELQRWG07FA2Uaj8UOgaYLcgXiAopoVNHUo3xkYmDb43XeT69ZvCvEv057z1FpYRUf3R33Hjz9F4/ccOzYvr7H9spNMw3wBRIqpSVnS1TOtp//QVLHRstUTDHGBGC/kjN+Y124K6ezvf7hqRbcsGPbd0IeUHWTjMR+Elbv6GiKMzcwZm/WR65OFfWw/csSpsLWLPZNXxhYoTL8gKJUizjJxza7+V5Ur1m4OMlkZ2Hc2lKv+y00FS4SyRuQNx4DeT7GaWlZgXclyENmACv115xIV8yrXM79yg9j+LLnK1I1+RitbbLK8A834lxJncVPnFisGeGFcvuagAMLmDz8S5Ta0f+WO1Olbpu23D0Cs2hzlWqK6EQgdkbR1NQvtFy9enIKj+E9P1Bw4/5X2War+zbdros2tzAn+eZdrxcKc/+rb61xg7WLPF6tYEGfccdMtdkdfYnbrGjYjv/waBH/BTcVRmKpmraeiBrTSELLXXyus+uX1oqrrEEo6CkxUboDjuuH3dwv0+knQgQ/8kaNjVNV1Q3dYCX/OlG1dz/vKtSd9DC1IkWsOCSBsPHDAPaeh7UtvpM55JYqt9kcR60S/Uay8EYVN1W9+u0lYB3eNid5yzaA7fEs2NHbaJI7XhcYt2+qiq608CH52IKze8968ZQDhrxIV8y/XbRpqfYEHrumtHSnZLSvZC8VKsFsvG0ZH1tk9IwAbdUFqTDVa0iX65ZNm5HNPO8RlPtL+1ltzMmtbzr9eZiBWfJdssPgMRa72MQKBmJBW3bTBHu11u/cWJuob2Ey5ASmy+9O+I0Mg9Ow/6JFd3/aVt64JIKh6+ZxtCwKEL84JIERiU+YNbw6/gicd8CzVXJwLXSq2rjw/yNhwtqjd+FYDgUBMdS/VLhqO9u535xMTXgAIPuW6rcJVfIg9vUsyLZ3sZamGANIPO13U0tnurqxjIVWmk6NpxWJzS4gXxIlEKKOuZZPQjgi1e0CZQxXVVxBx/jZ34NixcOWK7m+n55f/6oE5ylXrPjl37esnqW/v0c+dCyzLL3jpWxgyxSZ7JgRz+oUQ01+jIWit23bV3qxVmvMzS9SsauXaSzh2w+LYuXO3gcY7QROiVDWxQvuev30+q7htNfszjkMoZ1wvXNDon1W7++NzwIS/lmjQZ+Jf0TkUNLfPidfV/zK7qIol6Ou/l7d0vc771tMzfMZ9yrWLvKAXLjgmMZraG9LWrgxqD0HtjnrgR09FLUOWuJpstHwRpaljsXAsQmX+1UWmZhk1zZcNa9fz7ClrX7U0QVf3oxspeqnm8zCV6SlhjaBKnXI+NMEf2WCpZTlSZT3/qi1MYZqNEv6H14sUN3Ial7PWzVv5VGns6vp9YVPHfj9kGGgTjqTZOvx/Gu1dEnGNlSFl34hSVp+WWzqchXclBZaO2lhkozlSNQnwlh7aJxY2ekCovGHMvaqGzZMqNTfVAxAhbPRdXyi9J4Cg+wCiuEtY0EOuCkX/PzxRZhObZhdyZ1SrezqRBc7OhdJThvAo03K2y9UOT8wnRvlA6NxkykyhGkQtcs4Px8QT7HGF/kTpan157VGYrF7QAz5zYI2ZhVwFtcdoG0RUjxDbfGELl7bByRLJJGx07ALOeNgFe/HBeFovuNK4l+YEamv+5CHXXBChjy53qImuQoxdHfxlmj+KZJpkOCHzkOuC/XENtinmcHXmzemfgMMpbqVqBdJUapDc/KR9xYhKbAKKlZTgKmM6GPQotT2Xwz2BQiYL+TuJijA+qqXqxz1KtWIUQJWw5S2kWh7MElUwtYvkGqUPp3MerlB1uodEUqUfHE72kWnm5treB/Blt1z/Bl3wRFJVjn3FGKkyP4kLVQpA56iiJP36VwWqmeEuVRegYJJ4lfOVq+P/Am9657pjUG9AAAAAAElFTkSuQmCC\">
 "
+
+  IN_APP = "<svg height=\"36px\" viewBox=\"0 0 214 274\" xmlns=\"http://www.w3.org/2000/svg\">
+    <g transform=\"matrix(4.16667,0,0,4.16667,-1049.47,-789.371)\">
+      <path d=\"M281.386,193.134L287.086,193.134C287.433,193.134 287.716,193.417 287.716,193.764C287.716,194.11 287.433,194.394 287.086,194.394L281.386,194.394C281.04,194.394 280.756,194.11 280.756,193.764C280.756,193.417 281.04,193.134 281.386,193.134ZM284.252,245.638C282.456,245.638 281.008,247.086 281.008,248.851C281.008,250.645 282.456,252.094 284.252,252.094C286.047,252.094 287.496,250.645 287.496,248.851C287.496,247.086 286.047,245.638 284.252,245.638ZM284.252,246.331C282.835,246.331 281.701,247.465 281.701,248.851C281.701,250.268 282.835,251.401 284.252,251.401C285.638,251.401 286.803,250.268 286.803,248.851C286.803,247.465 285.638,246.331 284.252,246.331ZM275.843,208.63L287.559,218.11L275.843,227.622L275.843,221.858L251.874,221.858L251.874,214.394L275.843,214.394L275.843,208.63ZM278.866,239.906L278.866,233.102C278.866,232.851 278.677,232.693 278.456,232.693L271.622,232.693C271.401,232.693 271.212,232.851 271.212,233.102L271.212,239.906C271.212,240.157 271.401,240.314 271.622,240.314L278.456,240.314C278.677,240.314 278.866,240.157 278.866,239.906ZM280.41,233.102L280.41,239.906C280.41,240.157 280.599,240.314 280.819,240.314L287.653,240.314C287.874,240.314 288.063,240.157 288.063,239.906L288.063,233.102C288.063,232.851 287.874,232.693 287.653,232.693L280.819,232.693C280.599,232.693 280.41,232.851 280.41,233.102ZM289.606,233.102L289.606,239.906C289.606,240.157 289.795,240.314 290.047,240.314L296.851,240.314C297.071,240.314 297.26,240.157 297.26,239.906L297.26,233.102C297.26,232.851 297.071,232.693 296.851,232.693L290.047,232.693C289.795,232.693 289.606,232.851 289.606,233.102ZM269.197,189.449L299.276,189.449C301.354,189.449 303.055,191.149 303.055,193.197L303.055,251.275C303.055,253.355 301.354,255.055 299.276,255.055L269.197,255.055C267.118,255.055 265.449,253.355 265.449,251.275L265.449,223.496L267.842,223.496L267.842,242.488L300.63,242.488L300.63,198.394L267.842,198.394L267.842,212.725L265.449,212.725L265.449,193.197C265.449,191.149 267.118,189.449 269.197,189.449Z\" style=\"fill:rgb(31,147,209);\"/>
+    </g>
+</svg>"
 end

data/lib/brick/route_mapper.rb

@@ -0,0 +1,348 @@
+# frozen_string_literal: true
+
+module Brick
+  class << self
+    attr_accessor :routes_done
+  end
+
+  module RouteMapper
+    def add_brick_routes
+      routeset_to_use = ::Rails.application.routes
+      path_prefix = ::Brick.config.path_prefix
+      existing_controllers = routeset_to_use.routes.each_with_object({}) do |r, s|
+        if (r.verb == 'GET' || (r.verb.is_a?(Regexp) && r.verb.source == '^GET$')) &&
+           (controller_name = r.defaults[:controller])
+          path = r.path.ast.to_s
+          path = path[0..((path.index('(') || 0) - 1)]
+          # Skip adding this if it's the default_route_fallback set from the initializers/brick.rb file
+          next if "#{path}##{r.defaults[:action]}" == ::Brick.established_drf ||
+                  # or not a GET request
+                  [:index, :show, :new, :edit].exclude?(action = r.defaults[:action].to_sym)
+
+          # Attempt to backtrack to original
+          c_parts = controller_name.split('/')
+          while c_parts.length > 0
+            c_dotted = c_parts.join('.')
+            if (relation = ::Brick.relations.fetch(c_dotted, nil)) # Does it match up with an existing Brick table / resource name?
+              # puts path
+              # puts "  #{c_dotted}##{r.defaults[:action]}"
+              if (route_name = r.name&.to_sym) != :root
+                relation[:existing][action] = route_name
+              else
+                relation[:existing][action] ||= path
+              end
+              s[c_dotted.tr('.', '/')] = nil
+              break
+            end
+            c_parts.shift
+          end
+          s[controller_name] = nil if c_parts.length.zero?
+        end
+      end
+
+      tables = []
+      views = []
+      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_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)
+        end
+      end
+
+      # %%% TODO: If no auto-controllers then enumerate the controllers folder in order to build matching routes
+      # If auto-controllers and auto-models are both enabled then this makes sense:
+      controller_prefix = (path_prefix ? "#{path_prefix}/" : '')
+      sti_subclasses = ::Brick.config.sti_namespace_prefixes.each_with_object(Hash.new { |h, k| h[k] = [] }) do |v, s|
+                         # Turn something like {"::Spouse"=>"Person", "::Friend"=>"Person"} into {"Person"=>["Spouse", "Friend"]}
+                         s[v.last] << v.first[2..-1] unless v.first.end_with?('::')
+                       end
+      versioned_views = {} # Track which views have already been done for each api_root
+      ::Brick.relations.each do |k, v|
+        next if k.is_a?(Symbol)
+
+        if (schema_name = v.fetch(:schema, nil))
+          schema_prefix = "#{schema_name}."
+        end
+
+        resource_name = v.fetch(:resource, nil)
+        next if !resource_name ||
+                existing_controllers.key?(
+                  controller_prefix + (resource_name = "#{schema_prefix&.tr('.', '/')}#{resource_name}".pluralize)
+                )
+
+        object_name = k.split('.').last # Take off any first schema part
+
+        full_schema_prefix = if (full_aps = 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
+        resource_name = v.fetch(:resource, nil) || k
+        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, "#{"#{schema_name}/" if schema_name}#{resource_name[full_aps&.length || 0 .. -1]}"]
+        end
+
+        options = {}
+        options[:only] = [:index, :show] if v.key?(:isView)
+
+        # 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, resource_name, 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] ||= {})
+          found = nil
+          test_ver_num = nil
+          view_relation = nil
+          # If it's a view then see if there's a versioned one available by searching for resource names
+          # versioned with the closest number (equal to or less than) compared with our API version number.
+          if v.key?(:isView)
+            if (ver = object_name.match(/^v([\d_]*)/)&.captures&.first) && ver[-1] == '_'
+              core_object_name = object_name[ver.length + 1..-1]
+              next if api_done_views.key?(unversioned = "#{schema_prefix}v_#{core_object_name}")
+
+              # Expect that the last item in the path generally holds versioning information
+              api_ver = api_root.split('/')[-1]&.gsub('_', '.')
+              vn_idx = api_ver.rindex(/[^\d._]/) # Position of the first numeric digit at the end of the version number
+              # Was:  .to_d
+              test_ver_num = api_ver_num = api_ver[vn_idx + 1..-1].gsub('_', '.').to_i # Attempt to turn something like "v3" into the decimal value 3
+              # puts [api_ver, vn_idx, api_ver_num, unversioned].inspect
+
+              next if ver.to_i > api_ver_num # Don't surface any newer views in an older API
+
+              test_ver_num -= 1 until test_ver_num.zero? ||
+                                      (view_relation = ::Brick.relations.fetch(
+                                        found = "#{schema_prefix}v#{test_ver_num}_#{core_object_name}", nil
+                                      ))
+              api_done_views[unversioned] = nil # Mark that for this API version this view is done
+
+              # puts "Found #{found}" if view_relation
+              # If we haven't found "v3_view_name" or "v2_view_name" or so forth, at the last
+              # fall back to simply looking for "v_view_name", and then finally  "view_name".
+              no_v_prefix_name = "#{schema_prefix}#{core_object_name}"
+              standard_prefix = 'v_'
+            else
+              core_object_name = object_name
+            end
+            if (rvp = ::Brick.config.api_remove_view_prefix) && core_object_name.start_with?(rvp)
+              core_object_name.slice!(0, rvp.length)
+            end
+            no_prefix_name = "#{schema_prefix}#{core_object_name}"
+            unversioned = "#{schema_prefix}#{standard_prefix}#{::Brick.config.api_add_view_prefix}#{core_object_name}"
+          else
+            unversioned = k
+          end
+
+          view_relation ||= ::Brick.relations.fetch(found = unversioned, nil) ||
+                            (no_v_prefix_name && ::Brick.relations.fetch(found = no_v_prefix_name, nil)) ||
+                            (no_prefix_name && ::Brick.relations.fetch(found = no_prefix_name, nil))
+          if view_relation
+            actions = view_relation.key?(:isView) ? [:index, :show] : ::Brick::ALL_API_ACTIONS # By default all actions are allowed
+            # Call proc that limits which endpoints get surfaced based on version, table or view name, method (get list / get one / post / patch / delete)
+            # Returning nil makes it do nothing, false makes it skip creating this endpoint, and an array of up to
+            # these 3 things controls and changes the nature of the endpoint that gets built:
+            # (updated api_name, name of different relation to route to, allowed actions such as :index, :show, :create, etc)
+            proc_result = if (filter = ::Brick.config.api_filter).is_a?(Proc)
+                            begin
+                              num_args = filter.arity.negative? ? 6 : filter.arity
+                              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
+                          end
+            # proc_result expects to receive back: [updated_api_name, to_other_relation, allowed_actions]
+
+            case proc_result
+            when NilClass
+              # Do nothing differently than what normal behaviour would be
+            when FalseClass # Skip implementing this endpoint
+              view_relation[:api][api_ver_num] = nil
+              next
+            when Array # Did they give back an array of actions?
+              unless proc_result.any? { |pr| ::Brick::ALL_API_ACTIONS.exclude?(pr) }
+                proc_result = [unversioned, to_relation, proc_result]
+              end
+              # Otherwise don't change this array because it's probably legit
+            when String
+              proc_result = [proc_result] # Treat this as the surfaced api_name (path) they want to use for this endpoint
+            else
+              puts "::Brick.api_filter Proc warning: Unable to parse this result returned: \n  #{proc_result.inspect}"
+              proc_result = nil # Couldn't understand what in the world was returned
+            end
+
+            if proc_result&.present?
+              if proc_result[1] # to_other_relation
+                if (new_view_relation = ::Brick.relations.fetch(proc_result[1], nil))
+                  k = proc_result[1] # Route this call over to this different relation
+                  view_relation = new_view_relation
+                else
+                  puts "::Brick.api_filter Proc warning: Unable to find new suggested relation with name #{proc_result[1]} -- sticking with #{k} instead."
+                end
+              end
+              if proc_result.first&.!=(k) # updated_api_name -- a different name than this relation would normally have
+                found = proc_result.first
+              end
+              actions &= proc_result[2] if proc_result[2] # allowed_actions
+            end
+            (view_relation[:api][api_ver_num] ||= {})[unversioned] = actions # Add to the list of API paths this resource responds to
+
+            # 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)
+                                "#{full_schema_prefix}#{last}"
+                              else
+                                found
+                              end.tr('.', '/')
+
+            { :index => 'get', :create => 'post' }.each do |action, method|
+              if actions.include?(action)
+                # Normally goes to something like:  /api/v1/employees
+                send(method, "#{api_root}#{unversioned.tr('.', '/')}", { to: "#{controller_prefix}#{controller_name}##{action}" })
+              end
+            end
+            # %%% We do not yet surface the #show action
+            if (id_col = view_relation[:pk]&.first) # ID-dependent stuff
+              { :update => ['put', 'patch'], :destroy => ['delete'] }.each do |action, methods|
+                if actions.include?(action)
+                  methods.each do |method|
+                    send(method, "#{api_root}#{unversioned.tr('.', '/')}/:#{id_col}", { to: "#{controller_prefix}#{controller_name}##{action}" })
+                  end
+                end
+              end
+            end
+          end
+        end
+
+        # Trestle compatibility
+        if Object.const_defined?('Trestle') && ::Trestle.config.options&.key?(:site_title) &&
+            !Object.const_defined?("#{(res_name = resource_name.tr('/', '_')).camelize}Admin")
+          begin
+            ::Trestle.resource(res_sym = res_name.to_sym, model: class_name&.constantize) do
+              menu { item res_sym, icon: "fa fa-star" }
+            end
+          rescue
+          end
+        end
+      end
+
+      if (named_routes = instance_variable_get(:@set).named_routes).respond_to?(:find)
+        if ::Brick.config.add_status && (status_as = "#{controller_prefix.tr('/', '_')}brick_status".to_sym)
+          (
+            !(status_route = instance_variable_get(:@set).named_routes.find { |route| route.first == status_as }&.last) ||
+            !status_route.ast.to_s.include?("/#{controller_prefix}brick_status/")
+          )
+          get("/#{controller_prefix}brick_status", to: 'brick_gem#status', as: status_as.to_s)
+        end
+
+        # ::Brick.config.add_schema &&
+        if (schema_as = "#{controller_prefix.tr('/', '_')}brick_schema".to_sym)
+          (
+            !(schema_route = instance_variable_get(:@set).named_routes.find { |route| route.first == schema_as }&.last) ||
+            !schema_route.ast.to_s.include?("/#{controller_prefix}brick_schema/")
+          )
+          post("/#{controller_prefix}brick_schema", to: 'brick_gem#schema_create', as: schema_as.to_s)
+        end
+
+        if ::Brick.config.add_orphans && (orphans_as = "#{controller_prefix.tr('/', '_')}brick_orphans".to_sym)
+          (
+            !(orphans_route = instance_variable_get(:@set).named_routes.find { |route| route.first == orphans_as }&.last) ||
+            !orphans_route.ast.to_s.include?("/#{controller_prefix}brick_orphans/")
+          )
+          get("/#{controller_prefix}brick_orphans", to: 'brick_gem#orphans', as: 'brick_orphans')
+        end
+      end
+
+      if instance_variable_get(:@set).named_routes.names.exclude?(:brick_crosstab)
+        get("/#{controller_prefix}brick_crosstab", to: 'brick_gem#crosstab', as: 'brick_crosstab')
+        get("/#{controller_prefix}brick_crosstab/data", to: 'brick_gem#crosstab_data')
+      end
+
+      if ((rswag_ui_present = Object.const_defined?('Rswag::Ui')) &&
+          (rswag_path = routeset_to_use.routes.find { |r| r.app.app == ::Rswag::Ui::Engine }
+                                              &.instance_variable_get(:@path_formatter)
+                                              &.instance_variable_get(:@parts)&.join) &&
+          (doc_endpoints = ::Rswag::Ui.config.config_object[:urls])) ||
+         (doc_endpoints = ::Brick.instance_variable_get(:@swagger_endpoints))
+        last_endpoint_parts = nil
+        doc_endpoints.each do |doc_endpoint|
+          puts "Mounting OpenApi 3.0 documentation endpoint for \"#{doc_endpoint[:name]}\" on #{doc_endpoint[:url]}" unless ::Brick.routes_done
+          send(:get, doc_endpoint[:url], { to: 'brick_openapi#index' })
+          endpoint_parts = doc_endpoint[:url]&.split('/')
+          last_endpoint_parts = endpoint_parts
+        end
+      end
+      return if ::Brick.routes_done
+
+      if doc_endpoints.present?
+        if rswag_ui_present
+          if rswag_path
+            puts "API documentation now available when navigating to:  /#{last_endpoint_parts&.find(&:present?)}/index.html"
+          else
+            puts "In order to make documentation available you can put this into your routes.rb:"
+            puts "  mount Rswag::Ui::Engine => '/#{last_endpoint_parts&.find(&:present?) || 'api-docs'}'"
+          end
+        else
+          puts "Having this exposed, one easy way to leverage this to create HTML-based API documentation is to use Scalar.
+It will jump to life when you put these two lines into a view template or other HTML resource:
+  <script id=\"api-reference\" data-url=\"#{last_endpoint_parts.join('/')}\"></script>
+  <script src=\"https://cdn.jsdelivr.net/@scalar/api-reference\"></script>
+Alternatively you can add the rswag-ui gem."
+        end
+      elsif rswag_ui_present
+        sample_path = rswag_path || '/api-docs'
+        puts
+        puts "Brick:  rswag-ui gem detected -- to make OpenAPI 3.0 documentation available from a path such as  '#{sample_path}/v1/swagger.json',"
+        puts '        put code such as this in an initializer:'
+        puts '  Rswag::Ui.configure do |config|'
+        puts "    config.swagger_endpoint '#{sample_path}/v1/swagger.json', 'API V1 Docs'"
+        puts '  end'
+        unless rswag_path
+          puts
+          puts '        and put this into your routes.rb:'
+          puts "  mount Rswag::Ui::Engine => '/api-docs'"
+        end
+      end
+
+      puts "\n" if tables.present? || views.present?
+      if tables.present?
+        puts "Classes that can be built from tables:#{' ' * (table_class_length - 38)}  Path:"
+        puts "======================================#{' ' * (table_class_length - 38)}  ====="
+        ::Brick.display_classes(controller_prefix, tables, table_class_length)
+      end
+      if views.present?
+        puts "Classes that can be built from views:#{' ' * (view_class_length - 37)}  Path:"
+        puts "=====================================#{' ' * (view_class_length - 37)}  ====="
+        ::Brick.display_classes(controller_prefix, views, view_class_length)
+      end
+      ::Brick.routes_done = true
+    end
+  end
+end

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -107,7 +107,7 @@ module Brick
     end
 
     attr_accessor :default_schema, :db_schemas, :test_schema,
-                  :routes_done, :established_drf,
+                  :established_drf,
                   :is_oracle, :is_eager_loading, :auto_models, :initializer_loaded,
                   :table_name_lookup
     ::Brick.auto_models = []
@@ -881,340 +881,6 @@ In config/initializers/brick.rb appropriate entries would look something like:
     end
   end
 
-  module RouteMapper
-    def add_brick_routes
-      routeset_to_use = ::Rails.application.routes
-      path_prefix = ::Brick.config.path_prefix
-      existing_controllers = routeset_to_use.routes.each_with_object({}) do |r, s|
-        if r.verb == 'GET' && (c = r.defaults[:controller])
-          path = r.path.ast.to_s
-          path = path[0..((path.index('(') || 0) - 1)]
-          # Skip adding this if it's the default_route_fallback set from the initializers/brick.rb file
-          next if "#{path}##{r.defaults[:action]}" == ::Brick.established_drf
-
-          # next unless [:index, :show, :new, :edit].incude?(a = r.defaults[:action])
-
-          # c_parts = c.split('/')
-          # while c_parts.length > 0
-          #   c_dotted = c_parts.join('.')
-          #   if (relation = ::Brick.relations[c_dotted]) # Does it match up with an existing Brick table / resource name?
-          #     puts path
-          #     puts "  #{c_dotted}##{r.defaults[:action]}"
-          #     s[c_dotted.tr('.', '/')] = nil
-          #     break
-          #   end
-          #   c_parts.shift
-          # end
-          s[c] = nil
-        end
-      end
-
-      tables = []
-      views = []
-      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_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)
-        end
-      end
-
-      # %%% TODO: If no auto-controllers then enumerate the controllers folder in order to build matching routes
-      # If auto-controllers and auto-models are both enabled then this makes sense:
-      controller_prefix = (path_prefix ? "#{path_prefix}/" : '')
-      sti_subclasses = ::Brick.config.sti_namespace_prefixes.each_with_object(Hash.new { |h, k| h[k] = [] }) do |v, s|
-                          # Turn something like {"::Spouse"=>"Person", "::Friend"=>"Person"} into {"Person"=>["Spouse", "Friend"]}
-                          s[v.last] << v.first[2..-1] unless v.first.end_with?('::')
-                        end
-      versioned_views = {} # Track which views have already been done for each api_root
-      ::Brick.relations.each do |k, v|
-        next if k.is_a?(Symbol)
-
-        if (schema_name = v.fetch(:schema, nil))
-          schema_prefix = "#{schema_name}."
-        end
-
-        resource_name = v.fetch(:resource, nil)
-        next if !resource_name ||
-                existing_controllers.key?(
-                  controller_prefix + (resource_name = "#{schema_prefix&.tr('.', '/')}#{resource_name}".pluralize)
-                )
-
-        object_name = k.split('.').last # Take off any first schema part
-
-        full_schema_prefix = if (full_aps = 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
-        resource_name = v.fetch(:resource, nil) || k
-        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.tr('.', '/')[full_aps&.length || 0 .. -1]]
-        end
-
-        options = {}
-        options[:only] = [:index, :show] if v.key?(:isView)
-
-        # 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, resource_name, 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] ||= {})
-          found = nil
-          test_ver_num = nil
-          view_relation = nil
-          # If it's a view then see if there's a versioned one available by searching for resource names
-          # versioned with the closest number (equal to or less than) compared with our API version number.
-          if v.key?(:isView)
-            if (ver = object_name.match(/^v([\d_]*)/)&.captures&.first) && ver[-1] == '_'
-              core_object_name = object_name[ver.length + 1..-1]
-              next if api_done_views.key?(unversioned = "#{schema_prefix}v_#{core_object_name}")
-
-              # Expect that the last item in the path generally holds versioning information
-              api_ver = api_root.split('/')[-1]&.gsub('_', '.')
-              vn_idx = api_ver.rindex(/[^\d._]/) # Position of the first numeric digit at the end of the version number
-              # Was:  .to_d
-              test_ver_num = api_ver_num = api_ver[vn_idx + 1..-1].gsub('_', '.').to_i # Attempt to turn something like "v3" into the decimal value 3
-              # puts [api_ver, vn_idx, api_ver_num, unversioned].inspect
-
-              next if ver.to_i > api_ver_num # Don't surface any newer views in an older API
-
-              test_ver_num -= 1 until test_ver_num.zero? ||
-                                      (view_relation = ::Brick.relations.fetch(
-                                        found = "#{schema_prefix}v#{test_ver_num}_#{core_object_name}", nil
-                                      ))
-              api_done_views[unversioned] = nil # Mark that for this API version this view is done
-
-              # puts "Found #{found}" if view_relation
-              # If we haven't found "v3_view_name" or "v2_view_name" or so forth, at the last
-              # fall back to simply looking for "v_view_name", and then finally  "view_name".
-              no_v_prefix_name = "#{schema_prefix}#{core_object_name}"
-              standard_prefix = 'v_'
-            else
-              core_object_name = object_name
-            end
-            if (rvp = ::Brick.config.api_remove_view_prefix) && core_object_name.start_with?(rvp)
-              core_object_name.slice!(0, rvp.length)
-            end
-            no_prefix_name = "#{schema_prefix}#{core_object_name}"
-            unversioned = "#{schema_prefix}#{standard_prefix}#{::Brick.config.api_add_view_prefix}#{core_object_name}"
-          else
-            unversioned = k
-          end
-
-          view_relation ||= ::Brick.relations.fetch(found = unversioned, nil) ||
-                            (no_v_prefix_name && ::Brick.relations.fetch(found = no_v_prefix_name, nil)) ||
-                            (no_prefix_name && ::Brick.relations.fetch(found = no_prefix_name, nil))
-          if view_relation
-            actions = view_relation.key?(:isView) ? [:index, :show] : ::Brick::ALL_API_ACTIONS # By default all actions are allowed
-            # Call proc that limits which endpoints get surfaced based on version, table or view name, method (get list / get one / post / patch / delete)
-            # Returning nil makes it do nothing, false makes it skip creating this endpoint, and an array of up to
-            # these 3 things controls and changes the nature of the endpoint that gets built:
-            # (updated api_name, name of different relation to route to, allowed actions such as :index, :show, :create, etc)
-            proc_result = if (filter = ::Brick.config.api_filter).is_a?(Proc)
-                            begin
-                              num_args = filter.arity.negative? ? 6 : filter.arity
-                              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
-                          end
-            # proc_result expects to receive back: [updated_api_name, to_other_relation, allowed_actions]
-
-            case proc_result
-            when NilClass
-              # Do nothing differently than what normal behaviour would be
-            when FalseClass # Skip implementing this endpoint
-              view_relation[:api][api_ver_num] = nil
-              next
-            when Array # Did they give back an array of actions?
-              unless proc_result.any? { |pr| ::Brick::ALL_API_ACTIONS.exclude?(pr) }
-                proc_result = [unversioned, to_relation, proc_result]
-              end
-              # Otherwise don't change this array because it's probably legit
-            when String
-              proc_result = [proc_result] # Treat this as the surfaced api_name (path) they want to use for this endpoint
-            else
-              puts "::Brick.api_filter Proc warning: Unable to parse this result returned: \n  #{proc_result.inspect}"
-              proc_result = nil # Couldn't understand what in the world was returned
-            end
-
-            if proc_result&.present?
-              if proc_result[1] # to_other_relation
-                if (new_view_relation = ::Brick.relations.fetch(proc_result[1], nil))
-                  k = proc_result[1] # Route this call over to this different relation
-                  view_relation = new_view_relation
-                else
-                  puts "::Brick.api_filter Proc warning: Unable to find new suggested relation with name #{proc_result[1]} -- sticking with #{k} instead."
-                end
-              end
-              if proc_result.first&.!=(k) # updated_api_name -- a different name than this relation would normally have
-                found = proc_result.first
-              end
-              actions &= proc_result[2] if proc_result[2] # allowed_actions
-            end
-            (view_relation[:api][api_ver_num] ||= {})[unversioned] = actions # Add to the list of API paths this resource responds to
-
-            # 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)
-                                "#{full_schema_prefix}#{last}"
-                              else
-                                found
-                              end.tr('.', '/')
-
-            { :index => 'get', :create => 'post' }.each do |action, method|
-              if actions.include?(action)
-                # Normally goes to something like:  /api/v1/employees
-                send(method, "#{api_root}#{unversioned.tr('.', '/')}", { to: "#{controller_prefix}#{controller_name}##{action}" })
-              end
-            end
-            # %%% We do not yet surface the #show action
-            if (id_col = view_relation[:pk]&.first) # ID-dependent stuff
-              { :update => ['put', 'patch'], :destroy => ['delete'] }.each do |action, methods|
-                if actions.include?(action)
-                  methods.each do |method|
-                    send(method, "#{api_root}#{unversioned.tr('.', '/')}/:#{id_col}", { to: "#{controller_prefix}#{controller_name}##{action}" })
-                  end
-                end
-              end
-            end
-          end
-        end
-
-        # Trestle compatibility
-        if Object.const_defined?('Trestle') && ::Trestle.config.options&.key?(:site_title) &&
-            !Object.const_defined?("#{(res_name = resource_name.tr('/', '_')).camelize}Admin")
-          begin
-            ::Trestle.resource(res_sym = res_name.to_sym, model: class_name&.constantize) do
-              menu { item res_sym, icon: "fa fa-star" }
-            end
-          rescue
-          end
-        end
-      end
-
-      if (named_routes = instance_variable_get(:@set).named_routes).respond_to?(:find)
-        if ::Brick.config.add_status && (status_as = "#{controller_prefix.tr('/', '_')}brick_status".to_sym)
-          (
-            !(status_route = instance_variable_get(:@set).named_routes.find { |route| route.first == status_as }&.last) ||
-            !status_route.ast.to_s.include?("/#{controller_prefix}brick_status/")
-          )
-          get("/#{controller_prefix}brick_status", to: 'brick_gem#status', as: status_as.to_s)
-        end
-
-        # ::Brick.config.add_schema &&
-        if (schema_as = "#{controller_prefix.tr('/', '_')}brick_schema".to_sym)
-          (
-            !(schema_route = instance_variable_get(:@set).named_routes.find { |route| route.first == schema_as }&.last) ||
-            !schema_route.ast.to_s.include?("/#{controller_prefix}brick_schema/")
-          )
-          post("/#{controller_prefix}brick_schema", to: 'brick_gem#schema_create', as: schema_as.to_s)
-        end
-
-        if ::Brick.config.add_orphans && (orphans_as = "#{controller_prefix.tr('/', '_')}brick_orphans".to_sym)
-          (
-            !(orphans_route = instance_variable_get(:@set).named_routes.find { |route| route.first == orphans_as }&.last) ||
-            !orphans_route.ast.to_s.include?("/#{controller_prefix}brick_orphans/")
-          )
-          get("/#{controller_prefix}brick_orphans", to: 'brick_gem#orphans', as: 'brick_orphans')
-        end
-      end
-
-      if instance_variable_get(:@set).named_routes.names.exclude?(:brick_crosstab)
-        get("/#{controller_prefix}brick_crosstab", to: 'brick_gem#crosstab', as: 'brick_crosstab')
-        get("/#{controller_prefix}brick_crosstab/data", to: 'brick_gem#crosstab_data')
-      end
-
-      if ((rswag_ui_present = Object.const_defined?('Rswag::Ui')) &&
-          (rswag_path = routeset_to_use.routes.find { |r| r.app.app == ::Rswag::Ui::Engine }
-                                              &.instance_variable_get(:@path_formatter)
-                                              &.instance_variable_get(:@parts)&.join) &&
-          (doc_endpoints = ::Rswag::Ui.config.config_object[:urls])) ||
-         (doc_endpoints = ::Brick.instance_variable_get(:@swagger_endpoints))
-        last_endpoint_parts = nil
-        doc_endpoints.each do |doc_endpoint|
-          puts "Mounting OpenApi 3.0 documentation endpoint for \"#{doc_endpoint[:name]}\" on #{doc_endpoint[:url]}" unless ::Brick.routes_done
-          send(:get, doc_endpoint[:url], { to: 'brick_openapi#index' })
-          endpoint_parts = doc_endpoint[:url]&.split('/')
-          last_endpoint_parts = endpoint_parts
-        end
-      end
-      return if ::Brick.routes_done
-
-      if doc_endpoints.present?
-        if rswag_ui_present
-          if rswag_path
-            puts "API documentation now available when navigating to:  /#{last_endpoint_parts&.find(&:present?)}/index.html"
-          else
-            puts "In order to make documentation available you can put this into your routes.rb:"
-            puts "  mount Rswag::Ui::Engine => '/#{last_endpoint_parts&.find(&:present?) || 'api-docs'}'"
-          end
-        else
-          puts "Having this exposed, one easy way to leverage this to create HTML-based API documentation is to use Scalar.
-It will jump to life when you put these two lines into a view template or other HTML resource:
-  <script id=\"api-reference\" data-url=\"#{last_endpoint_parts.join('/')}\"></script>
-  <script src=\"https://cdn.jsdelivr.net/@scalar/api-reference\"></script>
-Alternatively you can add the rswag-ui gem."
-        end
-      elsif rswag_ui_present
-        sample_path = rswag_path || '/api-docs'
-        puts
-        puts "Brick:  rswag-ui gem detected -- to make OpenAPI 3.0 documentation available from a path such as  '#{sample_path}/v1/swagger.json',"
-        puts '        put code such as this in an initializer:'
-        puts '  Rswag::Ui.configure do |config|'
-        puts "    config.swagger_endpoint '#{sample_path}/v1/swagger.json', 'API V1 Docs'"
-        puts '  end'
-        unless rswag_path
-          puts
-          puts '        and put this into your routes.rb:'
-          puts "  mount Rswag::Ui::Engine => '/api-docs'"
-        end
-      end
-
-      puts "\n" if tables.present? || views.present?
-      if tables.present?
-        puts "Classes that can be built from tables:#{' ' * (table_class_length - 38)}  Path:"
-        puts "======================================#{' ' * (table_class_length - 38)}  ====="
-        ::Brick.display_classes(controller_prefix, tables, table_class_length)
-      end
-      if views.present?
-        puts "Classes that can be built from views:#{' ' * (view_class_length - 37)}  Path:"
-        puts "=====================================#{' ' * (view_class_length - 37)}  ====="
-        ::Brick.display_classes(controller_prefix, views, view_class_length)
-      end
-      ::Brick.routes_done = true
-    end
-  end
-
 end
 
 require 'brick/version_number'
@@ -2009,7 +1675,11 @@ end
 
 # Now the Ransack Polyamorous version of #build
 if Gem::Dependency.new('ransack').matching_specs.present?
-  require "polyamorous/activerecord_#{::ActiveRecord::VERSION::STRING[0, 3]}_ruby_2/join_dependency"
+  begin # First try the new way of requiring Polyamorous
+    require 'polyamorous/activerecord/join_dependency'
+  rescue LoadError => e
+    require "polyamorous/activerecord_#{::ActiveRecord::VERSION::STRING[0, 3]}_ruby_2/join_dependency"
+  end
   module Polyamorous::JoinDependencyExtensions
     def build(associations, base_klass, root = nil, path = '')
       root ||= associations

data/lib/generators/brick/controllers_generator.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+require 'brick'
+require 'rails/generators'
+require 'rails/generators/active_record'
+require 'fancy_gets'
+
+module Brick
+  # Auto-generates controllers
+  class ControllersGenerator < ::Rails::Generators::Base
+    include FancyGets
+    # include ::Rails::Generators::Migration
+
+    desc 'Auto-generates controllers'
+
+    def brick_controllers
+      # %%% If Apartment is active and there's no schema_to_analyse, ask which schema they want
+
+      ::Brick.mode = :on
+      ActiveRecord::Base.establish_connection
+
+      # Load all models and controllers
+      ::Brick.eager_load_classes
+
+      # Generate a list of viable controllers that can be chosen
+      longest_length = 0
+      model_info = Hash.new { |h, k| h[k] = {} }
+      tableless = Hash.new { |h, k| h[k] = [] }
+      existing_controllers = ActionController::Base.descendants.reject do |c|
+        c.name.start_with?('Turbo::Native::')
+      end.map(&:name)
+      controllers = ::Brick.relations.each_with_object([]) do |rel, s|
+        next if rel.first.is_a?(Symbol)
+
+        tbl_parts = rel.first.split('.')
+        tbl_parts.shift if [::Brick.default_schema, 'public'].include?(tbl_parts.first)
+        tbl_parts[-1] = tbl_parts[-1].pluralize
+        begin
+          s << ControllerOption.new(tbl_parts.join('/').camelize, rel.last[:class_name].constantize)
+        rescue
+        end
+      end.reject { |c| existing_controllers.include?(c.to_s) }
+      controllers.sort! do |a, b| # Sort first to separate namespaced stuff from the rest, then alphabetically
+        is_a_namespaced = a.to_s.include?('::')
+        is_b_namespaced = b.to_s.include?('::')
+        if is_a_namespaced && !is_b_namespaced
+          1
+        elsif !is_a_namespaced && is_b_namespaced
+          -1
+        else
+          a.to_s <=> b.to_s
+        end
+      end
+      controllers.each do |m| # Find longest name in the list for future use to show lists on the right side of the screen
+        if longest_length < (len = m.to_s.length)
+          longest_length = len
+        end
+      end
+      chosen = gets_list(list: controllers, chosen: controllers.dup)
+      relations = ::Brick.relations
+      chosen.each do |controller_option|
+        if (controller_parts = controller_option.to_s.split('::')).length > 1
+          namespace = controller_parts.first.constantize
+        end
+        _built_controller, code = Object.send(:build_controller, namespace, controller_parts.last, controller_parts.last.pluralize, controller_option.model, relations)
+        path = ['controllers']
+        path.concat(controller_parts.map(&:underscore))
+        dir = +"#{::Rails.root}/app"
+        path[0..-2].each do |path_part|
+          dir << "/#{path_part}"
+          Dir.mkdir(dir) unless Dir.exist?(dir)
+        end
+        File.open("#{dir}/#{path.last}.rb", 'w') { |f| f.write code } unless code.blank?
+      end
+      puts "\n*** Created #{chosen.length} controller files under app/controllers ***"
+    end
+  end
+end
+
+class ControllerOption
+  attr_accessor :name, :model
+
+  def initialize(name, model)
+    self.name = name
+    self.model = model
+  end
+
+  def to_s
+    name
+  end
+end

data/lib/generators/brick/migration_builder.rb

@@ -32,7 +32,7 @@ module Brick
                   'bit' => 'boolean',
                   'varbinary' => 'binary',
                   'tinyint' => 'integer', # %%% Need to put in "limit: 2"
-                  'year' => 'date',
+                  'year' => 'integer',
                   'set' => 'string',
                   # Sqlite data types
                   'TEXT' => 'text',

data/lib/generators/brick/models_generator.rb

@@ -6,12 +6,12 @@ require 'rails/generators/active_record'
 require 'fancy_gets'
 
 module Brick
-  # Auto-generates models, controllers, or views
+  # Auto-generates models
   class ModelsGenerator < ::Rails::Generators::Base
     include FancyGets
     # include ::Rails::Generators::Migration
 
-    desc 'Auto-generates models, controllers, or views.'
+    desc 'Auto-generates models.'
 
     def brick_models
       # %%% If Apartment is active and there's no schema_to_analyse, ask which schema they want

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.191
+  version: 1.0.192
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-09 00:00:00.000000000 Z
+date: 2023-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -248,12 +248,14 @@ files:
 - lib/brick/frameworks/rails/form_tags.rb
 - lib/brick/frameworks/rspec.rb
 - lib/brick/join_array.rb
+- lib/brick/route_mapper.rb
 - lib/brick/serializers/json.rb
 - lib/brick/serializers/yaml.rb
 - lib/brick/tasks/orphans.rake
 - lib/brick/util.rb
 - lib/brick/version_number.rb
 - lib/generators/brick/USAGE
+- lib/generators/brick/controllers_generator.rb
 - lib/generators/brick/install_generator.rb
 - lib/generators/brick/migration_builder.rb
 - lib/generators/brick/migrations_generator.rb