brick 1.0.224 → 1.0.225

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 571fea9051ed0e8037ba73f0d3010f22f29b417b6def200fcf63894dced9289e
-  data.tar.gz: 6bace7cf19e59ca209a9b6395a7fce3324e4ca77bf13bd8a21bf7b3f0fe6604a
+  metadata.gz: 7f82da7422196469fc96ed7e6a720404547125622e4a9221b762d2797ddfa1a1
+  data.tar.gz: 48db61484c3899a2ee44754979eca01442d1c396e2ae10df8c5bb707d45398fa
 SHA512:
-  metadata.gz: 4ed1f0d0711c39d1174cf3306dd0c698ccc832478c32432eb84ce5a01a704da9fb24e9fda05d2986fe822fe21876aa34de4a0900f5cdacb1255446a74c07b2b9
-  data.tar.gz: 3b77a0656498452157fe25fb3c8c894acb8ee17fad51e6e203123d31d9d108fe59e8a7b1f265e4e168ab82c2d85cf461983079f7e753075d54ac6366d3e6d5e5
+  metadata.gz: 33e2eb178a7eb4e7c04ea47ee7cb14b732eb43918974ef189f7423615158acae66a6135ba43373cdc30fa6dffff83388e32f3f0610450f6ae46a66dd9e672176
+  data.tar.gz: e7f04e018e0f21780c2d1a6705a5f39b3a62321d7314fb5b3f0924c77ca11344c5a1928231ac39b32daa858e3411cdee9eb8c09d55992677f46384f2e474cdba

data/lib/brick/extensions.rb

@@ -2099,7 +2099,7 @@ class Object
     def build_controller(namespace, class_name, plural_class_name, model, relations)
       if (is_avo = (namespace.name == 'Avo' && Object.const_defined?('Avo')))
         # Basic Avo functionality is available via its own generic controller.
-        # (More information on https://docs.avohq.io/2.0/controllers.html)
+        # (More information on https://docs.avohq.io/3.0/controllers.html)
         controller_base = Avo::ResourcesController
       end
       if !model&.table_exists? && (tn = model&.table_name)
@@ -2117,7 +2117,6 @@ class Object
         puts
       end
       table_name = model&.table_name || ActiveSupport::Inflector.underscore(plural_class_name)
-      singular_table_name = ActiveSupport::Inflector.singularize(ActiveSupport::Inflector.underscore(plural_class_name))
       pk = model&._brick_primary_key(relations.fetch(table_name, nil))
       is_postgres = ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
       is_mysql = ['Mysql2', 'Trilogy'].include?(ActiveRecord::Base.connection.adapter_name)
@@ -2142,7 +2141,7 @@ class Object
                 cspd.select! { |val| val == "'self'" }
                 cspd << style_value
               else
-                cspd << "'sha256-0Vb7j3kDGE3oNfwMpRLClTSCUo/q74bvbt3p6kG/gkM='"
+                cspd << "'sha256-#{Base64.encode64(Digest.const_get(:SHA256).digest(::Brick::Rails::BRICK_CSS)).chomp}'"
               end
               cspd << 'https://cdn.jsdelivr.net'
             end
@@ -2279,7 +2278,9 @@ class Object
         end
 
         self.protect_from_forgery unless: -> { self.request.format.js? }
-        plural_table_name = table_name.split('.').last.pluralize
+        tn_start = (table_name_split = table_name.split('.')).length > 1 ? -2 : -1
+        plural_table_name = table_name_split[tn_start..-1].join('_').pluralize
+        singular_table_name = plural_table_name.singularize
         unless is_avo
           self.define_method :index do
             request_ver = request.path.split('/')[-2]
@@ -3166,8 +3167,10 @@ module Brick
           begin
             if bt.key?(:polymorphic)
               pri_pk = for_pk
-              pri_tables = Brick.config.polymorphics["#{frn_tbl}.#{bt[:fk]}"]
-                                .each_with_object(Hash.new { |h, k| h[k] = [] }) do |pri_class, s|
+              pri_models = ((frn_class = Object.const_get(v[1][:class_name])).respond_to?(poly_types_method = "#{bt[:assoc_name]}_types") &&
+                            frn_class.send(poly_types_method) # Trust what was set by #delegated_type
+                           ) || Brick.config.polymorphics["#{frn_tbl}.#{bt[:fk]}"]
+              pri_tables = pri_models.each_with_object(Hash.new { |h, k| h[k] = [] }) do |pri_class, s|
                 s[Object.const_get(pri_class).table_name] << pri_class
               end
               fk_id_col = "#{bt[:fk]}_id"

data/lib/brick/rails/engine.rb

@@ -691,7 +691,10 @@ window.addEventListener(\"popstate\", linkSchemas);
 
               if @_brick_model
                 pk = @_brick_model._brick_primary_key(::Brick.relations.fetch((table_name = @_brick_model.table_name.split('.').last), nil))
-                obj_name = model_name.split('::').last.underscore
+                rn_start = (res_name_split = model_name.split('::')).length > 1 ? -2 : -1
+                obj_name = res_name_split[rn_start..-1].join('_').singularize
+                res_name = obj_name.pluralize
+
                 path_obj_name = @_brick_model._brick_index(:singular)
                 table_name ||= obj_name.pluralize
                 template_link = nil
@@ -807,9 +810,10 @@ window.addEventListener(\"popstate\", linkSchemas);
                ['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 = +'<style>'
               css << ::Brick::Rails::BRICK_CSS
-              css << "<script>
+              css << "</style>
+<script>
   if (window.history.state && window.history.state.turbo)
     window.addEventListener(\"popstate\", function () { location.reload(true); });
 </script>
@@ -1040,7 +1044,7 @@ end %>#{"
   end
   \"<tr><td colspan=\\\"#\{td_count}\\\">Children: #\{child_links.join(' ')}</tr>\".html_safe
 end
-%><%= if (page_num = @#{res_name = table_name.pluralize}&._brick_page_num)
+%><%= if (page_num = @#{res_name}&._brick_page_num)
            \"<tr><td colspan=\\\"#\{td_count}\\\">Page #\{page_num}</td></tr>\".html_safe
          end %></table>#{template_link}<%
    if description.present? %><span class=\"__brick\"><%=

data/lib/brick/rails/form_tags.rb

@@ -517,7 +517,7 @@ module Brick::Rails::FormTags
 
   # All the standard CSS with teal colouration for use with Brick
   def brick_css(theme = nil)
-    ::Brick::Rails::BRICK_CSS.html_safe
+    "<style>#{::Brick::Rails::BRICK_CSS}</style>".html_safe
   end
 
   # -----------------------------------------------------------------------------------------------

data/lib/brick/rails.rb

@@ -289,7 +289,7 @@ erDiagram
 
   # CONSTANTS
 
-  BRICK_CSS = "<style>
+  BRICK_CSS = "
 #titleSticky {
   position: sticky;
   display: inline-block;
@@ -527,7 +527,6 @@ input+svg.revert {
   background-color: #004998;
   color: #FFF;
 }
-</style>
 "
 
   AVO_SVG = "<svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 84 90\" height=\"30\" fill=\"#3096F7\">

data/lib/brick/route_mapper.rb

@@ -53,7 +53,7 @@ module Brick
           # else
           #   puts "#{'  ' * ind}scope #{scope_options.inspect}"
           # end
-          send(:scope, scope_options) do
+          send(:scope, **scope_options) do
             brick_namespace_create.call(path_names, res_name, options, ind + 1)
           end
         else
@@ -243,7 +243,7 @@ module Brick
             { :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}" })
+                send(method, "#{api_root}#{unversioned.tr('.', '/')}", to: "#{controller_prefix}#{controller_name}##{action}")
               end
             end
             # %%% We do not yet surface the #show action
@@ -251,7 +251,7 @@ module Brick
               { :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}" })
+                    send(method, "#{api_root}#{unversioned.tr('.', '/')}/:#{id_col}", to: "#{controller_prefix}#{controller_name}##{action}")
                   end
                 end
               end

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -248,10 +248,14 @@ module Brick
 
         if a.belongs_to?
           if a.polymorphic?
-            rel_poly_bt = relations[model.table_name][:fks].find { |_k, fk| fk[:assoc_name] == a.name.to_s }
-            if (primary_tables = rel_poly_bt&.last&.fetch(:inverse_table, [])).is_a?(Array)
-              models = rel_poly_bt[1][:polymorphic]&.map { |table| table.singularize.camelize.constantize }
-              s.first[a.foreign_key.to_s] = [a.name, models, true]
+            if (pri_models = (model.respond_to?(poly_types_method = "#{a.name}_types") &&
+                              model.send(poly_types_method)
+                             ) ||
+                             (rel_poly_bt = relations[model.table_name][:fks].find { |_k, fk| fk[:assoc_name] == a.name.to_s } &&
+                              (rel_poly_bt[1][:polymorphic] || rel_poly_bt&.last&.fetch(:inverse_table, [])&.map { |table| table.singularize.camelize })
+                             )
+               ).is_a?(Array)
+              s.first[a.foreign_key.to_s] = [a.name, pri_models.map(&:constantize), true]
             else
               # This will come up when using Devise invitable when invited_by_class_name is not
               # specified because in that circumstance it adds a polymorphic :invited_by association,
@@ -267,11 +271,19 @@ module Brick
                 puts "Missing any real indication as to which models \"has_many\" this polymorphic BT in model #{a.active_record.name}:"
                 puts "  belongs_to :#{a.name}, polymorphic: true"
               else
-                puts "Having analysed all currently-loaded models to infer the various polymorphic has_many associations for #{model.name}, here are the current results:"
-                puts "::Brick.polymorphics = { \"#{model.table_name}.#{a.name}\" =>
+                puts "Having analyzed all currently-loaded models to infer the various polymorphic has_many associations,"
+                if ActiveRecord::Base.respond_to?(:delegated_type)
+                  puts "in your #{model.name} model file, you can change this line:
+  belongs_to :#{a.name}#{a.options.map { |k, v| ", #{k}: #{v}" }.join}
+to instead be this:
+  delegated_type :#{a.name}, types: #{hm_models.map(&:name).inspect}#{a.options.reject { |k| [:polymorphic, :inverse_of].include?(k) }.map { |k, v| ", #{k}: #{v}" }.join}\n"
+                else
+                  puts "to support the #{model.name} model, you can add this into your brick.rb:
+::Brick.polymorphics = { \"#{model.table_name}.#{a.name}\" =>
                          #{hm_models.map(&:name).inspect}
                        }"
-                puts 'If you add the above to your brick.rb, it will "cement" these options into place, and avoid this lookup process.'
+                puts "and it will \"cement\" these options into place, and avoid this lookup process.\n"
+                end
                 s.first[a.foreign_key.to_s] = [a.name, hm_models, true]
               end
             end

data/lib/generators/brick/install_generator.rb

@@ -386,6 +386,10 @@ if ActiveRecord::Base.respond_to?(:brick_select) && !::Brick.initializer_loaded
   Brick.config.schema_behavior[:multitenant]&.fetch(:schema_to_analyse, nil).inspect}" :
 "  # Brick.schema_behavior = { multitenant: { schema_to_analyse: 'engineering'"
 } } }
+#{"
+  # # Note that if you have a real polymorphic model configured then it is better to set the list of classes up in the
+  # # model file itself with a line like:
+  # delegated_type :commentable, type: ['Post', 'Comment']" if ActiveRecord::Base.respond_to?(:delegated_type)}
 
   # # DEFAULT ROOT ROUTE
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.224
+  version: 1.0.225
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-23 00:00:00.000000000 Z
+date: 2025-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Create a Rails app from data alone