brick 1.0.251 → 1.0.253

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f3523afa6d066b034bb48321fee476541b520db03a6414a6bbb3ce7eb6fef68
-  data.tar.gz: 2a7db114267da1de863e4d225c09983585e04674a92c4d3c7d21c2eadf9ce1d8
+  metadata.gz: 23f8352ed61f4850362135926a1a1e407297021aefeef6eca84caa3cabe4b649
+  data.tar.gz: 5dc89b848cc8f7607d043d7ee5e7e4f2e320abfe1f0f7e046ca129f9458ba869
 SHA512:
-  metadata.gz: ca9c7a8a90956bbfce0af44e21bace777bc988653173c854e59b783c05d7016ab0407015367ea7e5b075f6ab88416e3caf8825653f208d781c3ff86e82baf610
-  data.tar.gz: c93ba7596bfe01d8850178a2334d952fff29e2e4b76e0d5db22a081a8d05151cd64287caa81769a6401fd8f31c3bd9fad6bd50ca4c2081fa245376ef0c591254
+  metadata.gz: 73220fc9aed649d42514715e8be0085a1e04639f33007e7b142adbed985c2b54bb4f99a232a26b9659d53702c957a7cf704af57c951d7a761d74033df9d2a89f
+  data.tar.gz: d794342f7836f29fdd0a1a8f79eb9f5c7cac40a252c7d3654fd712723a1a8fc3df08bb25864377d35755cc65a9b1d777eb86f1312f63a121314cf62033df8f85

data/lib/brick/extensions.rb

@@ -490,7 +490,7 @@ module ActiveRecord
       end
 
       def _brick_find_permits(current_permits, is_for_expects = nil, done_models = [])
-        return current_permits if done_models.any? { |dp| self <= dp }
+        return current_permits if done_models.include?(self)
 
         done_models << self
         self.reflect_on_all_associations.select { |assoc| !assoc.belongs_to? }.each do |assoc|
@@ -2817,7 +2817,7 @@ class Object
               # %%% does this work with STI?
               all_params = params[real_singular_table_name]
               hma.each do |hma_field|
-                if upd_hash.fetch(hma_field) == [''] && # No new attachments...
+                if upd_hash.fetch(hma_field, nil) == [''] && # No new attachments...
                    all_params&.fetch("_brick_attached_#{hma_field}", nil) # ...and there is something existing
                   upd_hash.delete(hma_field)
                 end

data/lib/brick/rails/engine.rb

@@ -1041,7 +1041,7 @@ if (window.brickFontFamily) {
     });
   }
 </script>
-<script src=\"https://apis.google.com/js/api.js\"></script>
+<script async defer src=\"https://apis.google.com/js/api.js\"></script>
 <script async defer src=\"https://accounts.google.com/gsi/client\" id=\"gapiScript\"></script>
 <script<%= @_request.env['_brick_nonce'] %>>
   document.getElementById(\"gapiScript\").addEventListener(\"onload\",
@@ -1103,6 +1103,59 @@ if (window.brickFontFamily) {
       end
       \"<tr><td colspan=\\\"#\{td_count}\\\">Parent: #\{parent_links.join(' ')}</tr>\".html_safe
     end
+%><%
+    # Consider getting the name from the association -- hm.first.name -- if a more \"friendly\" alias should be used for a screwy table name
+    # If the resource is missing, has the user simply created an inappropriately pluralised name for a table?
+    @#{res_name} ||= if (dym_list = instance_variables.reject do |entry|
+                           entry.to_s.start_with?('@_') ||
+                           ['@cache_hit', '@marked_for_same_origin_verification', '@view_renderer', '@view_flow', '@output_buffer', '@virtual_path'].include?(entry.to_s)
+                         end).present?
+                       msg = +\"Can't find resource \\\"#{res_name}\\\".\"
+                       # Can't be sure otherwise of what is up, so check DidYouMean and offer a suggestion.
+                       if (dym = DidYouMean::SpellChecker.new(dictionary: dym_list).correct('@#{res_name}')).present?
+                         msg << \"\nIf you meant \\\"#\{found_dym = dym.first[1..-1]}\\\" then to avoid this message add this entry into inflections.rb:\n\"
+                         msg << \"  inflect.irregular '#{obj_name}', '#\{found_dym}'\"
+                         puts
+                         puts \"WARNING:  #\{msg}\"
+                         puts
+                         @#{res_name} = instance_variable_get(dym.first.to_sym)
+                       else
+                         raise ActiveRecord::RecordNotFound.new(msg)
+                       end
+                     end
+
+    # Starts as being just has_many columns, and will be augmented later with all the other columns
+    cols = {#{hms_keys = []
+            hms_headers.map do |hm|
+              hms_keys << (assoc_name = (assoc = hm.first).name.to_s)
+              "#{assoc_name.inspect} => [#{(assoc.options[:through] && !assoc.through_reflection).inspect}, #{assoc.klass.name}, #{hm[1].inspect}, #{hm[2].inspect}]"
+            end.join(', ')}}
+
+    # %%% Why in the Canvas LMS app does ActionView::Helpers get cleared / reloaded, or otherwise lose access to #brick_grid ???
+    # Possible fix if somewhere we can implement the #include with:
+    # (ActiveSupport.const_defined?('Reloader') ? ActiveSupport : ActionDispatch)::Reloader.to_prepare do ... end
+    # or
+    # Rails.application.reloader.to_prepare do ... end
+    self.class.class_exec { include ::Brick::Rails::FormTags } unless respond_to?(:brick_grid)
+
+    # Prepare the main content now so that we have a chance to become aware of any STI child classes represented in the rows returned.
+    main_content = #{
+      # Determine if we should render an N:M representation or the standard "mega_grid"
+      taa = ::Brick.config.treat_as_associative&.fetch(table_name, nil)
+      options = {}
+      options[:prefix] = prefix unless prefix.blank?
+      if taa.is_a?(String) || # Write out a constellation
+         (taa.is_a?(Array) && (options[:axes] = taa[0..-2]) && (options[:dsl] = taa.last))
+        representation = :constellation
+        "brick_constellation(@#{res_name}, #{options.inspect}, bt_descrip: @_brick_bt_descrip, bts: bts)"
+      elsif taa.is_a?(Symbol) # Write out a bezier representation
+        "brick_bezier(@#{res_name}, #{options.inspect}, bt_descrip: @_brick_bt_descrip, bts: bts)"
+      else # Write out the mega-grid
+        representation = :grid
+        "brick_grid(@#{res_name}, @_brick_sequence, @_brick_incl, @_brick_excl,
+               cols, bt_descrip: @_brick_bt_descrip,
+               poly_cols: poly_cols, bts: bts, hms_keys: #{hms_keys.inspect}, hms_cols: {#{hms_columns.join(', ')}})"
+      end}
 %><%= if (children = model.descendants).present?
   child_links = children.map do |child|
     path = send(\"#\{child._brick_index}_path\") + \"?__#\{base_model.inheritance_column}=#\{child.name}\"
@@ -1214,60 +1267,7 @@ end
 </div></div>
 #{::Brick::Rails.erd_markup(@_brick_model, prefix) if @_brick_model}
 
-<%=#  Consider getting the name from the association -- hm.first.name -- if a more \"friendly\" alias should be used for a screwy table name
-    # If the resource is missing, has the user simply created an inappropriately pluralised name for a table?
-    @#{res_name} ||= if (dym_list = instance_variables.reject do |entry|
-                             entry.to_s.start_with?('@_') ||
-                             ['@cache_hit', '@marked_for_same_origin_verification', '@view_renderer', '@view_flow', '@output_buffer', '@virtual_path'].include?(entry.to_s)
-                           end).present?
-                         msg = +\"Can't find resource \\\"#{res_name}\\\".\"
-                         # Can't be sure otherwise of what is up, so check DidYouMean and offer a suggestion.
-                         if (dym = DidYouMean::SpellChecker.new(dictionary: dym_list).correct('@#{res_name}')).present?
-                           msg << \"\nIf you meant \\\"#\{found_dym = dym.first[1..-1]}\\\" then to avoid this message add this entry into inflections.rb:\n\"
-                           msg << \"  inflect.irregular '#{obj_name}', '#\{found_dym}'\"
-                           puts
-                           puts \"WARNING:  #\{msg}\"
-                           puts
-                           @#{res_name} = instance_variable_get(dym.first.to_sym)
-                         else
-                           raise ActiveRecord::RecordNotFound.new(msg)
-                         end
-                       end
-
-    # Starts as being just has_many columns, and will be augmented later with all the other columns
-    cols = {#{hms_keys = []
-              hms_headers.map do |hm|
-                hms_keys << (assoc_name = (assoc = hm.first).name.to_s)
-                "#{assoc_name.inspect} => [#{(assoc.options[:through] && !assoc.through_reflection).inspect}, #{assoc.klass.name}, #{hm[1].inspect}, #{hm[2].inspect}]"
-              end.join(', ')}}
-
-    # %%% Why in the Canvas LMS app does ActionView::Helpers get cleared / reloaded, or otherwise lose access to #brick_grid ???
-    # Possible fix if somewhere we can implement the #include with:
-    # (ActiveSupport.const_defined?('Reloader') ? ActiveSupport : ActionDispatch)::Reloader.to_prepare do ... end
-    # or
-    # Rails.application.reloader.to_prepare do ... end
-    self.class.class_exec { include ::Brick::Rails::FormTags } unless respond_to?(:brick_grid)
-
-    #{# Determine if we should render an N:M representation or the standard "mega_grid"
-      taa = ::Brick.config.treat_as_associative&.fetch(table_name, nil)
-      options = {}
-      options[:prefix] = prefix unless prefix.blank?
-      if taa.is_a?(String) || # Write out a constellation
-         (taa.is_a?(Array) && (options[:axes] = taa[0..-2]) && (options[:dsl] = taa.last))
-        representation = :constellation
-        "
-    brick_constellation(@#{res_name}, #{options.inspect}, bt_descrip: @_brick_bt_descrip, bts: bts)"
-      elsif taa.is_a?(Symbol) # Write out a bezier representation
-        "
-    brick_bezier(@#{res_name}, #{options.inspect}, bt_descrip: @_brick_bt_descrip, bts: bts)"
-      else # Write out the mega-grid
-        representation = :grid
-        "
-    brick_grid(@#{res_name}, @_brick_sequence, @_brick_incl, @_brick_excl,
-               cols, bt_descrip: @_brick_bt_descrip,
-               poly_cols: poly_cols, bts: bts, hms_keys: #{hms_keys.inspect}, hms_cols: {#{hms_columns.join(', ')}})"
-      end}
- %>
+<%= main_content %>
 
 #{"<hr><%= link_to_brick(model, new: true, class: '__brick') %>" unless @_brick_model.is_view?}
 #{script}
@@ -1397,6 +1397,7 @@ s << \"\\n  <br>\\n\"
                          end
 
                        when 'show', 'new', 'update'
+                         representation = :show
 +"<html>
 <head>
 #{css}
@@ -1709,7 +1710,8 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
 <% end %>
 "
               end
-              if representation == :grid
+              case representation
+              when :grid
                 inline << "<script<%= @_request.env['_brick_nonce'] %>>
 <%#  Make column headers sort when clicked
    # %%% Create a smart javascript routine which can do this client-side %>
@@ -1724,6 +1726,9 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
     }
   });
 });
+</script>"
+              when :show
+                inline << "<script<%= @_request.env['_brick_nonce'] %>>
 document.querySelectorAll(\"input, select\").forEach(function (inp) {
   var origVal = getInpVal(),
       prevVal = origVal;

data/lib/brick/rails/form_tags.rb

@@ -58,6 +58,7 @@ module Brick::Rails::FormTags
                s << if (bt = bts[col_name])
                       # Allow sorting for any BT except polymorphics
                       x_order = " x-order=\"#{bt.first}\"" unless bt[2]
+                      # binding.pry
                       "#{x_order}>BT #{bt[1].map { |bt_pair| bt_pair.first.bt_link(bt.first) }.join(' ')}"
                     else # Normal column
                       col_name_humanised = klass.human_attribute_name(col_name, { default: col_name })

data/lib/brick/rails.rb

@@ -27,7 +27,7 @@ module ::Brick::Rails
                               (val && ::Brick.is_geography?(val))
                             )
                           )
-            # MySQL's \"Internal Geometry Format\" and MSSQL's Geography are like WKB, but with an initial 4 bytes that indicates the SRID.
+            # MySQL's "Internal Geometry Format" and MSSQL's Geography are like WKB, but with an initial 4 bytes that indicates the SRID.
             if (srid = val&.[](0..3)&.unpack('I'))
               val = val.dup.force_encoding('BINARY')[4..-1].bytes
 
@@ -109,7 +109,7 @@ module ::Brick::Rails
       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)}\">"
+        "<img src=\"data:image/#{signature};base64,#{Base64.encode64(val)}\">"
       else
         descrip = "#{signature ? "#{signature} image" : 'Binary'}, #{val.length} bytes"
         no_escaped_html ? "< #{descrip} >" : "&lt;&nbsp;#{descrip}&nbsp;>"

data/lib/brick/version_number.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.251
+  version: 1.0.253
 platform: ruby
 authors:
 - Lorin Thwaits