brick 1.0.235 → 1.0.236

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbee410a881406dbcec60714bf2688d0cbc4aef0c89a68888ce9f2401e0005dd
-  data.tar.gz: b1a06757052b4130080b6a8762b1d7f8522f551956850bb8c2fe6655260380eb
+  metadata.gz: 8397091edab4be1edd1e61eb4be3284a8c169a3207f87e92227b84d07413d241
+  data.tar.gz: 2ffaef636cfba92e38bf9330f04a5bd65f39eb06d62e002e5227f7261b126494
 SHA512:
-  metadata.gz: 2eca4cb00874a367159483ac23a6a03d273d5b5bd54913272f99a7ffefc26e2bbaced2a52b9df624320912e9b70445a432dd4694e5ccc673cb60187633e87d91
-  data.tar.gz: 381d498e42a473cf92cd556b843c59eb08618b0c8f2e61808689a4f1b4c2d5a0e0078d171d64b055cedca78d81bf5fbcfa73eff5268ca3d9d56076ec1c505299
+  metadata.gz: 38d24e9e8ae60a63f6755bb5e0854880df019ce4004d3e8962c8a47cfc80bb23fcba576216e9cedf7560f37b458ce47e651ccaa206b0e92844519e2a932d7c7e
+  data.tar.gz: 4f33bd865494dcd1855204bd5c307f8b2fc70485bd8ce5c9fd79708df638ff0f715d44755087a0c8230589dd3679d238dfdaeea8807dc14cf4a658fae21ffa7d

data/lib/brick/extensions.rb

@@ -70,7 +70,8 @@ module ActiveRecord
         false
       end
 
-      def real_model(params)
+      # Accommodate STI
+      def find_real_model(params)
         if params && ((sub_name = params.fetch(inheritance_column, nil)).present? ||
                       (sub_name = params[name.underscore]&.fetch(inheritance_column, nil)))
           sub_name = sub_name.first if sub_name.is_a?(Array) # Support the params style that gets returned from #_brick_querying
@@ -83,10 +84,9 @@ module ActiveRecord
         end
       end
 
-      # Accommodate STI
       def real_singular(params)
-        real_model = real_model(params)
-        [real_model, real_model.name.underscore.split('/').last]
+        real_model = find_real_model(params)
+        [real_model, real_model.name.underscore.tr('/', '_')]
       end
 
       def json_column?(col)
@@ -961,8 +961,12 @@ module ActiveRecord
                          fk_col = (inv = hm.inverse_of)&.foreign_key || hm.foreign_key
                          # %%% Might only need hm.type and not the first part :)
                          poly_type = inv&.foreign_type || hm.type if hm.options.key?(:as)
-                         pk = hm.klass.primary_key
-                         (pk.is_a?(Array) ? pk.first : pk) || '*'
+                         if hm.macro == :has_and_belongs_to_many
+                           '*'
+                         else
+                           pk = hm.klass.primary_key
+                           (pk.is_a?(Array) ? pk.first : pk) || '*'
+                         end
                        end
         next unless count_column # %%% Would be able to remove this when multiple foreign keys to same destination becomes bulletproof
 
@@ -1830,7 +1834,7 @@ class Object
               def import(options={}, &block)
                 unless self.__elasticsearch__.index_exists?
                   self.__elasticsearch__.create_index!
-                  ::Brick.elasticsearch_existings[self.table_name] = self.table_name.tr('.', '-').pluralize
+                  ::Brick.elasticsearch_existings[self.table_name.tr('.', '-').pluralize] = self.table_name
                 end
                 _original_import(options={}, &block)
               end
@@ -1867,7 +1871,7 @@ class Object
                 end
               rescue Elastic::Transport::Transport::Errors::NotFound => e
                 self.__elasticsearch__.create_index! if @_brick_es_crud.index('i')
-                ::Brick.elasticsearch_existings[self.table_name] = self.table_name.tr('.', '-').pluralize
+                ::Brick.elasticsearch_existings[self.table_name.tr('.', '-').pluralize] = self.table_name
                 []
               end
             end
@@ -2040,12 +2044,12 @@ class Object
                           (anaf.is_a?(Array) ? anaf.include?(assoc_name) : anaf == assoc_name)
                 macro
               end
-      # Figure out if we need to specially call out the class_name and/or foreign key
-      # (and if either of those then definitely also a specific inverse_of)
       if (singular_table_parts = singular_table_name.split('.')).length > 1 &&
          ::Brick.config.schema_behavior[:multitenant] && singular_table_parts.first == 'public'
         singular_table_parts.shift
       end
+      # Figure out if we need to specially call out the class_name and/or foreign key
+      # (and if either of those then definitely also a specific inverse_of)
       if need_class_name
         options[:class_name] = "::#{assoc[:primary_class]&.name || ::Brick.relations[inverse_table][:class_name]}"
       end
@@ -2441,7 +2445,7 @@ class Object
               return
             end
 
-            real_model = model.real_model(params)
+            real_model = model.find_real_model(params)
 
             if request.format == :csv # Asking for a template?
               require 'csv'
@@ -2520,9 +2524,10 @@ class Object
                    end
             end
             ar_select = ar_relation.respond_to?(:_select!) ? ar_relation.dup._select!(*selects, *counts) : ar_relation.select(selects + counts)
+            # %%% should this be real_singular_name.pluralize?
             instance_variable_set("@#{plural_table_name}".to_sym, ar_select)
             @_lookup_context.instance_variable_set(:@_brick_is_postgres, true) if is_postgres
-            table_name_no_schema = singular_table_name.pluralize
+            table_name_no_schema = real_model.name.underscore.split('/').last.pluralize # %%% hmmm ...
             if namespace && (idx = lookup_context.prefixes.index(table_name_no_schema))
               lookup_context.prefixes[idx] = "#{namespace.name.underscore}/#{lookup_context.prefixes[idx]}"
             end
@@ -2538,6 +2543,12 @@ class Object
             @_brick_erd = params['_brick_erd']&.to_i
             add_csp_hash
           end
+
+          _, order_by_txt = model._brick_calculate_ordering(default_ordering(table_name, pk, true)) if pk
+          code << "  def index\n"
+          code << "    @#{plural_table_name} = #{model.name}#{pk&.present? ? ".order(#{order_by_txt.join(', ')})" : '.all'}\n"
+          code << "    @#{plural_table_name}._brick_querying(params, brick_col_names: true)\n"
+          code << "  end\n"
         end
 
         unless is_openapi || is_avo # Normal controller (non-API)
@@ -2561,12 +2572,6 @@ class Object
             end
           end
 
-          _, order_by_txt = model._brick_calculate_ordering(default_ordering(table_name, pk, true)) if pk
-          code << "  def index\n"
-          code << "    @#{plural_table_name} = #{model.name}#{pk&.present? ? ".order(#{order_by_txt.join(', ')})" : '.all'}\n"
-          code << "    @#{plural_table_name}._brick_querying(params, brick_col_names: true)\n"
-          code << "  end\n"
-
           # ----------------------------------------------------------------------------------
 
           if pk.present?
@@ -2576,8 +2581,8 @@ class Object
             find_obj = "find_#{singular_table_name}"
             self.define_method :show do
               _schema, @_is_show_schema_list = ::Brick.set_db_schema(params)
-              _, singular_table_name = model.real_singular(params)
-              instance_variable_set("@#{singular_table_name}".to_sym, send(find_obj))
+              _, real_singular_table_name = model.real_singular(params)
+              instance_variable_set("@#{real_singular_table_name}".to_sym, send(find_obj))
               add_csp_hash("'unsafe-inline'")
             end
           end
@@ -2595,7 +2600,7 @@ class Object
                            send(params_name_sym)
                          rescue
                          end
-            real_model, singular_table_name = model.real_singular(params)
+            real_model, real_singular_table_name = model.real_singular(params)
             new_params ||= real_model.attribute_names.each_with_object({}) do |a, s|
               if (val = params["__#{a}"])
                 # val = case new_obj.class.column_for_attribute(a).type
@@ -2613,7 +2618,7 @@ class Object
                 new_obj.send("#{k}=", ::ActiveStorage::Filename.new('')) if v.is_a?(::ActiveStorage::Filename) && !v.instance_variable_get(:@filename)
               end if Object.const_defined?('ActiveStorage')
             end
-            instance_variable_set("@#{singular_table_name}".to_sym, new_obj)
+            instance_variable_set("@#{real_singular_table_name}".to_sym, new_obj)
             add_csp_hash
           end
 
@@ -2645,9 +2650,9 @@ class Object
                               model.__elasticsearch__.search(q)
                             rescue Elastic::Transport::Transport::Errors::NotFound => e
                               if @_brick_es_crud.index('i')
-                                self.__elasticsearch__.create_index!
+                                model.__elasticsearch__.create_index!
                                 # model.import
-                                ::Brick.elasticsearch_existings[self.table_name] = self.table_name.tr('.', '-').pluralize
+                                ::Brick.elasticsearch_existings[model.table_name.tr('.', '-').pluralize] = model.table_name
                                 model.__elasticsearch__.search(q)
                               else
                                 []
@@ -2656,8 +2661,7 @@ class Object
               end
               render json: { result: es_result }
             else
-              real_model = model.real_model(params)
-              singular_table_name = real_model.name.underscore.split('/').last
+              real_model, real_singular_table_name = model.real_singular(params)
               created_obj = model.send(:new, send(params_name_sym))
               if created_obj.respond_to?(inh_col = model.inheritance_column) && created_obj.send(inh_col) == ''
                 created_obj.send("#{inh_col}=", model.name)
@@ -2665,12 +2669,12 @@ class Object
               created_obj.save
               @_lookup_context.instance_variable_set(:@_brick_model, real_model)
               if created_obj.errors.empty?
-                instance_variable_set("@#{singular_table_name}".to_sym, created_obj)
+                instance_variable_set("@#{real_singular_table_name}".to_sym, created_obj)
                 @_lookup_context.instance_variable_set(:@_brick_is_postgres, true) if is_postgres
                 index
                 render :index
               else # Surface errors to the user in a flash message
-                instance_variable_set("@#{singular_table_name}".to_sym, created_obj)
+                instance_variable_set("@#{real_singular_table_name}".to_sym, created_obj)
                 flash.now.alert = (created_obj.errors.errors.map { |err| "<b>#{err.attribute}</b> #{err.message}" }.join(', '))
                 new
                 render :new
@@ -2689,8 +2693,8 @@ class Object
             code << "  end\n"
             self.define_method :edit do
               _schema, @_is_show_schema_list = ::Brick.set_db_schema(params)
-              _, singular_table_name = model.real_singular(params)
-              instance_variable_set("@#{singular_table_name}".to_sym, send(find_obj))
+              _, real_singular_table_name = model.real_singular(params)
+              instance_variable_set("@#{real_singular_table_name}".to_sym, send(find_obj))
               add_csp_hash
             end
 
@@ -2717,8 +2721,8 @@ class Object
               #   return
               end
 
-              _, singular_table_name = model.real_singular(params)
-              instance_variable_set("@#{singular_table_name}".to_sym, (obj = send(find_obj)))
+              _, real_singular_table_name = model.real_singular(params)
+              instance_variable_set("@#{real_singular_table_name}".to_sym, (obj = send(find_obj)))
               upd_params = send(params_name_sym)
               json_overrides = ::Brick.config.json_columns&.fetch(table_name, nil)
               if model.respond_to?(:devise_modules)
@@ -2746,7 +2750,8 @@ class Object
               end
               # Do not clear out a has_many_attached field if it already has an entry and nothing is supplied
               hoa, hma, rtans = model._activestorage_actiontext_fields
-              all_params = params[singular_table_name]
+              # %%% does this work with STI?
+              all_params = params[real_singular_table_name]
               hma.each do |hma_field|
                 if upd_hash.fetch(hma_field) == [''] && # No new attachments...
                    all_params&.fetch("_brick_attached_#{hma_field}", nil) # ...and there is something existing

data/lib/brick/rails/engine.rb

@@ -626,7 +626,7 @@ window.addEventListener(\"popstate\", linkSchemas);
                          # Only CUD stuff has create / update / destroy
                          (!model.is_view? && ['new', 'create', 'edit', 'update', 'destroy'].include?(find_args.first))
                        )
-                      @_brick_model = model.real_model(params)
+                      @_brick_model = model.find_real_model(params)
                     end
                   rescue
                   end
@@ -1344,8 +1344,8 @@ end
 <head>
 #{css}
 <title><%=
-  base_model = (model = (obj = @#{obj_name}).class).base_class
-  see_all_path = send(\"#\{base_model._brick_index}_path\")
+  if (model = (obj = @#{obj_name})&.class || @lookup_context&.instance_variable_get(:@_brick_model))
+    see_all_path = send(\"#\{(base_model = model.base_class)._brick_index}_path\")
 #{(inh_col = @_brick_model.inheritance_column).present? &&
 "  if obj.respond_to?(:#{inh_col}) && (model_name = @#{obj_name}.#{inh_col}) &&
      !model_name.is_a?(Numeric) && model_name != base_model.name

data/lib/brick/reflect_tables.rb

@@ -26,10 +26,13 @@ module Brick
             # Auto-create when there is a missing index
             alias _original_method_missing method_missing
             def method_missing(name, *args, &block)
+              return if name == :transport # Avoid infinite loop if Elasticsearch isn't yet initialized
+
               _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)) &&
-                 ::Brick.elasticsearch_models&.fetch(missing_index, nil)&.include?('i')
+                 (es_table_name = ::Brick.elasticsearch_possible&.fetch(missing_index, nil)) &&
+                 ::Brick.elasticsearch_models&.fetch(es_table_name, nil)&.include?('i')
                 self.indices.create({ index: missing_index,
                                       body: { settings: {}, mappings: { properties: {} } } })
                 puts "Auto-creating missing index \"#{missing_index}\""
@@ -40,9 +43,10 @@ module Brick
             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
+        if ::Elasticsearch.const_defined?('Model') && 
+           # By setting the environment variable ELASTICSEARCH_URL then you can specify an Elasticsearch/Opensearch
+           # host that is picked up here
+           (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
@@ -513,7 +517,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
         end
       end
 
-      if ems = ::Brick.elasticsearch_models # ['comments']
+      if (ems = ::Brick.elasticsearch_models)
         access = case ems
                  when Hash, String # Hash is a list of resource names and ES permissions such as 'r' or 'icr'
                    ems
@@ -544,6 +548,9 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
               next if rel.first.is_a?(Symbol)
 
               perms = rel.last.fetch(:isView, nil) ? access.tr('cud', '') : access
+              unless ::Brick.elasticsearch_existings[es_index = rel.first.tr('.', '-').pluralize]
+                (::Brick.elasticsearch_possible ||= {})[es_index] = rel.first
+              end
               s[rel.first] = perms
             end
           else # or there are specific permissions for each resource, so find the matching indexes

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -111,7 +111,7 @@ module Brick
                   :established_drf,
                   :is_oracle, :is_eager_loading, :auto_models, :initializer_loaded,
                   :table_name_lookup,
-                  :elasticsearch_models, :elasticsearch_existings,
+                  :elasticsearch_models, :elasticsearch_existings, :elasticsearch_possible,
                   :routes_done
     ::Brick.auto_models = []
 

data/lib/generators/brick/seeds_builder.rb

@@ -38,7 +38,6 @@ module Brick
           existing_models = ActiveRecord::Base.descendants.each_with_object({}) do |m, s|
             s[m.table_name] = SeedModel.new(m.table_name, m, false) if !m.abstract_class? && !m.is_view? && m.table_exists?
           end
-
           models = (existing_models.values +
                     # ... then add models which can be auto-built by Brick
                     relations.reject do |k, v|
@@ -57,7 +56,6 @@ module Brick
             end
           end
         end
-
         seeds = +'# Seeds file for '
         if (arbc = ActiveRecord::Base.connection).respond_to?(:current_database) # SQLite3 can't do this!
           seeds << "#{arbc.current_database}:\n"
@@ -124,23 +122,22 @@ module Brick
                           end
             end
             schema = if (tbl_parts = tbl.split('.')).length > 1
-                      if tbl_parts.first == (::Brick.default_schema || 'public')
-                        tbl_parts.shift
-                        nil
-                      else
-                        tbl_parts.first
-                      end
-                    end
+                       if tbl_parts.first == (::Brick.default_schema || 'public')
+                         tbl_parts.shift
+                         nil
+                       else
+                         tbl_parts.first
+                       end
+                     end
+
+            # # Had considered doing this for non-Airtable:
+            # # For the moment we're skipping polymorphics
+            # fkeys = klass.reflect_on_all_associations.select { |a| a.belongs_to? && !a.polymorphic? }.map do |fk|
+            #   { fk: fk.foreign_key, assoc_name: fk.name.to_s, inverse_table: fk.table_name }
+            # end
+            # For the moment we're skipping polymorphics
+            fkeys = relation[:fks].values.select { |assoc| assoc[:is_bt] && !assoc[:polymorphic] }
 
-            # %%% For the moment we're skipping polymorphics
-            fkeys = if is_airtable
-              tbl = tbl.singularize
-              relation[:fks]&.values&.select { |assoc| assoc[:is_bt] && !assoc[:polymorphic] }
-            else
-              klass.reflect_on_all_associations.select { |a| a.belongs_to? && !a.polymorphic? }.map do |fk|
-                { fk: fk.foreign_key, assoc_name: fk.name.to_s, inverse_table: fk.table_name }
-              end
-            end
             # Refer to this table name as a symbol or dotted string as appropriate
             # tbl_code = tbl_parts.length == 1 ? ":#{tbl_parts.first}" : "'#{tbl}'"
 
@@ -205,7 +202,7 @@ module Brick
                 if fk
                   fk_val = if is_airtable
                     # The (3..-1) is to take off the "rec___" prefix
-                    obj.attributes_before_type_cast[fk[:assoc_name]]&.first&.[](3..-1) if is_airtable
+                    obj.attributes_before_type_cast[fk[:assoc_name]]&.first&.[](3..-1)
                   else
                     brick_escape(val)
                   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.235
+  version: 1.0.236
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-20 00:00:00.000000000 Z
+date: 2025-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -261,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Create a Rails app from data alone