brick 1.0.207 → 1.0.209

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 585c18ee97a6ecead8dec67a3bd9ad7ef765524bb109c72c5550f9f0dbd3b98f
-  data.tar.gz: a0ff5371aef56af539e2022349c0b07c0cdad0bdc93dcbb35aa54a1a8ef3ae4f
+  metadata.gz: 9727d5ff3dbf5edcb8ce91b03d0570eec5eb2e0f9ae2c4f456d9d50779321fc9
+  data.tar.gz: 32b32f909110d6eca464c775d9725ad049fabf8591daab1088da007ae9a95c5a
 SHA512:
-  metadata.gz: 73f5772ef3b440025b50c62b727a58e63392b7642f326d43e63be64f5c2d68eb9fcc1e8a0d77279f0491a284e51cdeb3ca1db90a67bf2b79d1a4f62371575c71
-  data.tar.gz: 9c068ca26a463307b7f931ca7dcd3c4c12bb06dcc313b284a286aa509ef039b5e4efea1108be9f83839bdb84de47249b9c93a4418dcfc51fe507fd85dba0a6dd
+  metadata.gz: 1931290e472f472d93e1536e6517a3865bcc1acd23d15156d48e52c7f35987183b274c8a7c2ac00f09f2f6ac9a4d5663071c84ae4c896de6b4c0069d4a06b1da
+  data.tar.gz: 5064ef883fb66feb187fe80a92b3ec700da04feef0f390d720b51497f086bbc1062e505cd467d3624fadb6102bc8dec49b0b6b16a1c04a1a1ceb34e50f4f9ff5

data/lib/brick/config.rb

@@ -258,6 +258,18 @@ module Brick
       @mutex.synchronize { @json_columns = cols }
     end
 
+    # Restrict all Carrierwave images when set to +true+,
+    # or limit to the first n number if set to an Integer
+    def limit_carrierwave
+      # When not set then by default just do a max of 50 images so that
+      # a grid of say 1000 things won't bring the page to its knees
+      @mutex.synchronize { @limit_carrierwave ||= 50 }
+    end
+
+    def limit_carrierwave=(num)
+      @mutex.synchronize { @limit_carrierwave = num }
+    end
+
     def sidescroll
       @mutex.synchronize { @sidescroll ||= {} }
     end

data/lib/brick/extensions.rb

@@ -542,25 +542,27 @@ module ActiveRecord
 
     # Links from ActiveRecord association pathing names over to the real table
     # correlation names that get chosen when the AREL AST tree is walked.
-    def brick_links
+    def brick_links(do_dup = true)
       # Touching AREL AST walks the JoinDependency tree, and in that process uses our
       # "brick_links" patch to find how every AR chain of association names relates to exact
-      # table correlation names chosen by AREL.  We use a duplicate relation object for this
-      # because an important side-effect of referencing the AST is that the @arel instance
-      # variable gets set, and this is a signal to ActiveRecord that a relation has now
-      # become immutable.  (We aren't quite ready for our "real deal" relation object to be
-      # set in stone ... still need to add .select(), and possibly .where() and .order()
-      # things ... also if there are any HM counts then an OUTER JOIN for each of them out
-      # to a derived table to do that counting.  All of these things need to know proper
-      # table correlation names, which will now become available from brick_links on the
-      # rel_dupe object.)
+      # table correlation names chosen by AREL.  Unless a relation has already had its AST
+      # tree built out, we will use a duplicate relation object for this, because an important
+      # side-effect of referencing the AST is that the @arel instance variable gets set.  This
+      # is a signal to ActiveRecord that a relation has now become immutable.  (When Brick is
+      # still in the middle of calculating its query, we aren't quite ready for the relation
+      # object to be set in stone ... still need to add .select(), and possibly .where() and
+      # .order() things ... also if there are any HM counts then an OUTER JOIN for each of
+      # them out to a derived table to do that counting.  All of these things need to know
+      # proper table correlation names, which will now become available from brick_links on
+      # the rel_dupe object.)
       @_brick_links ||= begin
                           # If it's a CollectionProxy (which inherits from Relation) then need to dig
                           # out the core Relation object which is found in the association scope.
-                          rel_dupe = (is_a?(ActiveRecord::Associations::CollectionProxy) ? scope : self).dup
+                          brick_rel = is_a?(ActiveRecord::Associations::CollectionProxy) ? scope : self
+                          brick_rel = brick_rel.dup if do_dup
                           # Start out with a hash that has only the root table name
-                          rel_dupe.instance_variable_set(:@_brick_links, bl = { '' => table_name })
-                          rel_dupe.arel.ast # Walk the AST tree in order to capture all the other correlation names
+                          brick_rel.instance_variable_set(:@_brick_links, bl = { '' => table_name })
+                          brick_rel.arel.ast if do_dup # Walk the AST tree in order to capture all the other correlation names
                           bl
                         end
     end

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

@@ -1,7 +1,8 @@
 module Brick::Rails::FormBuilder
   DT_PICKERS = { datetime: 'datetimepicker', timestamp: 'datetimepicker', time: 'timepicker', date: 'datepicker' }
 
-  # When this field is one of the appropriate types, will set one of these instance variables accordingly:
+  # Render an editable field
+  # When it's one of these types, will set an appropriate instance variable truthy accordingly:
   #   @_text_fields_present - To include trix editor
   #   @_date_fields_present - To include flatpickr date / time editor
   #   @_json_fields_present - To include JSONEditor
@@ -37,7 +38,7 @@ module Brick::Rails::FormBuilder
                   "<span class=\"orphan\">Orphaned ID: #{val}</span>".html_safe
                 end
       out << bt_link if bt_link
-    elsif @_brick_monetized_attributes&.include?(method)
+    elsif model._brick_monetized_attributes&.include?(method)
       out << self.text_field(method.to_sym, html_options.merge({ value: Money.new(val.to_i).format }))
     else
       col_type = if model.json_column?(col) || val.is_a?(Array)
@@ -51,9 +52,9 @@ module Brick::Rails::FormBuilder
       when :string, :text, :citext,
            :enum # Support for the activerecord-mysql-enum gem
         spit_out_text_field = nil
-        if ::Brick::Rails::FormBuilder.is_bcrypt?(val) # || .readonly?
+        if ::Brick::Rails.is_bcrypt?(val) # || .readonly?
           is_revert = false
-          out << ::Brick::Rails::FormBuilder.hide_bcrypt(val, nil, 1000)
+          out << ::Brick::Rails.hide_bcrypt(val, nil, 1000)
         elsif col_type == :string
           if model.respond_to?(:uploaders) && model.uploaders.key?(col.name&.to_sym) &&
              (url = self.object.send(col.name)&.url) # Carrierwave image?
@@ -139,74 +140,4 @@ module Brick::Rails::FormBuilder
 "
     out.html_safe
   end # brick_field
-
-  # --- CLASS METHODS ---
-
-  def self.is_bcrypt?(val)
-    val.is_a?(String) && val.length == 60 && val.start_with?('$2a$')
-  end
-
-  def self.hide_bcrypt(val, is_xml = nil, max_len = 200)
-    if ::Brick::Rails::FormBuilder.is_bcrypt?(val)
-      '(hidden)'
-    else
-      if val.is_a?(String)
-        return ::Brick::Rails.display_binary(val) unless (val_utf8 = val.dup.force_encoding('UTF-8')).valid_encoding?
-
-        val = val_utf8.strip
-        return CGI.escapeHTML(val) if is_xml
-
-        if val.length > max_len
-          if val[0] == '<' # Seems to be HTML?
-            cur_len = 0
-            cur_idx = 0
-            # Find which HTML tags we might be inside so we can apply ending tags to balance
-            element_name = nil
-            in_closing = nil
-            elements = []
-            val.each_char do |ch|
-              case ch
-              when '<'
-                element_name = +''
-              when '/' # First character of tag is '/'?
-                in_closing = true if element_name == ''
-              when '>'
-                if element_name
-                  if in_closing
-                    if (idx = elements.index { |tag| tag.downcase == element_name.downcase })
-                      elements.delete_at(idx)
-                    end
-                  elsif (tag_name = element_name.split.first).present?
-                    elements.unshift(tag_name)
-                  end
-                  element_name = nil
-                  in_closing = nil
-                end
-              else
-                element_name << ch if element_name
-              end
-              cur_idx += 1
-              # Unless it's inside wickets then this is real text content, and see if we're at the limit
-              break if element_name.nil? && ((cur_len += 1) > max_len)
-            end
-            val = val[0..cur_idx]
-            # Somehow still in the middle of an opening tag right at the end? (Should never happen)
-            if !in_closing && (tag_name = element_name&.split&.first)&.present?
-              elements.unshift(tag_name)
-              val << '>'
-            end
-            elements.each do |closing_tag|
-              val << "</#{closing_tag}>"
-            end
-          else # Not HTML, just cut it at the length
-            val = val[0...max_len]
-          end
-          val = "#{val}..."
-        end
-        val
-      else
-        val.to_s
-      end
-    end
-  end  
 end

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

@@ -229,11 +229,18 @@ module Brick::Rails::FormTags
             end
           end
         elsif (col = cols[col_name]).is_a?(ActiveRecord::ConnectionAdapters::Column)
-          # binding.pry if col.is_a?(Array)
           out << if klass._brick_monetized_attributes&.include?(col_name)
                    val ? Money.new(val.to_i).format : ''
                  elsif klass.respond_to?(:uploaders) && klass.uploaders.key?(col_name.to_sym) &&
-                    (url = obj.send(col_name)&.url) # Carrierwave image?
+                       (url = obj.send(col.name)&.url) && # Has a Carrierwave URL? ...
+                       # ... and either not restricting Carrierwave, or under the defined Carrierwave attachment limit?
+                       (!(limit_carrierwave = ::Brick.config.limit_carrierwave) ||
+                         (limit_carrierwave.is_a?(Numeric) &&
+                         (carrierwave_count = instance_variable_get(:@_carrierwave_count) || 0) &&
+                         ((carrierwave_count += 1) < limit_carrierwave) &&
+                         instance_variable_set(:@_carrierwave_count, carrierwave_count)
+                         )
+                       )
                    "<img class=\"thumbImg\" src=\"#{url}\" title=\"#{val}\">"
                  else
                    lat_lng = if [:float, :decimal].include?(col.type) &&
@@ -663,6 +670,7 @@ btnAddCol.addEventListener(\"click\", function () {
 
 private
 
+  # Dig through all instance variables with hopes to find any that appear related to ActiveRecord
   def _brick_resource_from_iv(trim_ampersand = false)
     instance_variables.each_with_object(Hash.new { |h, k| h[k] = [] }) do |name, s|
       iv_name = trim_ampersand ? name.to_s[1..-1] : name

data/lib/brick/frameworks/rails.rb

@@ -5,6 +5,9 @@ require 'brick/frameworks/rails/engine'
 
 module ::Brick::Rails
   class << self
+    # Low-level way to render read-only data for a field based on its data type.
+    # Used by both brick_grid and brick_form_for (which gets down to this low-level
+    # implementation from brick_field).
     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)
@@ -68,10 +71,10 @@ module ::Brick::Rails
             "<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.const_defined?(:NumberHelper)
             ::ActiveSupport::NumberHelper.number_to_delimited(val, delimiter: ',')
-          else
-            ::Brick::Rails::FormBuilder.hide_bcrypt(val, col_type == :xml)
+          else # Text or HTML based content
+            ::Brick::Rails.hide_bcrypt(val, col_type == :xml)
           end
-        else
+        else # Don't take chances if we can't figure out the data type
           '?'
         end
       end
@@ -172,7 +175,7 @@ erDiagram
    def dt_lookup(dt)
      { 'integer' => 'int', }[dt] || dt&.tr(' ', '_') || 'int'
    end
-   callbacks.merge({#{model_short_name} => #{model.name}}).each do |cb_k, cb_class|
+   callbacks.merge({#{model_short_name.inspect} => #{model.name}}).each do |cb_k, cb_class|
      cb_relation = ::Brick.relations[cb_class.table_name]
      pkeys = cb_relation[:pkey]&.first&.last
      fkeys = cb_relation[:fks]&.values&.each_with_object([]) { |fk, s| s << fk[:fk] if fk.fetch(:is_bt, nil) }
@@ -201,8 +204,80 @@ erDiagram
 </div>
 "
     end
+
+    # Render text or HTML without exposing password details
+    def hide_bcrypt(val, is_xml = nil, max_len = 200)
+      if ::Brick::Rails.is_bcrypt?(val)
+        '(hidden)'
+      else
+        if val.is_a?(String)
+          return ::Brick::Rails.display_binary(val) unless (val_utf8 = val.dup.force_encoding('UTF-8')).valid_encoding?
+
+          val = val_utf8.strip
+          return CGI.escapeHTML(val) if is_xml
+
+          if val.length > max_len
+            if val[0] == '<' # Seems to be HTML?
+              cur_len = 0
+              cur_idx = 0
+              # Find which HTML tags we might be inside so we can apply ending tags to balance
+              element_name = nil
+              in_closing = nil
+              elements = []
+              val.each_char do |ch|
+                case ch
+                when '<'
+                  element_name = +''
+                when '/' # First character of tag is '/'?
+                  in_closing = true if element_name == ''
+                when '>'
+                  if element_name
+                    if in_closing
+                      if (idx = elements.index { |tag| tag.downcase == element_name.downcase })
+                        elements.delete_at(idx)
+                      end
+                    elsif (tag_name = element_name.split.first).present?
+                      elements.unshift(tag_name)
+                    end
+                    element_name = nil
+                    in_closing = nil
+                  end
+                else
+                  element_name << ch if element_name
+                end
+                cur_idx += 1
+                # Unless it's inside wickets then this is real text content, and see if we're at the limit
+                break if element_name.nil? && ((cur_len += 1) > max_len)
+              end
+              val = val[0..cur_idx]
+              # Somehow still in the middle of an opening tag right at the end? (Should never happen)
+              if !in_closing && (tag_name = element_name&.split&.first)&.present?
+                elements.unshift(tag_name)
+                val << '>'
+              end
+              elements.each do |closing_tag|
+                val << "</#{closing_tag}>"
+              end
+            else # Not HTML, just cut it at the length
+              val = val[0...max_len]
+            end
+            val = "#{val}..."
+          end
+          val
+        else
+          val.to_s
+        end
+      end
+    end
+
+    # Password type data?
+    def is_bcrypt?(val)
+      val.is_a?(String) && val.length == 60 && val.start_with?('$2a$')
+    end
   end
 
+  # CONSTANTS
+
   AVO_SVG = "<svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 84 90\" height=\"30\" fill=\"#3096F7\">
   <path d=\"M83.8304 81.0201C83.8343 82.9343 83.2216 84.7996 82.0822 86.3423C80.9427 87.8851 79.3363 89.0244 77.4984 89.5931C75.6606 90.1618 73.6878 90.1302 71.8694 89.5027C70.0509 88.8753 68.4823 87.6851 67.3935 86.1065L67.0796 85.6029C66.9412 85.378 66.8146 85.1463 66.6998 84.9079L66.8821 85.3007C64.1347 81.223 60.419 77.8817 56.0639 75.5723C51.7087 73.263 46.8484 72.057 41.9129 72.0609C31.75 72.0609 22.372 77.6459 16.9336 85.336C17.1412 84.7518 17.7185 83.6137 17.9463 83.0446L19.1059 80.5265L19.1414 80.456C25.2533 68.3694 37.7252 59.9541 52.0555 59.9541C53.1949 59.9541 54.3241 60.0095 55.433 60.1102C60.748 60.6134 65.8887 62.2627 70.4974 64.9433C75.1061 67.6238 79.0719 71.2712 82.1188 75.6314C82.1188 75.6314 82.1441 75.6717 82.1593 75.6868C82.1808 75.717 82.1995 75.749 82.215 75.7825C82.2821 75.8717 82.3446 75.9641 82.4024 76.0595C82.4682 76.1653 82.534 76.4221 82.5999 76.5279C82.6657 76.6336 82.772 76.82 82.848 76.9711L83.1822 77.7063C83.6094 78.7595 83.8294 79.8844 83.8304 81.0201V81.0201Z\" fill=\"currentColor\" fill-opacity=\"0.22\"></path>
   <path opacity=\"0.25\" d=\"M83.8303 81.015C83.8354 82.9297 83.2235 84.7956 82.0844 86.3393C80.9453 87.8829 79.339 89.0229 77.5008 89.5923C75.6627 90.1617 73.6895 90.1304 71.8706 89.5031C70.0516 88.8758 68.4826 87.6854 67.3935 86.1065L67.0796 85.6029C66.9412 85.3746 66.8146 85.1429 66.6998 84.9079L66.8821 85.3007C64.1353 81.222 60.4199 77.8797 56.0647 75.5695C51.7095 73.2593 46.8488 72.0524 41.9129 72.0558C31.75 72.0558 22.372 77.6408 16.9336 85.3309C17.1412 84.7467 17.7185 83.6086 17.9463 83.0395L19.1059 80.5214L19.1414 80.4509C22.1906 74.357 26.8837 69.2264 32.6961 65.6326C38.5086 62.0387 45.2114 60.1232 52.0555 60.1001C53.1949 60.1001 54.3241 60.1555 55.433 60.2562C60.7479 60.7594 65.8887 62.4087 70.4974 65.0893C75.1061 67.7698 79.0719 71.4172 82.1188 75.7775C82.1188 75.7775 82.1441 75.8177 82.1593 75.8328C82.1808 75.863 82.1995 75.895 82.215 75.9285C82.2821 76.0177 82.3446 76.1101 82.4024 76.2055L82.5999 76.5228C82.6859 76.6638 82.772 76.8149 82.848 76.966L83.1822 77.7012C83.6093 78.7544 83.8294 79.8793 83.8303 81.015Z\" fill=\"currentColor\" fill-opacity=\"0.22\"></path>

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -1512,7 +1512,7 @@ module ActiveRecord
   module QueryMethods
   private
 
-    if private_instance_methods.include?(:build_join_query)
+    if private_instance_methods.include?(:build_join_query) # AR 5.0 - 6.0
       alias _brick_build_join_query build_join_query
       def build_join_query(manager, buckets, *args) # , **kwargs)
         # %%% Better way to bring relation into the mix
@@ -1523,7 +1523,7 @@ module ActiveRecord
         _brick_build_join_query(manager, buckets, *args) # , **kwargs)
       end
 
-    elsif private_instance_methods.include?(:select_association_list)
+    elsif private_instance_methods.include?(:select_association_list) # AR >= 6.1
       alias _brick_select_association_list select_association_list
       def select_association_list(associations, stashed_joins = nil)
         result = _brick_select_association_list(associations, stashed_joins)
@@ -1531,7 +1531,7 @@ module ActiveRecord
         result
       end
 
-    # else # Rails 4.1 ? and older
+    # else # AR 4.2 and older
     #   alias _brick_build_joins build_joins
     #   def build_joins(manager, joins)
     #     result = _brick_build_joins(manager, joins)
@@ -1551,12 +1551,12 @@ module ActiveRecord
           # Capture the table alias name that was chosen
           # if (relation = node.instance_variable_get(:@assocs)&.instance_variable_get(:@relation))
           #   link_path = node.instance_variable_get(:@link_path)
-          #   relation.brick_links[link_path] = result.first.table_alias || result.first.table_name
+          #   relation.brick_links(false)[link_path] = result.first.table_alias || result.first.table_name
           # end
           result
         end
       end
-    else # For AR >= 4.2
+    else # For AR >= 4.1
       class JoinDependency
         # An intelligent .eager_load() and .includes() that creates t0_r0 style aliases only for the columns
         # used in .select().  To enable this behaviour, include the flag :_brick_eager_load as the first
@@ -1652,7 +1652,7 @@ module ActiveRecord
             # Capture the table alias name that was chosen
             if (relation = node.instance_variable_get(:@assocs)&.instance_variable_get(:@relation))
               link_path = node.instance_variable_get(:@link_path)
-              relation.brick_links[link_path] = result.first.table_alias || result.first.table_name
+              relation.brick_links(false)[link_path] = result.first.table_alias || result.first.table_name
             end
             result
           end
@@ -1663,7 +1663,7 @@ module ActiveRecord
             # Capture the table alias name that was chosen
             if (relation = child.instance_variable_get(:@assocs)&.instance_variable_get(:@relation))
               link_path = child.instance_variable_get(:@link_path)
-              relation.brick_links[link_path] = if child.table.is_a?(Arel::Nodes::TableAlias)
+              relation.brick_links(false)[link_path] = if child.table.is_a?(Arel::Nodes::TableAlias)
                                                   child.table.right
                                                 else
                                                   # Was:  result.first&.left&.table_alias || child.table_name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.207
+  version: 1.0.209
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-17 00:00:00.000000000 Z
+date: 2024-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord