brick 1.0.132 → 1.0.134

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08cc0b19ab0838b667534f4de64f3a7045bf395202a3602981a20ececdc91ab5'
-  data.tar.gz: 4b976489a05bb26c3702746700025c6bad3bb930fc129ae897bc9e1596a50901
+  metadata.gz: 613c6296c56af562bc77d55d734b0a6e5bdad7e3942891db4dc939fe087fca7f
+  data.tar.gz: acc5873eeae8a0d9e9d4a86cc8b71ee12dc0699821dee132c40c569147156075
 SHA512:
-  metadata.gz: 580db611d4ab9e2bf7ab0ed62a90940b90a4818619a9a91788802f017845c0aef3c8da1b01ea8a6a87c8e1af8378dc5c0d030396ebebba05d101b46ca0bd4495
-  data.tar.gz: fe876de91852b7213fa4d35b378935c7f18e18ae09ff5058f0d34b32dcb3c802a15d1c2cc79f63f7b5eac4177b7bbbeae43603e55499447cfee9e1d3556f64fa
+  metadata.gz: 046bec9f177ec74aaa3bbba3ef1dd2afe54f43376068ed657ed0fec6d18ac353e8addfabad514fdf33cc6199d053ca1e23c0f46aa1a53cac96fe6e21f7a50796
+  data.tar.gz: 7d21817ea8774f65852be247ae72c341559c84b0a58228d019d5630036827a99988699752392bbc43330400761ea9e59292231bae5993fa0620240126fe7490e

data/lib/brick/config.rb

@@ -258,7 +258,9 @@ module Brick
           else
             # Custom STI type columns for models built from specific tables
             (v.last.is_a?(Array) ? v.last : [v.last]).each do |table|
-              ::Brick.relations[table][:sti_col] = v.first
+              if (relation = ::Brick.relations.fetch(table, nil))
+                relation[:sti_col] = v.first
+              end
             end
           end
         end

data/lib/brick/extensions.rb

@@ -44,9 +44,20 @@
 
 module ActiveRecord
   class Base
+    @_brick_inheriteds = {}
     class << self
       attr_reader :_brick_relation
 
+      def _brick_inheriteds
+        @_brick_inheriteds ||= ::ActiveRecord::Base.instance_variable_get(:@_brick_inheriteds)
+      end
+
+      # Track the file(s) in which each model is defined
+      def inherited(model)
+        (_brick_inheriteds[model] ||= []) << caller.first.split(':')[0..1] unless caller.first.include?('/lib/brick/extensions.rb:')
+        super
+      end
+
       def is_brick?
         instance_variables.include?(:@_brick_built) && instance_variable_get(:@_brick_built)
       end
@@ -659,7 +670,6 @@ module ActiveRecord
       # Add derived table JOIN for the has_many counts
       nix = []
       klass._br_hm_counts.each do |k, hm|
-        num_bt_things = 0
         count_column = if hm.options[:through]
                          # Build the chain of JOINs going to the final destination HMT table
                          # (Usually just one JOIN, but could be many.)
@@ -680,7 +690,11 @@ module ActiveRecord
                          # Turn the last member of link_back into a foreign key
                          link_back << hmt_assoc.source_reflection.foreign_key
                          # If it's a HMT based on a HM -> HM, must JOIN the last table into the mix at the end
-                         through_sources.push(hm.source_reflection) unless hm.source_reflection.belongs_to?
+                         this_hm = hm
+                         while !(src_ref = this_hm.source_reflection).belongs_to? && (thr = src_ref.options[:through])
+                           through_sources.push(this_hm = src_ref.active_record.reflect_on_association(thr))
+                         end
+                         through_sources.push(src_ref) unless src_ref.belongs_to?
                          from_clause = +"#{through_sources.first.table_name} br_t0"
                          fk_col = through_sources.shift.foreign_key
 
@@ -689,9 +703,7 @@ module ActiveRecord
                          through_sources.map do |a|
                            from_clause << "\n LEFT OUTER JOIN #{a.table_name} br_t#{idx += 1} "
                            from_clause << if (src_ref = a.source_reflection).macro == :belongs_to
-                                            nm = hmt_assoc.source_reflection.inverse_of&.name
-                                            link_back << nm
-                                            num_bt_things += 1
+                                            link_back << (nm = hmt_assoc.source_reflection.inverse_of&.name)
                                             # puts "BT #{a.table_name}"
                                             "ON br_t#{idx}.#{a.active_record.primary_key} = br_t#{idx - 1}.#{a.foreign_key}"
                                           elsif src_ref.options[:as]
@@ -712,9 +724,8 @@ module ActiveRecord
                                             end
                                           else # Standard has_many or has_one
                                             # puts "HM #{a.table_name}"
-                                            # binding.pry unless (
                                             nm = hmt_assoc.source_reflection.inverse_of&.name
-                                            # )
+                                            # binding.pry unless nm
                                             link_back << nm # if nm
                                             "ON br_t#{idx}.#{a.foreign_key} = br_t#{idx - 1}.#{a.active_record.primary_key}"
                                           end
@@ -731,16 +742,8 @@ module ActiveRecord
                            nix << k
                            next
                          elsif src_ref.macro == :belongs_to # Traditional HMT using an associative table
-                           # binding.pry if link_back.length > 2
                            "br_t#{idx}.#{hm.foreign_key}"
                          else # A HMT that goes HM -> HM, something like Categories -> Products -> LineItems
-                           # %%% Currently flaky, so will revisit this soon, probably while implementing the whole link_back architecture
-                           if num_bt_things > 1
-                             # binding.pry
-                             nix << k
-                             next
-                           end
-
                            "br_t#{idx}.#{src_ref.active_record.primary_key}"
                          end
                        else
@@ -2743,31 +2746,15 @@ module Brick
                      end
                    end
       abstract_activerecord_bases = ::Brick.eager_load_classes(true)
-      models = if Dir.exist?(model_path = "#{rails_root}/app/models")
-                 Dir["#{model_path}/**/*.rb"].each_with_object({}) do |path, s|
-                   modules = []
-                   File.read(path).split("\n").each do |line|
-                     # Capture a list of modules leading up to this class
-                     if line.lstrip.start_with?('module ') && (idx = line.index('module'))
-                       modules << line[idx + 6..-1].match(/[\s:]+([\w:]+)/)&.captures&.first
-                     end
-                     # For all non-commented lines, look for any that start with "class " and also "< ApplicationRecord"
-                     if line.lstrip.start_with?('class ') && (idx = line.index('class')) &&
-                        (model_name = line[idx + 5..-1].match(/[\s:]+([\w:]+)/)&.captures&.first)
-                       # Prefix model class name with module names, if any
-                       model_name = modules.map{|m| "#{m}::"}.join + model_name
-                       unless abstract_activerecord_bases.include?(model_name)
-                         klass = begin
-                                   model_name.constantize
-                                 rescue
-                                 end
-                         s[model_name.underscore.tr('/', '.').pluralize] = [
-                           path.start_with?(rails_root) ? path[rails_root.length + 1..-1] : path,
-                           klass
-                         ]
-                       end
-                     end
+      rails_root = ::Rails.root.to_s
+      models = ::Brick.relations.each_with_object({}) do |rel, s|
+                 begin
+                   if (model = rel.last[:class_name]&.constantize) &&
+                      (inh = ActiveRecord::Base._brick_inheriteds[model]&.join(':'))
+                     inh = inh[rails_root.length + 1..-1] if inh.start_with?(rails_root)
+                     s[rel.first] = [inh, model]
                    end
+                 rescue
                  end
                end
       ::Brick.relations.map do |k, v|
@@ -2781,7 +2768,8 @@ module Brick
                          v[:class_name].constantize.table_name
                        rescue
                        end
-        [k, table_name || k, migrations&.fetch(res, nil), model&.first]
+        model = model.first if model.is_a?(Array)
+        [k, table_name || k, migrations&.fetch(res, nil), model]
       end
     end
 

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

@@ -61,9 +61,11 @@ module Brick
           ::Brick::Rails.display_binary(val)
         else
           if col_type
-            if lat_lng
+            if lat_lng && !(lat_lng.first.zero? && lat_lng.last.zero?)
               # Create a link to this style of Google maps URL:  https://www.google.com/maps/place/38.7071296+-121.2810649/@38.7071296,-121.2810649,12z
               "<a href=\"https://www.google.com/maps/place/#{lat_lng.first}+#{lat_lng.last}/@#{lat_lng.first},#{lat_lng.last},12z\" target=\"blank\">#{val}</a>"
+            elsif val.is_a?(Numeric)
+              ::ActiveSupport::NumberHelper.number_to_delimited(val, delimiter: ',')
             else
               ::Brick::Rails::FormBuilder.hide_bcrypt(val, col_type == :xml)
             end
@@ -922,6 +924,9 @@ a.big-arrow {
   background-color: #C0C0C0;
   text-align: center;
 }
+.right {
+  text-align: right;
+}
 .orphan {
   color: red;
   white-space: nowrap;
@@ -1110,6 +1115,14 @@ if (headerTop) {
     setHeaderSizes();
   }, true);
 }
+// Cause descriptive text to use the same font as the resource 
+var brickFontFamily = document.getElementById(\"resourceName\").computedStyleMap().get(\"font-family\");
+if (window.brickFontFamily) {
+  [...document.getElementsByClassName(\"__brick\")].forEach(function (x){
+    if (!x.style.fontFamily)
+      x.style.fontFamily = brickFontFamily.toString();
+  });
+}
 </script>"
 
               erd_markup = if @_brick_model
@@ -1354,8 +1367,8 @@ end
 %><%= if (page_num = @#{table_name}._brick_page_num)
            \"<tr><td colspan=\\\"#\{td_count}\\\">Page #\{page_num}</td></tr>\".html_safe
          end %></table>#{template_link}<%
-   if description.present? %><%=
-     description %><br><%
+   if description.present? %><span class=\"__brick\"><%=
+     description %></span><br><%
    end
    # FILTER PARAMETERS
    if @_brick_params&.present? %>
@@ -1366,12 +1379,12 @@ end
        if (destination_fk = Brick.relations[origin.table_name][:fks].values.find { |fk| fk[:fk] == key_parts.last }) &&
           (objs = (destination = origin.reflect_on_association(destination_fk[:assoc_name])&.klass)&.find(id))
          objs = [objs] unless objs.is_a?(Array) %>
-         <h3>for <% objs.each do |obj| %><%=
+         <h3 class=\"__brick\">for <% objs.each do |obj| %><%=
                       link_to \"#{"#\{obj.brick_descrip\} (#\{destination.name\})\""}, send(\"#\{destination._brick_index(:singular)\}_path\".to_sym, id)
                %><% end %></h3><%
        end
      end %>
-  (<%= link_to \"See all #\{model.base_class.name.split('::').last.pluralize}\", #{@_brick_model._brick_index}_path %>)
+  <span class=\"__brick\">(<%= link_to \"See all #\{model.base_class.name.split('::').last.pluralize}\", #{@_brick_model._brick_index}_path %>)</span>
 <% end
    # COLUMN EXCLUSIONS
    if @_brick_excl&.present? %>
@@ -1422,7 +1435,7 @@ end
                cols, poly_cols, bts, #{hms_keys.inspect}, {#{hms_columns.join(', ')}}) %>
 
 #{"<hr><%= link_to(\"New #{new_path_name = "new_#{path_obj_name}_path"
-                           obj_name}\", #{new_path_name}) if respond_to?(:#{new_path_name}) %>" unless @_brick_model.is_view?}
+                           obj_name}\", #{new_path_name}, { class: '__brick' }) if respond_to?(:#{new_path_name}) %>" unless @_brick_model.is_view?}
 #{script}
 </body>
 </html>
@@ -1534,7 +1547,7 @@ end
 <p style=\"color: green\"><%= notice if request.respond_to?(:flash) %></p>#{"
 #{schema_options}" if schema_options}
 <select id=\"tbl\">#{table_options}</select>
-<table><td><h1><%= page_title %></h1></td>
+<table id=\"resourceName\"><td><h1><%= page_title %></h1></td>
 <% if Object.const_defined?('Avo') && ::Avo.respond_to?(:railtie_namespace) %>
   <td><%= link_to_brick(
       avo_svg,
@@ -1560,10 +1573,10 @@ end
    end %>
 </table>
 <%
-if (description = (relation = Brick.relations[#{model_name}.table_name])&.fetch(:description, nil)) %><%=
-  description %><br><%
+if (description = (relation = Brick.relations[#{model_name}.table_name])&.fetch(:description, nil)) %>
+  <span class=\"__brick\"><%= description %></span><br><%
 end
-%><%= link_to \"(See all #\{model_name.pluralize})\", see_all_path %>
+%><%= link_to \"(See all #\{model_name.pluralize})\", see_all_path, { class: '__brick' } %>
 #{erd_markup}
 <% if obj
      # path_options = [obj.#{pk}]
@@ -1647,7 +1660,8 @@ end
 #{unless args.first == 'new'
   # Was:  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?' } }"
   confirm_are_you_sure = "data: { confirm: 'Delete #\{model_name} -- Are you sure?' }"
-  hms_headers.each_with_object(+'') do |hm, s|
+  ret = +"<%= button_to(\"Delete #\{@#{obj_name}.brick_descrip}\", send(\"#\{#{model_name}._brick_index(:singular)}_path\".to_sym, @#{obj_name}), { method: 'delete', class: 'danger', #{confirm_are_you_sure} }) %>"
+  hms_headers.each_with_object(ret) 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
 
@@ -1707,8 +1721,7 @@ end
     else
       s
     end
-  end +
-  "<%= button_to(\"Delete #\{@#{obj_name}.brick_descrip}\", send(\"#\{#{model_name}._brick_index(:singular)}_path\".to_sym, @#{obj_name}), { method: 'delete', class: 'danger', #{confirm_are_you_sure} }) %>"
+  end
 end}
 <% end %>
 #{script}
@@ -1793,7 +1806,8 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
 
     mermaidCode = document.createElement(\"SCRIPT\");
     mermaidCode.setAttribute(\"src\", \"https://cdn.jsdelivr.net/npm/mermaid@9.1.7/dist/mermaid.min.js\");
-    mermaidCode.addEventListener(\"load\", function () {
+    mermaidCode.addEventListener(\"load\", mermaidLoaded);
+    function mermaidLoaded() {
       mermaid.initialize({
         startOnLoad: true,
         securityLevel: \"loose\",
@@ -1826,6 +1840,14 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
         window.history.pushState({}, '', changeout(location.href, '_brick_erd', null));
       });
       mermaidErd.appendChild(span);
+    }
+    // If there's an error with the CDN during load, revert to our local copy
+    mermaidCode.addEventListener(\"error\", function (e) {
+      console.warn(\"As we're unable to load Mermaid from\\n  \" + e.srcElement.src + \" ,\\nnow reverting to copy from /assets.\");
+      var mermaidCode2 = document.createElement(\"SCRIPT\");
+      mermaidCode2.setAttribute(\"src\", \"/assets/mermaid.min.js\");
+      mermaidCode2.addEventListener(\"load\", mermaidLoaded);
+      e.srcElement.replaceWith(mermaidCode2);
     });
     document.body.appendChild(mermaidCode);
   }

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

@@ -76,11 +76,14 @@ module Brick::Rails::FormTags
                                       pk.map { |pk_part| obj.send(pk_part.to_sym) }), { class: 'big-arrow' })}</td>\n" if pk.present?
       sequence.each do |col_name|
         val = obj.attributes[col_name]
+        bt = bts[col_name]
         out << '<td'
-        out << ' class=\"dimmed\"' unless cols.key?(col_name) || (cust_col = cust_cols[col_name]) ||
-                                          (col_name.is_a?(Symbol) && bts.key?(col_name)) # HOT
+        (classes ||= []) << 'dimmed' unless cols.key?(col_name) || (cust_col = cust_cols[col_name]) ||
+                                            (col_name.is_a?(Symbol) && bts.key?(col_name)) # HOT
+        (classes ||= []) << 'right' if val.is_a?(Numeric) && !bt
+        out << " class=\"#{classes.join(' ')}\"" if classes&.present?
         out << '>'
-        if (bt = bts[col_name] || composite_bt_names[col_name])
+        if (bt || composite_bt_names[col_name])
           if bt[2] # Polymorphic?
             if (poly_id = obj.send("#{bt.first}_id"))
               # Was:  obj.send("#{bt.first}_type")

data/lib/brick/version_number.rb

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

data/lib/generators/brick/models_generator.rb

@@ -62,7 +62,7 @@ module Brick
         dir = +"#{::Rails.root}/app"
         path[0..-2].each do |path_part|
           dir << "/#{path_part}"
-          Dir.mkdir(dir) unless Dir.exists?(dir)
+          Dir.mkdir(dir) unless Dir.exist?(dir)
         end
         File.open("#{dir}/#{path.last}.rb", 'w') { |f| f.write code } unless code.blank?
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.132
+  version: 1.0.134
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-19 00:00:00.000000000 Z
+date: 2023-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord