brick 1.0.86 → 1.0.88

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67cdd41b9c4a3a235e4d88a151149a7c2c9345a4280efe31c3fbd983b65fbdd4
-  data.tar.gz: 12f80d33a0360cfa67fb703ed59b65b9216cafa07a18d9283baf9df584067896
+  metadata.gz: 9e346878b216d9e54ee0ca15be13ec0c2348f8cdf81d14a1eb4bc24ccb07aadb
+  data.tar.gz: 92b54e7227fad318508104690158b5c756cc37171e7eeaaaba41d7da97c5518f
 SHA512:
-  metadata.gz: e95aefd208502dfa2ae724d178a29d15ccad4d00522ecbb865019823ba331c0d9f6e4026aea1b634f57f1d7945d8f522e35361d42d9de972698de91c0b9bd129
-  data.tar.gz: 99d0df87ae591bf836f6040aa237863fb1535774cb6fae515bb1c25edd284b4f37d5a1c01584138df81cfbb66a535ef8bec9aaf2550c96a42c02dee7e48aada1
+  metadata.gz: a8797a5e8924e3a89fd958f05d1bd442cf457428257cd697e438e1e6fe93427bc035177cea79fad47c6484427b30d2e3dc778f7a2166bc0fe27d383ce8659c1c
+  data.tar.gz: 0bd6d3cc1ad92a1ec897b1524fde2e3f6849c783705312908d206460f9060677c93c295f3f3b89ddd514e2b3d5faeae4900472b0f4a1419e57e91046a190b3f7

data/lib/brick/extensions.rb

@@ -211,7 +211,14 @@ module ActiveRecord
                         this_obj = obj
                         bracket_name.split('.').each do |part|
                           obj_name += ".#{part}"
-                          this_obj = caches.fetch(obj_name) { caches[obj_name] = this_obj&.send(part.to_sym) }
+                          this_obj = begin
+                                       caches.fetch(obj_name) { caches[obj_name] = this_obj&.send(part.to_sym) }
+                                     rescue
+                                       clsnm = part.camelize
+                                       if (possible = this_obj.class.reflect_on_all_associations.select { |a| a.class_name == clsnm || a.klass.base_class.name == clsnm }.first)
+                                         caches[obj_name] = this_obj&.send(possible.name)
+                                       end
+                                     end
                           break if this_obj.nil?
                         end
                         if this_obj.is_a?(ActiveRecord::Base) && (obj_descrip = this_obj.class.brick_descrip(this_obj))
@@ -834,34 +841,9 @@ if Object.const_defined?('ActionView')
                       args.first) ||
                      @_brick_model
       # If not provided, do a best-effort to automatically determine the resource class or object
-      sti_type = nil
       filter_parts = []
       klass_or_obj ||= begin
-                         res_names = ::Brick.relations.each_with_object({}) do |v, s|
-                           v_parts = v.first.split('.')
-                           v_parts.shift if v_parts.first == 'public'
-                           s[v_parts.join('.')] = v.first
-                         end
-                         c_path_parts = controller_path.split('/')
-                         klass = nil
-                         while c_path_parts.present?
-                           possible_c_path = c_path_parts.join('.')
-                           possible_c_path_singular = c_path_parts[0..-2] + [c_path_parts.last.singularize]
-                           possible_sti = possible_c_path_singular.join('/').camelize
-                           break if (
-                                      res_name = res_names[possible_c_path] ||
-                                                 ((klass = Brick.config.sti_namespace_prefixes.key?("::#{possible_sti}") && possible_sti.constantize) &&
-                                                  (sti_type = possible_sti)) ||
-                                                 # %%% Used to have the more flexible:  (DidYouMean::SpellChecker.new(dictionary: res_names.keys).correct(possible_c_path)).first
-                                                 res_names[possible_c_path] || res_names[possible_c_path_singular.join('.')]
-                                    ) &&
-                                    (
-                                      klass ||
-                                      ((rel = ::Brick.relations.fetch(res_name, nil)) &&
-                                      (klass ||= rel[:class_name]&.constantize))
-                                    )
-                           c_path_parts.shift
-                         end
+                         klass, sti_type = ::Brick.ctrl_to_klass(controller_path)
                          if klass
                            type_col = klass.inheritance_column # Usually 'type'
                            filter_parts << "#{type_col}=#{sti_type}" if sti_type && klass.column_names.include?(type_col)
@@ -1797,12 +1779,18 @@ end.class_exec do
   # This is done separately so that during testing it can be called right after a migration
   # in order to make sure everything is good.
   def _brick_reflect_tables
+    return unless ::Brick.config.mode == :on
+
     # return if ActiveRecord::Base.connection.current_database == 'postgres'
 
     initializer_loaded = false
     orig_schema = nil
     if (relations = ::Brick.relations).empty?
-      # If there's schema things configured then we only expect our initializer to be named exactly this
+      # 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
+      end
+      # Now the Brick initializer since there may be important schema things configured
       if File.exist?(brick_initializer = ::Rails.root.join('config/initializers/brick.rb'))
         initializer_loaded = load brick_initializer
       end
@@ -1870,8 +1858,9 @@ end.class_exec do
       ::Brick.db_schemas ||= {}
 
       if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
-        if (possible_schema = ::Brick.config.schema_behavior&.[](:multitenant)&.[](:schema_to_analyse))
-          if ::Brick.db_schemas.key?(possible_schema)
+        if (possible_schemas = ::Brick.config.schema_behavior&.[](:multitenant)&.[](:schema_to_analyse))
+          possible_schemas = [possible_schemas] unless possible_schemas.is_a?(Array)
+          if (possible_schema = possible_schemas.find { |ps| ::Brick.db_schemas.key?(ps) })
             ::Brick.default_schema = schema = possible_schema
             orig_schema = ActiveRecord::Base.execute_sql('SELECT current_schemas(true)').first['current_schemas'][1..-2].split(',')
             ActiveRecord::Base.execute_sql("SET SEARCH_PATH = ?", schema)
@@ -1881,7 +1870,7 @@ end.class_exec do
             orig_schema = ActiveRecord::Base.execute_sql('SELECT current_schemas(true)').first['current_schemas'][1..-2].split(',')
             ActiveRecord::Base.execute_sql("SET SEARCH_PATH = ?", schema)
           else
-            puts "*** In the brick.rb initializer the line \"::Brick.schema_behavior = ...\" refers to a schema called \"#{possible_schema}\".  This schema does not exist. ***"
+            puts "*** In the brick.rb initializer the line \"::Brick.schema_behavior = ...\" refers to schema(s) called #{possible_schemas.map { |s| "\"#{s}\"" }.join(', ')}.  No mentioned schema exists. ***"
           end
         end
       end

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

@@ -502,6 +502,16 @@ window.addEventListener(\"pageshow\", function() {
   }
 });
 
+// Add \"Are you sure?\" behaviour to any data-confirm buttons out there
+document.querySelectorAll(\"input[type=submit][data-confirm]\").forEach(function (btn) {
+  btn.addEventListener(\"click\", function (evt) {
+    if (!confirm(this.getAttribute(\"data-confirm\"))) {
+      evt.preventDefault();
+      return false;
+    }
+  });
+});
+
 function changeout(href, param, value, trimAfter) {
   var hrefParts = href.split(\"?\");
   var params = hrefParts.length > 1 ? hrefParts[1].split(\"&\") : [];
@@ -556,13 +566,19 @@ if (grid) {
         if (lastHighCell) lastHighCell.classList.remove(\"highlight\");
       }
       var lastHighHeader = gridHighHeader;
-      gridHighHeader = headerCols[gridHighCell.cellIndex];
-      if (lastHighHeader !== gridHighHeader) {
+      if ((gridHighHeader = headerCols[gridHighCell.cellIndex]) && lastHighHeader !== gridHighHeader) {
         if (gridHighHeader) gridHighHeader.classList.add(\"highlight\");
         if (lastHighHeader) lastHighHeader.classList.remove(\"highlight\");
       }
     }
   }
+  // // LESS TOUCHY NAVIGATION BACK OR FORWARD IN HISTORY WHEN USING MOUSE WHEEL
+  // grid.addEventListener(\"wheel\", function (evt) {
+  //   grid.scrollLeft += evt.deltaX;
+  //   document.body.scrollTop += (evt.deltaY * 0.6);
+  //   evt.preventDefault();
+  //   return false;
+  // });
 }
 function setHeaderSizes() {
   // console.log(\"start\");
@@ -1185,7 +1201,7 @@ end
 <%   end %>
 
 #{unless args.first == 'new'
-  confirm_are_you_sure = ActionView.version < ::Gem::Version.new('7.0') ? "data: { confirm: 'Are you sure?' }" : "form: { data: { turbo_confirm: 'Are you sure?' } }"
+  confirm_are_you_sure = ActionView.version < ::Gem::Version.new('7.0') ? "data: { confirm: 'Delete #{model_name} -- Are you sure?' }" : "form: { data: { turbo_confirm: 'Delete #{model_name} -- Are you sure?' } }"
   hms_headers.each_with_object(+'') do |hm, s|
     # %%% Would be able to remove this when multiple foreign keys to same destination becomes bulletproof
     next if hm.first.options[:through] && !hm.first.through_reflection
@@ -1250,7 +1266,7 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
     if (mermaidCode) return; // Cut it short if we've already rendered the diagram
 
     mermaidCode = document.createElement(\"SCRIPT\");
-    mermaidCode.setAttribute(\"src\", \"https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js\");
+    mermaidCode.setAttribute(\"src\", \"https://cdn.jsdelivr.net/npm/mermaid@9.1.7/dist/mermaid.min.js\");
     mermaidCode.addEventListener(\"load\", function () {
       mermaid.initialize({
         startOnLoad: true,

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -563,6 +563,41 @@ In config/initializers/brick.rb appropriate entries would look something like:
       end
       puts "\n"
     end
+
+    # Attempt to determine an ActiveRecord::Base class and additional STI information when given a controller's path
+    def ctrl_to_klass(ctrl_path, res_names = {})
+      klass = nil
+      sti_type = nil
+
+      if res_names.empty?
+        ::Brick.relations.each_with_object({}) do |v, s|
+          v_parts = v.first.split('.')
+          v_parts.shift if v_parts.first == 'public'
+          res_names[v_parts.join('.')] = v.first
+        end
+      end
+
+      c_path_parts = ctrl_path.split('/')
+      while c_path_parts.present?
+        possible_c_path = c_path_parts.join('.')
+        possible_c_path_singular = c_path_parts[0..-2] + [c_path_parts.last.singularize]
+        possible_sti = possible_c_path_singular.join('/').camelize
+        break if (
+                   res_name = res_names[possible_c_path] ||
+                              ((klass = Brick.config.sti_namespace_prefixes.key?("::#{possible_sti}") && possible_sti.constantize) &&
+                               (sti_type = possible_sti)) ||
+                              # %%% Used to have the more flexible:  (DidYouMean::SpellChecker.new(dictionary: res_names.keys).correct(possible_c_path)).first
+                              res_names[possible_c_path] || res_names[possible_c_path_singular.join('.')]
+                 ) &&
+                 (
+                   klass ||
+                   ((rel = ::Brick.relations.fetch(res_name, nil)) &&
+                   (klass ||= rel[:class_name]&.constantize))
+                 )
+        c_path_parts.shift
+      end
+      [klass, sti_type]
+    end
   end
 
   module RouteSet

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.86
+  version: 1.0.88
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-27 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord