brick 1.0.220 → 1.0.222

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bc21a2ffe1c7434812f1167f26303a4eeda701766489b5616348a3b4a890a93
-  data.tar.gz: 1c8e6226c3653732f2ac3e481a8348d30aa78ec7520fa2923d2a11f33719e686
+  metadata.gz: b3e0a0e804ed376999842c2f8f31ba5b2db0ca019bce0e94b6b85b5869256667
+  data.tar.gz: 27cea38b19cec28e95515256aafd2e4a7fb1a220d3147d1123edd2ac74aa45b3
 SHA512:
-  metadata.gz: 391e5b7b6cf05618bf7cc74c55d0df46a5eb0d843cdc4ebfea501e5a7e5904181b4ad8f2440b7c8635da4dfe6225401ad1379cd8a52cfe2b26d9d9f38517afe6
-  data.tar.gz: 3c4335b074b040def278f5ba48b154cb122e575805c2cd7abda0157a610137f7899db7aed1c11f71923e5af6e84955f261c56d8dfbc0c4ab29c5600d4fb25152
+  metadata.gz: 4de80d5d689bb00369190f4b02093f56320309e6de856ed1e69ca570996e73987d6c27bbe3cfd124fae9ec274a19411d3935900c16e1d81e19cd40542f3714da
+  data.tar.gz: 453ac262c8314586ec6b1f68051871288659d4efffdbc442880efdae06ab435637508f7667e7dea93d543bbe82b291523d36fc2bfd67f801852c5416db8acdf6

data/lib/brick/config.rb

@@ -482,6 +482,19 @@ module Brick
       @mutex.synchronize { @ignore_migration_fks = relations }
     end
 
+    def salesforce_mode
+      @mutex.synchronize { @salesforce_mode }
+    end
+
+    def salesforce_mode=(true_or_false)
+      @mutex.synchronize { @salesforce_mode = true_or_false }
+    end
+
+    # Add search page for general Elasticsearch / Opensearch querying
+    def add_search
+      true
+    end
+
     # Add status page showing all resources and what files have been built out for them
     def add_status
       true

data/lib/brick/extensions.rb

@@ -192,7 +192,7 @@ module ActiveRecord
         # If there's no DSL yet specified, just try to find the first usable column on this model
         unless (dsl = ::Brick.config.model_descrips[name])
           skip_columns = _brick_get_fks + (::Brick.config.metadata_columns || []) + [primary_key]
-          dsl = if (descrip_col = columns.find { |c| [:boolean, :binary, :xml].exclude?(c.type) && skip_columns.exclude?(c.name) })
+          dsl = if table_exists? && (descrip_col = columns.find { |c| [:boolean, :binary, :xml].exclude?(c.type) && skip_columns.exclude?(c.name) })
                   "[#{descrip_col.name}]"
                 else
                   "#{name} ##{_pk_as_array.map { |pk_part| "[#{pk_part}]" }.join(', ')}"
@@ -383,7 +383,7 @@ module ActiveRecord
 
     # Providing a relation object allows auto-modules built from table name prefixes to work
     def self._brick_index(mode = nil, separator = nil, relation = nil, not_path = nil)
-      return if abstract_class?
+      return if abstract_class? || !table_exists?
 
       ::Brick._brick_index(table_name, mode, separator, relation, not_path)
     end
@@ -467,7 +467,7 @@ module ActiveRecord
       end
       skip_klass_hms = ::Brick.config.skip_index_hms[self.name] || {}
       hms.each do |k, hm|
-        next if skip_klass_hms.key?(k)
+        next if skip_klass_hms.key?(k) || !hm.klass.table_exists?
 
         if hm.macro == :has_one
           # For our purposes a :has_one is similar enough to a :belongs_to that we can just join forces
@@ -744,7 +744,6 @@ module ActiveRecord
         end
       end
 
-      # core_selects = selects.dup
       id_for_tables = Hash.new { |h, k| h[k] = [] }
       field_tbl_names = Hash.new { |h, k| h[k] = {} }
       used_col_aliases = {} # Used to make sure there is not a name clash
@@ -758,7 +757,6 @@ module ActiveRecord
         if @_brick_rel_dup.respond_to?(k) # Name already taken?
           # %%% Use ensure_unique here in this kind of fashion:
           # cnstr_name = ensure_unique(+"(brick) #{for_tbl}_#{pri_tbl}", nil, bts, hms)
-          # binding.pry
           next
         end
 
@@ -1290,8 +1288,9 @@ Might want to add this in your brick.rb:
 end
 
 if Object.const_defined?('ActionView')
-  require 'brick/frameworks/rails/form_tags'
-  require 'brick/frameworks/rails/form_builder'
+  require 'brick/rails'
+  require 'brick/rails/form_tags'
+  require 'brick/rails/form_builder'
   module ::ActionView::Helpers
     module FormTagHelper
       include ::Brick::Rails::FormTags
@@ -1480,7 +1479,7 @@ end
                begin
                  if plural_class_name == 'BrickOpenapi' ||
                     (
-                      (::Brick.config.add_status || ::Brick.config.add_orphans) &&
+                      (::Brick.config.add_search || ::Brick.config.add_status || ::Brick.config.add_orphans) &&
                       plural_class_name == 'BrickGem'
                     # Was:  ) || (model = self.const_get(full_class_name))
                     ) || (model = Object.const_get(full_class_name))
@@ -1741,6 +1740,52 @@ class Object
       built_model = Class.new(base_model) do |new_model_class|
         (schema_module || Object).const_set(chosen_name, new_model_class) unless is_generator
         @_brick_relation = relation
+        # Enable Elasticsearch for this one?
+        access = ::Brick.elasticsearch_models&.is_a?(Hash) ? ::Brick.elasticsearch_models[name] : ::Brick.elasticsearch_models
+        @_brick_es_crud ||= case access
+                            when String
+                              access
+                            when :all, :full
+                              'icrud' # Auto-create index, and full CRUD
+                            else
+                              ''
+                            end
+        unless @_brick_es_crud.blank?
+          include ::Elasticsearch::Model
+          code << "  include Elasticsearch::Model\n"
+          if @_brick_es_crud.index('i') # Enable auto-creation of indexes on import?
+            class << self
+              alias _original_import import
+              def import(options={}, &block)
+                self.__elasticsearch__.create_index! unless self.__elasticsearch__.index_exists?
+                _original_import(options={}, &block)
+              end
+            end
+          end
+          if @_brick_es_crud.index('c') || @_brick_es_crud.index('u') || @_brick_es_crud.index('d')
+            include ::Elasticsearch::Model::Callbacks
+            code << "  include Elasticsearch::Model::Callbacks\n"
+          end
+          if @_brick_es_crud.index('r')
+            # Customer.__elasticsearch__.search('taco').to_a
+          end
+          # # Need some mappings for text columns
+          # mappings do
+          #   indexes :company_name, type: 'text'
+          #   indexes :country, type: 'text'
+          # end
+          # def self.search(q)
+          #   s = self.__elasticsearch__.search(q)
+          #   binding.pry
+          #   s.to_a
+          # #   class Elasticsearch::Model::Response::Response
+          # #     def to_a
+          # #   end
+          # # rescue Elastic::Transport::Transport::Errors::NotFound => e
+          # #   self.create_index!
+          # #   self.__elasticsearch__.search(q)
+          # end
+        end
         if inheritable_name
           new_model_class.define_singleton_method :inherited do |subclass|
             super(subclass)
@@ -2431,6 +2476,7 @@ class Object
                                s << excl_parts.last
                              end
                            end
+            @_brick_es = real_model.instance_variable_get(:@_brick_es_crud)
             @_brick_bt_descrip = real_model._br_bt_descrip
             @_brick_hm_counts = real_model._br_hm_counts
             @_brick_join_array = join_array
@@ -2530,6 +2576,10 @@ class Object
                 session[:_brick_exclude] = excls
               end
               render json: { result: ::Brick.unexclude_column(table_name, col) }
+            elsif is_json && (q = params['_brick_es']) # Elasticsearch
+              # Make sure that the index is actually present and we allow reading before attempting
+              es_result = model.__elasticsearch__.search(q).to_a if (es_perms = model.instance_variable_get(:@_brick_es_crud)).index('r')
+              render json: { result: es_result }
             else
               real_model = model.real_model(params)
               singular_table_name = real_model.name.underscore.split('/').last

data/lib/brick/{frameworks/rails → rails}/engine.rb

@@ -582,7 +582,10 @@ window.addEventListener(\"popstate\", linkSchemas);
               alias :_brick_lookup_context :lookup_context
               def lookup_context(*args)
                 ret = _brick_lookup_context(*args)
-                @_lookup_context.instance_variable_set(:@_brick_req_params, params) if self.class < AbstractController::Base && respond_to?(:request) && request && params.present?
+                if self.class < AbstractController::Base
+                  request if respond_to?(:request) # ActionMailer does not have +request+
+                  @_lookup_context.instance_variable_set(:@_brick_req_params, params) if request && params.present?
+                end
                 ret
               end
             end
@@ -592,12 +595,14 @@ window.addEventListener(\"popstate\", linkSchemas);
             # Used by Rails 5.0 and above
             alias :_brick_template_exists? :template_exists?
             def template_exists?(*args, **options)
+              (::Brick.config.add_search && args.first == 'search') ||
               (::Brick.config.add_status && args.first == 'status') ||
               (::Brick.config.add_orphans && args.first == 'orphans') ||
               (args.first == 'crosstab') ||
               _brick_template_exists?(*args, **options) ||
-              # Do not auto-create a template when it's searching for an application.html.erb, which comes in like:  ["edit", ["games", "application"]]
-              ((args[1].length == 1 || args[1][-1] != 'application') &&
+              # By default do not auto-create a template when it's searching for an application.html.erb, which comes in like:  ["edit", ["games", "application"]]
+              # (Although specifying a class name for controllers_inherit_from will override this.)
+              ((args[1].length == 1 || ::Brick.config.controllers_inherit_from.present? || args[1][-1] != 'application') &&
                set_brick_model(args, @_brick_req_params))
             end
 
@@ -654,6 +659,7 @@ window.addEventListener(\"popstate\", linkSchemas);
             def find_template(*args, **options)
               find_template_err = nil
               unless (model_name = @_brick_model&.name) ||
+                     (is_search = ::Brick.config.add_search && args[0..1] == ['search', ['brick_gem']]) ||
                      (is_status = ::Brick.config.add_status && args[0..1] == ['status', ['brick_gem']]) ||
                      (is_orphans = ::Brick.config.add_orphans && args[0..1] == ['orphans', ['brick_gem']]) ||
                      (is_crosstab = args[0..1] == ['crosstab', ['brick_gem']])
@@ -775,10 +781,14 @@ window.addEventListener(\"popstate\", linkSchemas);
                                 end
                                 s << "<option value=\"#{::Brick._brick_index(rel.first, nil, '/', nil, true)}\">#{rel.first}#{rowcount}</option>"
                               end.html_safe
+              # Options for special Brick pages
               prefix = "#{::Brick.config.path_prefix}/" if ::Brick.config.path_prefix
-              table_options << "<option value=\"#{prefix}brick_status\">(Status)</option>".html_safe if ::Brick.config.add_status
-              table_options << "<option value=\"#{prefix}brick_orphans\">(Orphans)</option>".html_safe if is_orphans
-              table_options << "<option value=\"#{prefix}brick_crosstab\">(Crosstab)</option>".html_safe if is_crosstab
+              [['Search', ::Brick.config.add_search],
+               ['Status', ::Brick.config.add_status],
+               ['Orphans', is_orphans],
+               ['Crosstab', is_crosstab]].each do |table_option, show_it|
+                table_options << "<option value=\"#{prefix}brick_#{table_option.downcase}\">(#{table_option})</option>".html_safe if show_it
+              end
               css = +''
               css << ::Brick::Rails::BRICK_CSS
               css << "<script>
@@ -1048,6 +1058,64 @@ end
       });
     });
   </script>
+<% end
+   # SEARCH BOX
+   if @_brick_es&.index('r') # Must have at least Elasticsearch Read access %>
+  <input type=\"text\" id=\"esSearch\"><a href=\"\">S</a>
+  <script>
+    var esSearch = document.getElementById(\"esSearch\")
+    var isEsFiltered = false;
+    esSearch.addEventListener(\"input\", function () {
+      var gridTrs;
+      if (this.value.length > 2) { # At least 3 letters in the search term
+        var es = doFetch(\"POST\", {_brick_es: this.value},
+          function (p) {p.text().then(function (response) {
+            var result = JSON.parse(response).result;
+            if (result.length > 0) {
+              // Show only rows that have matches
+              gridTrs = [... grid.querySelectorAll(\"tr\")];
+              for (var i = 1; i < gridTrs.length; ++i) {
+                var row = gridTrs[i];
+                // Check all results to see if this one is in the list
+                var rid = row.getAttribute(\"x-id\");
+                var isHit = false;
+                for (var j = 0; j < result.length; ++j) {
+                  if (rid == result[j]._id) {
+                    isHit = true;
+                    break;
+                  }
+                }
+                if (!isHit) row.style.display = \"none\";
+              }
+              isEsFiltered = true;
+            } else {
+              if (isEsFiltered) { // Show all rows and gray the search box
+                gridTrs = [... grid.querySelectorAll(\"tr\")];
+                for (var i = 1; i < gridTrs.length; ++i) {
+                  gridTrs[i].style.display = \"table-row\";
+                }
+              }
+            }
+          });}
+        );
+      } else {
+        if (isEsFiltered) { // Show all rows and gray the search box
+          gridTrs = [... grid.querySelectorAll(\"tr\")];
+          for (var i = 1; i < gridTrs.length; ++i) {
+            gridTrs[i].style.display = \"table-row\";
+          }
+        }
+      }
+    });
+    esSearch.addEventListener(\"keypress\", function (e) {
+      if (e.keyCode == 13) {
+//        debugger
+        // Go to search results page
+//        var es = doFetch(\"POST\", {_brick_es: this.value});
+//        console.log(es);
+      }
+    });
+  </script>
 <% end %>
 </div></div>
 #{::Brick::Rails.erd_markup(@_brick_model, prefix) if @_brick_model}
@@ -1113,6 +1181,32 @@ end
 </html>
 "
 
+
+                       when 'search'
+                         if is_search
+# Search page - query across all indexes that appear to be related to models
++"#{css}
+<p class=\"flashNotice\"><%= notice if request.respond_to?(:flash) %></p>#{"
+#{schema_options}" if schema_options}
+<select id=\"tbl\">#{table_options}</select>
+<h1>Search</h1>
+<table id=\"resourceName\" class=\"shadow\"><thead><tr>
+  <th>Resource</th>
+  <th>Description</th>
+  <th>ID</th>
+</tr></thead>
+<tbody>
+<% # @results.each do |r| %>
+  <tr>
+  <td><%= %></td>
+  <td<%=  %></td>
+  <td<%=  %></td>
+  </tr>
+<% # end %>
+</tbody></table>
+#{script}"
+                         end
+
                        when 'status'
                          if is_status
 # Status page - list of all resources and 5 things they do or don't have present, and what is turned on and off
@@ -1197,7 +1291,7 @@ end
                            decipher.iv = "\xB4,\r2\x19\xF5\xFE/\aR\x1A\x8A\xCFV\v\x8C"
                            decipher.key = Digest::SHA256.hexdigest(::Brick.config.license).scan(/../).map { |x| x.hex }.pack('c*')
                            brick_path = Gem::Specification.find_by_name('brick').gem_dir
-                           decipher.update(File.binread("#{brick_path}/lib/brick/frameworks/rails/crosstab.brk"))[16..-1]
+                           decipher.update(File.binread("#{brick_path}/lib/brick/rails/crosstab.brk"))[16..-1]
                          else
                            'Crosstab Charting not yet activated -- enter a valid license key in brick.rb'
                          end

data/lib/brick/{frameworks/rails → rails}/form_tags.rb

@@ -69,7 +69,7 @@ module Brick::Rails::FormTags
                options[col[1].inheritance_column] = col[1].name unless col[1] == col[1].base_class
                x_order = " x-order=\"#{col_name}\"" if true
                s << "#{x_order}>#{col[2]} "
-               s << (col.first ? col[3].to_s : "#{link_to(col[3], send("#{col[1]._brick_index}_path", options))}")
+               s << ((col.first || !col[1].table_exists?) ? col[3].to_s : "#{link_to(col[3], send("#{col[1]._brick_index}_path", options))}")
              elsif cust_cols.key?(col_name) # Custom column
                x_order = " x-order=\"#{col_name}\"" if true
                s << "#{x_order}>#{col_name}"
@@ -99,9 +99,10 @@ module Brick::Rails::FormTags
     # proxy = relation.instance_variable_get(:@proxy) || relation.instance_variable_set(:@proxy, {})
     bi = relation.instance_variable_get(:@_brick_includes)
     relation.each do |obj|
-      out << "<tr>\n"
-      out << "<td class=\"col-sticky alternating-gray\">#{link_to('⇛', send("#{klass._brick_index(:singular)}_path".to_sym,
-                                                                            pk.map { |pk_part| obj.send(pk_part.to_sym) }), { class: 'big-arrow' })}</td>\n" if pk.present?
+      rid = pk.map { |pk_part| obj.send(pk_part.to_sym) }
+      out << "<tr x-id=\"#{rid.join('/')}\">\n"
+      out << "<td class=\"col-sticky alternating-gray\">#{link_to('⇛', send("#{klass._brick_index(:singular)}_path".to_sym, rid),
+                                                                  { class: 'big-arrow' })}</td>\n" if pk.present?
       ac = obj.instance_variable_get(:@association_cache) || obj.instance_variable_set(:@association_cache, {})
       # included = 
       bi&.each do |bi_key|

data/lib/brick/{frameworks/rails.rb → rails.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-# require 'brick/frameworks/rails/controller'
-require 'brick/frameworks/rails/engine'
+# require 'brick/rails/controller'
+require 'brick/rails/engine'
 
 module ::Brick::Rails
   class << self

data/lib/brick/reflect_tables.rb

@@ -8,10 +8,75 @@ module Brick
 
       # return if ActiveRecord::Base.connection.current_database == 'postgres'
 
+      # Utilise Elasticsearch indexes, if any
+      if Object.const_defined?('Elasticsearch')
+        if ::Elasticsearch.const_defined?('Client')
+          # Allow Elasticsearch gem > 7.10 to work with Opensearch
+          ::Elasticsearch::Client.class_exec do
+            alias _original_initialize initialize
+            def initialize(arguments = {}, &block)
+              _original_initialize(arguments,  &block)
+              @verified = true
+              @transport
+            end
+
+            # Auto-create when there is a missing index
+            alias _original_method_missing method_missing
+            def method_missing(name, *args, &block)
+              _original_method_missing(name, *args, &block)
+            rescue Elastic::Transport::Transport::Errors::NotFound => e
+              if (missing_index = args.last&.fetch(:defined_params, nil)&.fetch(:index, nil))
+                self.indices.create({ index: missing_index,
+                                      body: { settings: {}, mappings: { properties: {} } } })
+                puts "Auto-creating missing index \"#{missing_index}\""
+                _original_method_missing(name, *args, &block)
+              else
+                raise e
+              end
+            end
+          end
+        end
+        if ::Elasticsearch.const_defined?('Model')
+          # By setting the environment variable ELASTICSEARCH_URL then you can specify an Elasticsearch/Opensearch host
+          host = (client = ::Elasticsearch::Model.client).transport.hosts.first
+          es_uri = URI.parse("#{host[:protocol]}://#{host[:host]}:#{host[:port]}")
+          es_uri = nil if es_uri.to_s == 'http://localhost:9200'
+          begin
+            cluster_info = client.info.body
+            if (es_ver = cluster_info['version'])
+              ::Brick.elasticsearch_models = :all
+              puts "Found Elasticsearch gem and #{'local ' unless es_uri}#{es_ver['distribution'].titleize} #{es_ver['number']} installation#{" at #{es_uri}" if es_uri}."
+              puts "Enable Elasticsearch support by either setting \"::Brick.elasticsearch_models = :all\" or by picking specific models by name."
+
+              # # Auto-create when trying to import and there is a missing index
+              # ::Elasticsearch::Model::Importing.class_exec do
+              # end
+            end
+          rescue StandardError => e # Errno::ECONNREFUSED
+            puts "Found Elasticsearch gem, but could not connect to #{'local ' unless es_uri}Elasticsearch/Opensearch server#{" at #{es_uri}" if es_uri}."
+          end
+        # require 'net/http'
+        #   begin
+        #     es_uri = ENV['ELASTICSEARCH_URL']
+        #     binding.pry
+        #     cluster_info = JSON.parse(Net::HTTP.get(URI.parse(es_uri || 'http://localhost:9200')))
+        #     if (es_ver = cluster_info['version'])
+        #       ::Brick.elasticsearch_models = :all
+        #       puts "Found Elasticsearch gem and #{'local ' unless es_uri}#{es_ver['distribution'].titleize} #{es_ver['number']} installation#{" at #{es_uri}" if es_uri}."
+        #       puts "Enable Elasticsearch support by either setting \"::Brick.elasticsearch_models = :all\" or by picking specific models by name."
+        #     end
+        #   rescue StandardError => e
+        #   end
+        end
+      end
+      # client = Elasticsearch::Client.new(host: 'https://my-elasticsearch-host.example')
+      # client.ping
+      # client.search(q: 'test')
+
       # Overwrite SQLite's #begin_db_transaction so it opens in IMMEDIATE mode instead of
       # the default DEFERRED mode.
       #   https://discuss.rubyonrails.org/t/failed-write-transaction-upgrades-in-sqlite3/81480/2
-      if ActiveRecord::Base.connection.adapter_name == 'SQLite'
+      if ActiveRecord::Base.connection.adapter_name == 'SQLite' && ActiveRecord.version >= Gem::Version.new('5.1')
         arca = ::ActiveRecord::ConnectionAdapters
         db_statements = arca::SQLite3.const_defined?('DatabaseStatements') ? arca::SQLite3::DatabaseStatements : arca::SQLite3::SchemaStatements
         # Rails 7.1 and later
@@ -410,7 +475,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
         v[:resource] = proposed_name_parts.last.underscore
         if colliding_thing
           message_start = if colliding_thing.is_a?(Module) && Object.const_defined?(:Rails) &&
-                             colliding_thing.constants.find { |c| colliding_thing.const_get(c) < ::Rails::Application }
+                             colliding_thing.constants.find { |c| (ctc = colliding_thing.const_get(c)).is_a?(Class) && ctc < ::Rails::Application }
                             "The module for the Rails application itself, \"#{colliding_thing.name}\","
                           else
                             "Non-AR #{colliding_thing.class.name.downcase} \"#{colliding_thing.name}\""

data/lib/brick/route_mapper.rb

@@ -1,10 +1,6 @@
 # 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
@@ -276,6 +272,15 @@ module Brick
       end
 
       if (named_routes = instance_variable_get(:@set).named_routes).respond_to?(:find)
+        # Generic Elasticsearch / Opensearch query page
+        if ::Brick.config.add_search && (search_as = "#{controller_prefix.tr('/', '_')}brick_search".to_sym)
+          (
+            !(search_route = instance_variable_get(:@set).named_routes.find { |route| route.first == search_as }&.last) ||
+            !search_route.ast.to_s.include?("/#{controller_prefix}brick_search/")
+          )
+          get("/#{controller_prefix}brick_search", to: 'brick_gem#search', as: search_as.to_s)
+        end
+
         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) ||

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -92,7 +92,7 @@ require 'brick/config'
 require 'brick/reflect_tables'
 if Gem::Dependency.new('rails').matching_specs.present?
   require 'rails'
-  require 'brick/frameworks/rails'
+  # require 'brick/rails'
 end
 module Brick
   ALL_API_ACTIONS = [:index, :show, :create, :update, :destroy]
@@ -110,7 +110,9 @@ module Brick
     attr_accessor :default_schema, :db_schemas, :test_schema,
                   :established_drf,
                   :is_oracle, :is_eager_loading, :auto_models, :initializer_loaded,
-                  :table_name_lookup
+                  :table_name_lookup,
+                  :elasticsearch_models,
+                  :routes_done
     ::Brick.auto_models = []
 
     def get_possible_schemas
@@ -297,7 +299,7 @@ module Brick
             end
           else
             this_fks = (this_fk = a.foreign_key).is_a?(Array) ? this_fk.uniq : [this_fk.to_s]
-            if !a.options.key?(:as) && (this_fks - a.klass.column_names).length.positive?
+            if !a.options.key?(:as) && a.klass.table_exists? && (this_fks - a.klass.column_names).length.positive?
               options = ", #{a.options.map { |k, v| "#{k.inspect} => #{v.inspect}" }.join(', ')}" if a.options.present?
               puts "WARNING:  Model #{model.name} has this association:
             has_many :#{a.name}#{options}

data/lib/generators/brick/install_generator.rb

@@ -119,15 +119,18 @@ module Brick
         end
         resembles_fks = resembles_fks.values.flatten
 
+        # Brick additional references
+        # Used to have:  ActiveRecord::Base.connection.current_database  -- but this doesn't work with SQLite3Adapter
+        current_db = ActiveRecord::Base.connection&.instance_variable_get(:@config)&.fetch(:database, nil)
         bar = case (possible_additional_references = possible_additional_references.values.flatten).length
               when 0
 +"  # Brick.additional_references = [['orders', 'customer_id', 'customer'],
   #                                ['customer', 'region_id', 'regions']]"
               when 1
-+"  # # Here is a possible additional reference that has been auto-identified for the #{ActiveRecord::Base.connection.current_database} database:
++"  # # Here is a possible additional reference that has been auto-identified for the #{current_db} database:
   # Brick.additional_references = [#{possible_additional_references.first}]"
               else
-+"  # # Here are possible additional references that have been auto-identified for the #{ActiveRecord::Base.connection.current_database} database:
++"  # # Here are possible additional references that have been auto-identified for the #{current_db} database:
   # Brick.additional_references = [
   #   #{possible_additional_references.join(",\n  #   ")}
   # ]"
@@ -146,12 +149,12 @@ module Brick
   #                      }"
       when 1
 ".
-  # # Here is a possible polymorphic association that has been auto-identified for the #{ActiveRecord::Base.connection.current_database} database:
+  # # Here is a possible polymorphic association that has been auto-identified for the #{current_db} database:
   # Brick.polymorphics = { #{possible_additional_references.first} }"
 
       else
 ".
-  # # Here are possible polymorphic associations that have been auto-identified for the #{ActiveRecord::Base.connection.current_database} database:
+  # # Here are possible polymorphic associations that have been auto-identified for the #{current_db} database:
   # Brick.polymorphics = {
   #   #{possible_polymorphics.join(",\n  #   ")}
   # }"
@@ -342,6 +345,9 @@ if ActiveRecord::Base.respond_to?(:brick_select) && !::Brick.initializer_loaded
   # # user, then you can use model_descrips like this, putting expressions with property references in square brackets:
   # Brick.model_descrips = { 'User' => '[profile.firstname] [profile.lastname]' }
 
+  # # FULL TEXT SEARCH
+  # Brick.elasticsearch_models = :all
+
   # # ERD SETTINGS
 
   # # By default the Entity Relationship Diagram fragment which is available to be shown on the Grid page includes
@@ -392,6 +398,19 @@ if ActiveRecord::Base.respond_to?(:brick_select) && !::Brick.initializer_loaded
   # Brick.default_route_fallback = 'customers'
   # Brick.default_route_fallback = 'orders#outstanding' # Example of a non-RESTful route
   # Brick.default_route_fallback = '' # Omits setting a default route in the absence of any other
+
+  # # GENERATORS
+  # # ==========
+
+  # # MIGRATIONS
+
+  # # Salesforce has table names which use multiple underscores in a row, more than two at a time.  This can greatly
+  # # confuse some of the other underscore support put into place for Oracle table names which can have up to two
+  # # underscores at a time.
+  # #
+  # # Setting this +true+ turns on \"salesforce mode\" which means that auto-created migrations will convert
+  # # underscores in filenames and class names to the letter 'x' in order to keep the peace.
+  # Brick.config.salesforce_mode = true
 end
 ")
       end

data/lib/generators/brick/migration_builder.rb

@@ -109,6 +109,7 @@ module Brick
             s[v_parts.first] = nil unless [::Brick.default_schema, 'public'].include?(v_parts.first)
           end
         end
+        separator = ::Brick.config.salesforce_mode ? 'x' : nil
         # Start the timestamps back the same number of minutes from now as expected number of migrations to create
         current_mig_time = [Time.now - (schemas.length + chosen.length).minutes]
         done = []
@@ -146,7 +147,7 @@ module Brick
                                         key_type, is_4x_rails, ar_version, do_fks_last, versions_to_create)
             after_fks.concat(add_fks) if do_fks_last
             current_mig_time[0] += 1.minute
-            versions_to_create << migration_file_write(mig_path, "create_#{::Brick._brick_index(tbl, nil, 'x')}", current_mig_time, ar_version, mig)
+            versions_to_create << migration_file_write(mig_path, "create_#{::Brick._brick_index(tbl, nil, separator)}", current_mig_time, ar_version, mig)
           end
           done.concat(fringe)
           chosen -= done
@@ -159,7 +160,7 @@ module Brick
                                         key_type, is_4x_rails, ar_version, do_fks_last, versions_to_create)
             after_fks.concat(add_fks)
             current_mig_time[0] += 1.minute
-            versions_to_create << migration_file_write(mig_path, "create_#{::Brick._brick_index(tbl, :migration, 'x')}", current_mig_time, ar_version, mig)
+            versions_to_create << migration_file_write(mig_path, "create_#{::Brick._brick_index(tbl, :migration, separator)}", current_mig_time, ar_version, mig)
           end
           done.concat(chosen)
           chosen.clear

data/lib/generators/brick/seeds_generator.rb

@@ -64,6 +64,8 @@ module Brick
       stuck = {}
       indexes = {} # Track index names to make sure things are unique
       ar_base = Object.const_defined?(:ApplicationRecord) ? ApplicationRecord : Class.new(ActiveRecord::Base)
+      atrt_idx = 0    # ActionText::RichText unique index number
+      @has_atrts = nil # Any ActionText::RichText present?
       # Start by making entries for fringe models (those with no foreign keys).
       # Continue layer by layer, creating entries for models that reference ones already done, until
       # no more entries can be created.  (At that point hopefully all models are accounted for.)
@@ -88,6 +90,16 @@ module Brick
                       end
             ).present?
         seeds << "\n"
+        # Search through the fringe to see if we should bump special dependent classes forward to the next fringe.
+        # (Currently only ActiveStorage::Attachment if there's also an ActiveStorage::VariantRecord in the same
+        # fringe, and always have ActionText::EncryptedRichText at the very end.)
+        fringe_classes = fringe.map { |f| f.klass.name }
+        unless (asa_idx = fringe_classes.index('ActiveStorage::Attachment')).nil?
+          fringe.slice!(asa_idx) if fringe_classes.include?('ActiveStorage::VariantRecord')
+        end
+        unless (atert_idx = fringe_classes.index('ActionText::EncryptedRichText')).nil?
+          fringe.slice!(atert_idx) if fringe_classes.length > 1
+        end
         fringe.each do |seed_model|
           tbl = seed_model.table_name
           next unless ::Brick.config.exclude_tables.exclude?(tbl) &&
@@ -122,12 +134,14 @@ module Brick
           klass.order(*pkey_cols).each do |obj|
             unless has_rows
               has_rows = true
-              seeds << "  puts 'Seeding: #{seed_model.klass.name}'\n"
+              seeds << "  puts 'Seeding: #{klass.name}'\n"
             end
             is_empty = false
             pk_val = obj.send(pkey_cols.first)
+            var_name = "#{tbl.gsub('.', '__')}_#{brick_escape(pk_val)}"
             fk_vals = []
             data = []
+            updates = []
             relation[:cols].each do |col, _col_type|
               next if !(fk = fkeys.find { |assoc| col == assoc[:fk] }) &&
                       pkey_cols.include?(col)
@@ -142,11 +156,52 @@ module Brick
                 inv_tbl = fk[:inverse_table].gsub('.', '__')
                 fk_vals << "#{fk[:assoc_name]}: #{inv_tbl}_#{brick_escape(val)}" if val
               else
-                val = val.to_s if val.is_a?(ActiveStorage::Filename)
-                data << "#{col}: #{val.inspect}"
+                val = case val.class.name
+                      when 'ActiveStorage::Filename'
+                        val.to_s.inspect
+                      when 'ActionText::RichText'
+                        ensure_has_atrts(updates)
+                        atrt_var = "atrt#{atrt_idx += 1}"
+                        atrt_create = "(#{atrt_var} = #{val.class.name}.create(name: #{val.name.inspect}, body: #{val.to_trix_html.inspect
+                                      }, record_type: #{val.record_type.inspect}, record_id: #{var_name}.#{pkey_cols.first
+                                      }, created_at: DateTime.parse('#{val.created_at.inspect}'), updated_at: DateTime.parse('#{val.updated_at.inspect}')))"
+                        updates << "#{var_name}.update(#{col}: #{atrt_create})\n"
+                        # obj.send(col)&.embeds_blobs&.each do |blob|
+                          updates << "atrt_ids[[#{val.id}, '#{val.class.name}']] = #{atrt_var}.id\n"
+                        # end
+                        next
+                      else
+                        val.inspect
+                      end
+                data << "#{col}: #{val}" unless val == 'nil'
               end
             end
-            seeds << "#{tbl.gsub('.', '__')}_#{brick_escape(pk_val)} = #{seed_model.klass.name}.create(#{(fk_vals + data).join(', ')})\n"
+            case klass.name
+            when 'ActiveStorage::VariantRecord'
+              ensure_has_atrts(updates)
+              updates << "atrt_ids[[#{obj.id}, '#{klass.name}']] = #{var_name}.id\n"
+            end
+            # Make sure that ActiveStorage::Attachment and ActionText::EncryptedRichText get
+            # wired up to the proper record_id
+            if klass.name == 'ActiveStorage::Attachment' || klass.name == 'ActionText::EncryptedRichText'
+              record_class = data.find { |d| d.start_with?('record_type: ') }[14..-2]
+              record_id = data.find { |d| d.start_with?('record_id: ') }[11..-1]
+              data.reject! { |d| d.start_with?('record_id: ') || d.start_with?('created_at: ') || d.start_with?('updated_at: ') }
+              data << "record_id: atrt_ids[[#{record_id}, '#{record_class}']]"
+              seeds << "#{var_name} = #{klass.name}.find_or_create_by(#{(fk_vals + data).join(', ')}) do |asa|
+  asa.created_at = DateTime.parse('#{obj.created_at.inspect}')#{"
+  asa.updated_at = DateTime.parse('#{obj.updated_at.inspect}')" if obj.respond_to?(:updated_at)}
+end\n"
+            else
+              seeds << "#{var_name} = #{seed_model.klass.name}.create(#{(fk_vals + data).join(', ')})\n"
+              klass.attachment_reflections.each do |k, v|
+                if (attached = obj.send(k))
+                  ensure_has_atrts(updates)
+                  updates << "atrt_ids[[#{obj.id}, '#{klass.name}']] = #{var_name}.id\n"
+                end
+              end if klass.respond_to?(:attachment_reflections)
+            end
+            updates.each { |update| seeds << update } # Anything that needs patching up after-the-fact
           end
           seeds << "  # (Skipping #{seed_model.klass.name} as it has no rows)\n" unless has_rows
           File.open(seed_file_path, "w") { |f| f.write seeds }
@@ -190,5 +245,12 @@ module Brick
         val
       end
     end
+
+    def ensure_has_atrts(array)
+      unless @has_atrts
+        array << "atrt_ids = {}\n"
+        @has_atrts = true
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.220
+  version: 1.0.222
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-23 00:00:00.000000000 Z
+date: 2024-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -190,14 +190,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 2.3.0
 description: 'Auto-create models, views, controllers, and routes with this slick Rails
   extension
 
@@ -212,14 +212,14 @@ files:
 - lib/brick/config.rb
 - lib/brick/extensions.rb
 - lib/brick/frameworks/cucumber.rb
-- lib/brick/frameworks/rails.rb
-- lib/brick/frameworks/rails/controller.rb
-- lib/brick/frameworks/rails/crosstab.brk
-- lib/brick/frameworks/rails/engine.rb
-- lib/brick/frameworks/rails/form_builder.rb
-- lib/brick/frameworks/rails/form_tags.rb
 - lib/brick/frameworks/rspec.rb
 - lib/brick/join_array.rb
+- lib/brick/rails.rb
+- lib/brick/rails/controller.rb
+- lib/brick/rails/crosstab.brk
+- lib/brick/rails/engine.rb
+- lib/brick/rails/form_builder.rb
+- lib/brick/rails/form_tags.rb
 - lib/brick/reflect_tables.rb
 - lib/brick/route_mapper.rb
 - lib/brick/serializers/json.rb
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Create a Rails app from data alone