brick 1.0.138 → 1.0.139

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f044e21a6e4c2120a453b6cb3dc404d4d3e3e15034c638d316cbc418bcb996b
-  data.tar.gz: f3360e5e7778bacde155e58bf0683d6b75c74d7dd63d336131e82b0a1865199a
+  metadata.gz: e13ace06f3c894715f631be750cd0571b9ab1cfe44b15780e9278d7b6a1c88f3
+  data.tar.gz: fd0d89eb66a8878fc968e95e7a3c27f1fcf619a06c652c0c58c468d4cf66e451
 SHA512:
-  metadata.gz: 413c6fe2526752eab0e24998b852e9ae68ef7f56a6488bc14b777e13a4ad281f6c352af465be9e49f05e20fa597e7750d3c706df762f74eb70a18fda5112a319
-  data.tar.gz: cb5040c5333dfa0c0fcbd9d1c04c229e538db1b33fc1526ace987d6da8bd1634e50269e5e05249da6205980ac79c3bad792dd5cc2242115349846365a881bf81
+  metadata.gz: 58665ea6c29d49542ae83096fa3ad5fa371ed0a12920f86492111319e3ab9a46c8c7d83ab9277377b6dabb51a75adf0a7cb32c4aa37234f54d796fe206563172
+  data.tar.gz: f5ee7ebdfa31f76133db652ff0beec175aa5eb319a7f1472da56f0e8e7c79aba12bceb9c26b73fc4c305e69143529416cb5d683660025d1b1e08aa72209a688b

data/lib/brick/extensions.rb

@@ -1042,7 +1042,7 @@ if ActiveSupport::Dependencies.respond_to?(:autoload_module!) # %%% Only works w
   end
 end
 
-Module.class_exec do
+::Brick::ADD_CONST_MISSING = lambda do
   alias _brick_const_missing const_missing
   def const_missing(*args)
     requested = args.first.to_s
@@ -1319,7 +1319,14 @@ class Object
       if (base_model = ::Brick.sti_models[full_model_name]&.fetch(:base, nil) || ::Brick.existing_stis[full_model_name]&.constantize)
         is_sti = true
       else
-        base_model = ::Brick.config.models_inherit_from
+        # Class for auto-generated models to inherit from
+        base_model = (::Brick.config.models_inherit_from ||= (app.config.brick.fetch(:models_inherit_from, nil) ||
+                                                              begin
+                                                                ::ApplicationRecord
+                                                              rescue StandardError => ex
+                                                                ::ActiveRecord::Base
+                                                              end))
+
       end
       hmts = nil
       code = +"class #{full_name} < #{base_model.name}\n"
@@ -1486,8 +1493,10 @@ class Object
                                assoc[:assoc_name]
                              end
                 options[:optional] = true if assoc.key?(:optional)
-                if assoc.key?(:polymorphic)
-                  options[:polymorphic] = true
+                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] }
+                  assoc[:polymorphic] ||= (options[:polymorphic] = true)
                 else
                   need_class_name = singular_table_name.underscore != assoc_name
                   need_fk = "#{assoc_name}_id" != assoc[:fk]
@@ -1548,7 +1557,11 @@ class Object
                                   assoc[:fk].to_sym
                                 end
       end
-      options[:inverse_of] = inverse_assoc_name.tr('.', '_').to_sym if inverse_assoc_name && (need_class_name || need_fk || need_inverse_of)
+      if inverse_assoc_name && (need_class_name || need_fk || need_inverse_of) &&
+         (klass = options[:class_name]&.constantize) && (ian = inverse_assoc_name.tr('.', '_').to_sym) &&
+         (klass.is_brick? || klass.reflect_on_association(ian))
+        options[:inverse_of] = ian
+      end
 
       # Prepare a list of entries for "has_many :through"
       if macro == :has_many
@@ -1591,14 +1604,38 @@ class Object
       built_controller = Class.new(controller_base || ActionController::Base) do |new_controller_class|
         (namespace || Object).const_set(class_name.to_sym, new_controller_class)
 
+        # Add a hash for the inline style to the content-security-policy if one is present
+        self.define_method(:add_csp_hash) do |style_value = nil|
+          if (csp = request.content_security_policy)
+            if (cspd = csp.directives.fetch('style-src'))
+              if style_value
+                if (nonce = ::ActionDispatch::ContentSecurityPolicy::Request::NONCE)
+                  request.env[nonce] = '' # Generally 'action_dispatch.content_security_policy_nonce'
+                end
+                # Keep only self, if present, and also add this value
+                cspd.select! { |val| val == "'self'" }
+                cspd << style_value
+              else
+                cspd << "'sha256-QHKxqKcUq7AER1QwEu5uQXRQwC8j4iTWkE8mpOmP7ms='"
+              end
+              cspd << 'https://cdn.jsdelivr.net'
+            end
+            if (cspd = csp.directives.fetch('script-src'))
+              cspd << 'https://cdn.jsdelivr.net'
+            end
+          end
+        end
+
         # Brick-specific pages
         case plural_class_name
         when 'BrickGem'
           self.define_method :status do
             instance_variable_set(:@resources, ::Brick.get_status_of_resources)
+            add_csp_hash
           end
           self.define_method :orphans do
             instance_variable_set(:@orphans, ::Brick.find_orphans(::Brick.set_db_schema(params).first))
+            add_csp_hash
           end
           self.define_method :crosstab do
             @relations = ::Brick.relations.each_with_object({}) do |r, s|
@@ -1881,6 +1918,7 @@ class Object
             @_brick_hm_counts = real_model._br_hm_counts
             @_brick_join_array = join_array
             @_brick_erd = params['_brick_erd']&.to_i
+            add_csp_hash
           end
         end
 
@@ -1911,6 +1949,7 @@ class Object
             self.define_method :show do
               _schema, @_is_show_schema_list = ::Brick.set_db_schema(params)
               instance_variable_set("@#{singular_table_name}".to_sym, find_obj)
+              add_csp_hash("'unsafe-inline'")
             end
           end
 
@@ -1928,6 +1967,7 @@ class Object
               end if Object.const_defined?('ActiveStorage')
             end
             instance_variable_set("@#{singular_table_name}".to_sym, new_obj)
+            add_csp_hash
           end
 
           params_name_sym = (params_name = "#{singular_table_name}_params").to_sym
@@ -1968,6 +2008,7 @@ class Object
             self.define_method :edit do
               _schema, @_is_show_schema_list = ::Brick.set_db_schema(params)
               instance_variable_set("@#{singular_table_name}".to_sym, find_obj)
+              add_csp_hash
             end
 
             code << "  def update\n"

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

@@ -209,6 +209,7 @@ function linkSchemas() {
       # paths['app/models'] << 'lib/brick/frameworks/active_record/models'
       config.brick = ActiveSupport::OrderedOptions.new
       ActiveSupport.on_load(:before_initialize) do |app|
+        ::Rails.application.reloader.to_prepare { Module.class_exec &::Brick::ADD_CONST_MISSING }
         is_development = (ENV['RAILS_ENV'] || ENV['RACK_ENV'])  == 'development'
         ::Brick.enable_models = app.config.brick.fetch(:enable_models, true)
         ::Brick.enable_controllers = app.config.brick.fetch(:enable_controllers, is_development)
@@ -736,7 +737,7 @@ window.addEventListener(\"popstate\", linkSchemas);
                     end
                   when 'show', 'new', 'update'
                     hm_stuff << if hm_fk_name
-                                  if hm_assoc.klass.column_names.include?(hm_fk_name) ||
+                                  if hm_assoc.klass.column_names.include?(hm_fk_name.to_s) ||
                                      (hm_fk_name.is_a?(String) && hm_fk_name.include?('.')) # HMT?  (Could do a better check for this)
                                     predicates = path_keys(hm_assoc, hm_fk_name, pk).map do |k, v|
                                                    if v == '[sti_type]'
@@ -798,6 +799,10 @@ window.addEventListener(\"popstate\", linkSchemas);
   left: 0;
 }
 
+.flashNotice {
+  color: green;
+}
+
 h1, h3 {
   margin-bottom: 0;
 }
@@ -1313,7 +1318,7 @@ erDiagram
 </head>
 <body>
 <div id=\"titleBox\"><div id=\"titleSticky\">
-<p style=\"color: green\"><%= notice if request.respond_to?(:flash) %></p>#{"
+<p class=\"flashNotice\"><%= notice if request.respond_to?(:flash) %></p>#{"
 #{schema_options}" if schema_options}
 <select id=\"tbl\">#{table_options}</select>
 <table id=\"resourceName\"><tr>
@@ -1453,7 +1458,7 @@ end
 # Must load all models, and then find what table names are represented
 # Easily could be multiple files involved (STI for instance)
 +"#{css}
-<p style=\"color: green\"><%= notice if request.respond_to?(:flash) %></p>#{"
+<p class=\"flashNotice\"><%= notice if request.respond_to?(:flash) %></p>#{"
 #{schema_options}" if schema_options}
 <select id=\"tbl\">#{table_options}</select>
 <h1>Status</h1>
@@ -1503,7 +1508,7 @@ end
                        when 'orphans'
                          if is_orphans
 +"#{css}
-<p style=\"color: green\"><%= notice if request.respond_to?(:flash) %></p>#{"
+<p class=\"flashNotice\"><%= notice if request.respond_to?(:flash) %></p>#{"
 #{schema_options}" if schema_options}
 <select id=\"tbl\">#{table_options}</select>
 <h1>Orphans<%= \" for #\{}\" if false %></h1>
@@ -1550,7 +1555,7 @@ end
   c23.141-70.188,89.141-120.906,167.063-120.906c97.25,0,176,78.813,176,176C511.828,227.078,404.391,119.641,271.844,119.641z\" />
 </svg>
 
-<p style=\"color: green\"><%= notice if request.respond_to?(:flash) %></p>#{"
+<p class=\"flashNotice\"><%= notice if request.respond_to?(:flash) %></p>#{"
 #{schema_options}" if schema_options}
 <select id=\"tbl\">#{table_options}</select>
 <table id=\"resourceName\"><td><h1><%= page_title %></h1></td>
@@ -1716,11 +1721,11 @@ end
         if collection2.empty? %>
           <tr><td>(none)</td></tr>
      <% else
-          collection2.each do |#{hm_singular_name}| %>
-            <tr><td><%= br_descrip = #{hm_singular_name}.brick_descrip(
-                                       descrip_cols&.first&.map { |col| #{hm_singular_name}.send(col.last) }
+          collection2.each do |br_#{hm_singular_name}| %>
+            <tr><td><%= br_descrip = br_#{hm_singular_name}.brick_descrip(
+                                       descrip_cols&.first&.map { |col| br_#{hm_singular_name}.send(col.last) }
                                      )
-                        link_to(br_descrip, #{hm.first.klass._brick_index(:singular)}_path(slashify(#{obj_pk}))) %></td></tr>
+                        link_to(br_descrip, #{hm.first.klass._brick_index(:singular)}_path(slashify(br_#{obj_pk}))) %></td></tr>
           <% end %>
         <% end %>
       </table>"

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -254,7 +254,7 @@ module Brick
               next
             end
           else
-            if !a.options.key?(:as) && a.klass.column_names.exclude?(a.foreign_key)
+            if !a.options.key?(:as) && a.klass.column_names.exclude?(a.foreign_key.to_s)
               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}
@@ -922,11 +922,19 @@ In config/initializers/brick.rb appropriate entries would look something like:
           end
         end
 
-        if ::Brick.config.add_status && instance_variable_get(:@set).named_routes.names.exclude?(:brick_status)
-          get("/#{controller_prefix}brick_status", to: 'brick_gem#status', as: 'brick_status')
+        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
 
-        if ::Brick.config.add_orphans && instance_variable_get(:@set).named_routes.names.exclude?(:brick_orphans)
+        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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.138
+  version: 1.0.139
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-06 00:00:00.000000000 Z
+date: 2023-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord