brick 1.0.208 → 1.0.209

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b119de0df1fa94e7c3a07315295c2d5fcf2871ec01e44986db6ddee784b82cf3
-  data.tar.gz: ba567e471502273780baeb78ed456e3b81319ce63560ccd7eaaf7ec15cb0ea21
+  metadata.gz: 9727d5ff3dbf5edcb8ce91b03d0570eec5eb2e0f9ae2c4f456d9d50779321fc9
+  data.tar.gz: 32b32f909110d6eca464c775d9725ad049fabf8591daab1088da007ae9a95c5a
 SHA512:
-  metadata.gz: 6f0e173346e205727f94e1e33d182f2a783cc20d3496a8acb7592da9c931a1c4a9e6f32da540d78647f75b00b504df03845e17816cfd589a6dc69d73a81f56b5
-  data.tar.gz: 02b36babcf6958b35cf38ad8caf2147fffaf5a438f2674a541f46f0b9813ec46df05a5fe1fafcbaba96ad63a654db429d4dc245d1a1cb688b1e20070b197a374
+  metadata.gz: 1931290e472f472d93e1536e6517a3865bcc1acd23d15156d48e52c7f35987183b274c8a7c2ac00f09f2f6ac9a4d5663071c84ae4c896de6b4c0069d4a06b1da
+  data.tar.gz: 5064ef883fb66feb187fe80a92b3ec700da04feef0f390d720b51497f086bbc1062e505cd467d3624fadb6102bc8dec49b0b6b16a1c04a1a1ceb34e50f4f9ff5

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

@@ -57,7 +57,7 @@ module Brick::Rails::FormBuilder
           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?
+             (url = self.object.send(col.name)&.url) # Carrierwave image?
             out << "<img src=\"#{url}\" title=\"#{val}\">"
           elsif model.respond_to?(:enumerized_attributes) && (opts = (attr = model.enumerized_attributes[method])&.options).present?
             enum_html_options = attr.kind_of?(Enumerize::Multiple) ? html_options.merge({ multiple: true, size: opts.length + 1 }) : html_options

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

@@ -232,15 +232,15 @@ module Brick::Rails::FormTags
           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?
-                    # And either not restricting Carrierwave, or under the defined Carrierwave image 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)
-                      )
-                    )
+                       (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) &&

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 208
+    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.208
+  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
@@ -285,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Create a Rails app from data alone