brick 1.0.131 → 1.0.133

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e9356edd43a6af6120f30bfbcd520383f3ae700e6ff04be11ebdd3493852ef4
-  data.tar.gz: a099075c53acc9bf29c718043cc619b5ab4f895366f9c7ddd14d53c8f7f432b8
+  metadata.gz: 6804b443d939d24da85968d5b75c4c0603c8880dcc5ab4d07b20be0a52e5a349
+  data.tar.gz: 17ed154ec5f8ec1f351a83120673e9354f892217da76957fdc49a31e663e9eba
 SHA512:
-  metadata.gz: 9f9df598bad9ce128a88f4fe364d568be8c38eee57e595024866d39a255b42f513a26adc68d64d14cdecd4b5d13fb7424935f17df7dbb41c3bda2ae31057a4c7
-  data.tar.gz: 845e5747a916a338ee494426e4ef0ac6fd5c65c3579df0210c8a80468887fac12103407acfbaee3659b3b45763f98ef0bd109935d70920b932b4fd41cc15fdc5
+  metadata.gz: 1b4e53fe24d3de942a7388453d6ee732b0263097b08cbed104d7499842ffaa4eb7239b1bdb81b7300d08df9a628b2a99aad74f47de1fd3579b1eefbf0382b18a
+  data.tar.gz: 3eb38e2a8f1e5c12493ff6e3a524d42157dcae2781d6d39f339d098b04b12d936989f3974977df589419ca04663a4c27f6b7425e09b9695817d9103fb7fd543f

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
@@ -2743,31 +2754,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 +2776,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

@@ -3,7 +3,7 @@
 module Brick
   module Rails
     class << self
-      def display_value(col_type, val)
+      def display_value(col_type, val, lat_lng = nil)
         is_mssql_geography = nil
         # Some binary thing that really looks like a Microsoft-encoded WGS84 point?  (With the first two bytes, E6 10, indicating an EPSG code of 4326)
         if col_type == :binary && val && val.length < 31 && (val.length - 6) % 8 == 0 && val[0..5].bytes == [230, 16, 0, 0, 1, 12]
@@ -61,14 +61,21 @@ module Brick
           ::Brick::Rails.display_binary(val)
         else
           if col_type
-            ::Brick::Rails::FormBuilder.hide_bcrypt(val, col_type == :xml)
+            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
           else
             '?'
           end
         end
       end
 
-      def display_binary(val)
+      def display_binary(val, max_size = 100_000)
         return unless val
 
         @image_signatures ||= { (+"\xFF\xD8\xFF\xEE").force_encoding('ASCII-8BIT') => 'jpeg',
@@ -94,15 +101,12 @@ module Brick
           val = val[object_start...object_start + real_object_size]
         end
 
-        if (signature = @image_signatures.find { |k, _v| val[0...k.length] == k }) ||
-           (val[0..3] == 'RIFF' && val[8..11] == 'WEBP' && (signature = 'webp'))
-          if val.length < 500_000
-            "<img src=\"data:image/#{signature.last};base64,#{Base64.encode64(val)}\">"
-          else
-            "&lt;&nbsp;#{signature.last} image, #{val.length} bytes&nbsp;>"
-          end
+        if ((signature = @image_signatures.find { |k, _v| val[0...k.length] == k }&.last) ||
+            (val[0..3] == 'RIFF' && val[8..11] == 'WEBP' && binding.local_variable_set(:signature, 'webp'))) &&
+           val.length < max_size
+          "<img src=\"data:image/#{signature.last};base64,#{Base64.encode64(val)}\">"
         else
-          "&lt;&nbsp;Binary, #{val.length} bytes&nbsp;>"
+          "&lt;&nbsp;#{signature ? "#{signature} image" : 'Binary'}, #{val.length} bytes&nbsp;>"
         end
       end
     end
@@ -920,6 +924,9 @@ a.big-arrow {
   background-color: #C0C0C0;
   text-align: center;
 }
+.right {
+  text-align: right;
+}
 .orphan {
   color: red;
   white-space: nowrap;
@@ -1108,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
@@ -1352,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? %>
@@ -1364,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? %>
@@ -1420,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>
@@ -1532,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,
@@ -1558,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}]
@@ -1636,16 +1651,17 @@ end
     <tr><td colspan=\"2\">(No displayable fields)</td></tr>
   <% end %>
   </table>#{
-  "<%= binary = begin
-                  ::Brick::Rails.display_binary(obj&.blob&.download)&.html_safe
-                rescue
-                end %>" if model_name == 'ActiveStorage::Attachment'}
+  "<%= begin
+         ::Brick::Rails.display_binary(obj&.blob&.download, 500_000)&.html_safe
+       rescue
+       end %>" if model_name == 'ActiveStorage::Attachment'}
 <%  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
 
@@ -1674,7 +1690,7 @@ end
              collection = collection.instance_exec(&assoc.scopes.first) if assoc.scopes.present?
              if assoc.klass.name == 'ActiveStorage::Attachment'
                br_descrip = begin
-                              ::Brick::Rails.display_binary(obj.send(assoc.name)&.blob&.download)&.html_safe
+                              ::Brick::Rails.display_binary(obj.send(assoc.name)&.blob&.download, 500_000)&.html_safe
                             rescue
                             end
              end
@@ -1705,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}
@@ -1791,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\",
@@ -1824,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")
@@ -139,8 +142,19 @@ module Brick::Rails::FormTags
           out << if @_brick_monetized_attributes&.include?(col_name)
                    val ? Money.new(val.to_i).format : ''
                  else
+                   lat_lng = if [:float, :decimal].include?(col.type) &&
+                                (
+                                  ((col_name == 'latitude' && obj.respond_to?('longitude') && (lng = obj.send('longitude')) && lng.is_a?(Numeric) && (lat = val)) ||
+                                   (col_name == 'longitude' && obj.respond_to?('latitude') && (lat = obj.send('latitude')) && lat.is_a?(Numeric) && (lng = val))
+                                  ) ||
+                                  ((col_name == 'lat' && obj.respond_to?('lng') && (lng = obj.send('lng')) && lng.is_a?(Numeric) && (lat = val)) ||
+                                   (col_name == 'lng' && obj.respond_to?('lat') && (lat = obj.send('lat')) && lat.is_a?(Numeric) && (lng = val))
+                                  )
+                                )
+                               [lat, lng]
+                             end
                    col_type = col&.sql_type == 'geography' ? col.sql_type : col&.type
-                   ::Brick::Rails.display_value(col_type || col&.sql_type, val).to_s
+                   ::Brick::Rails.display_value(col_type || col&.sql_type, val, lat_lng).to_s
                  end
         elsif cust_col
           data = cust_col.first.map { |cc_part| obj.send(cc_part.last) }

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 131
+    TINY = 133
 
     # 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.131
+  version: 1.0.133
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-16 00:00:00.000000000 Z
+date: 2023-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord