brick 1.0.128 → 1.0.130

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4465179ddef5435627439c7123bbb63e951abcda5bd8bd8e20952cca2fc9e274
-  data.tar.gz: b567eb687c8eea355ece80562a67e424629df4a8b64aae48596e6c6b01c730b4
+  metadata.gz: 902948e0d502bc9c1b604f3e99b975ab8c7d42c378888280d84dac6aef2aa7d0
+  data.tar.gz: 82988754dcae3ccc67eb5997531b3fa218ecf364f076ecf221fac201412baff0
 SHA512:
-  metadata.gz: 162cf46af2e43b2652e59f9fe8f4d2826e490def50fb868869f614aacb256cfeecee3833dfb41807bef5ea64c83e921b7e993e728e6e42730a214ec49601de67
-  data.tar.gz: 15fdcc9b67bc82b55a195168e020575ca04d9d1ae5830e0d1bcd2c7e04944aba90238342cabc1c93b7b7d01619a369b1bb0a0383dbbe91666e796ffa4051aa55
+  metadata.gz: 780184ebc02c020389bc2239e115e885df056fa6895ed32bd35b5315f2e55f86deb679f2966e7290118bc54f4d50478b4240d7d77470d27a5902af22948d83f1
+  data.tar.gz: 39c37a9db2c7c392209491e1609f8ab4c2b64d27371452b60310d326bd462b5e653196697d0faf8f4bf801793400e073bf73f2ed72a38e9c66bd9b8e98d1e778

data/lib/brick/extensions.rb

@@ -148,7 +148,8 @@ module ActiveRecord
                 translations[parts[0..-2].join('.')] = klass
               end
               if klass&.column_names.exclude?(parts.last) &&
-                 (klass = (orig_class = klass).reflect_on_association(possible_dsl = parts.pop.to_sym)&.klass)
+                 (klass = (orig_class = klass).reflect_on_association(possible_dsl = parts.last&.to_sym)&.klass)
+                parts.pop
                 if prefix.empty? # Custom columns start with an empty prefix
                   prefix << parts.shift until parts.empty?
                 end
@@ -162,6 +163,7 @@ module ActiveRecord
                 if emit_dsl
                   dsl3 << "[#{prefix[1..-1].map { |p| "#{p.to_s}." }.join if prefix.length > 1}#{bracket_name}]"
                 end
+                parts[-1] = column_names.first if parts[-1].nil? # No primary key to be found?  Grab something to display!
                 members << parts
               end
             end
@@ -231,7 +233,8 @@ module ActiveRecord
                         if this_obj.is_a?(ActiveRecord::Base) && (obj_descrip = this_obj.class.brick_descrip(this_obj))
                           this_obj = obj_descrip
                         end
-                        if this_obj.is_a?(ActiveStorage::Filename) && this_obj.instance_variable_get(:@filename).nil?
+                        if Object.const_defined?('ActiveStorage') && this_obj.is_a?(::ActiveStorage::Filename) &&
+                           this_obj.instance_variable_get(:@filename).nil?
                           this_obj.instance_variable_set(:@filename, '')
                         end
                         this_obj&.to_s || ''
@@ -741,12 +744,20 @@ module ActiveRecord
                          end
                        else
                          fk_col = (inv = hm.inverse_of)&.foreign_key || hm.foreign_key
-                         poly_type = inv.foreign_type if hm.options.key?(:as)
+                         # %%% Might only need hm.type and not the first part :)
+                         poly_type = inv&.foreign_type || hm.type if hm.options.key?(:as)
                          pk = hm.klass.primary_key
                          (pk.is_a?(Array) ? pk.first : pk) || '*'
                        end
         next unless count_column # %%% Would be able to remove this when multiple foreign keys to same destination becomes bulletproof
 
+        pri_tbl = hm.active_record
+        pri_key = hm.options[:primary_key] || pri_tbl.primary_key
+        unless hm.klass.column_names.include?(pri_key)
+          nix << k
+          next
+        end
+
         tbl_alias = if is_mysql
                       "`b_r_#{hm.name}`"
                     elsif is_postgres
@@ -754,7 +765,6 @@ module ActiveRecord
                     else
                       "b_r_#{hm.name}"
                     end
-        pri_tbl = hm.active_record
         pri_tbl_name = is_mysql ? "`#{pri_tbl.table_name}`" : "\"#{pri_tbl.table_name.gsub('.', '"."')}\""
         pri_tbl_name = if is_mysql
                          "`#{pri_tbl.table_name}`"
@@ -765,10 +775,10 @@ module ActiveRecord
                        end
         on_clause = []
         hm_selects = if fk_col.is_a?(Array) # Composite key?
-                       fk_col.each_with_index { |fk_col_part, idx| on_clause << "#{tbl_alias}.#{fk_col_part} = #{pri_tbl_name}.#{pri_tbl.primary_key[idx]}" }
+                       fk_col.each_with_index { |fk_col_part, idx| on_clause << "#{tbl_alias}.#{fk_col_part} = #{pri_tbl_name}.#{pri_key[idx]}" }
                        fk_col.dup
                      else
-                       on_clause << "#{tbl_alias}.#{fk_col} = #{pri_tbl_name}.#{pri_tbl.primary_key}"
+                       on_clause << "#{tbl_alias}.#{fk_col} = #{pri_tbl_name}.#{pri_key}"
                        [fk_col]
                      end
         if poly_type
@@ -864,6 +874,9 @@ JOIN (SELECT #{hm_selects.map { |s| "#{'br_t0.' if from_clause}#{s}" }.join(', '
     def brick_list
       pks = klass.primary_key.is_a?(String) ? [klass.primary_key] : klass.primary_key
       selects = pks.each_with_object([]) { |pk, s| s << pk unless s.include?(pk) }
+      # ActiveStorage compatibility
+      selects << 'service_name' if klass.name == 'ActiveStorage::Blob' && ActiveStorage::Blob.columns_hash.key?('service_name')
+      selects << 'blob_id' if klass.name == 'ActiveStorage::Attachment' && ActiveStorage::Attachment.columns_hash.key?('blob_id')
       pieces, my_dsl = klass.brick_parse_dsl(join_array = ::Brick::JoinArray.new, [], translations = {}, false, nil, true)
       brick_select(
         where_values_hash, selects, nil, translations, join_array,
@@ -1866,7 +1879,7 @@ class Object
               # Convert any Filename objects with nil into an empty string so that #encode can be called on them
               new_obj.serializable_hash.each do |k, v|
                 new_obj.send("#{k}=", ActiveStorage::Filename.new('')) if v.is_a?(ActiveStorage::Filename) && !v.instance_variable_get(:@filename)
-              end
+              end if Object.const_defined?('ActiveStorage')
             end
             instance_variable_set("@#{singular_table_name}".to_sym, new_obj)
           end
@@ -2438,7 +2451,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
         singular = rel_name.last
       end
       name_parts = if (tnp = ::Brick.config.table_name_prefixes
-                                    .find { |k1, _v1| singular.start_with?(k1) && singular.length > k1.length }
+                                    &.find { |k1, _v1| singular.start_with?(k1) && singular.length > k1.length }
                       ).present?
                      v[:auto_prefixed_schema] = tnp.first
                      v[:resource] = rel_name.last[(tnp_length = tnp.first.length)..-1]

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

@@ -58,7 +58,7 @@ module Brick
             '(Add RGeo gem to parse geometry detail)'
           end
         when :binary
-          ::Brick::Rails.display_binary(val) if val
+          ::Brick::Rails.display_binary(val)
         else
           if col_type
             ::Brick::Rails::FormBuilder.hide_bcrypt(val, col_type == :xml)
@@ -69,8 +69,12 @@ module Brick
       end
 
       def display_binary(val)
+        return unless val
+
         @image_signatures ||= { (+"\xFF\xD8\xFF\xEE").force_encoding('ASCII-8BIT') => 'jpeg',
                                 (+"\xFF\xD8\xFF\xE0\x00\x10\x4A\x46\x49\x46\x00\x01").force_encoding('ASCII-8BIT') => 'jpeg',
+                                (+"\xFF\xD8\xFF\xDB").force_encoding('ASCII-8BIT') => 'jpeg',
+                                (+"\xFF\xD8\xFF\xE1").force_encoding('ASCII-8BIT') => 'jpeg',
                                 (+"\x89PNG\r\n\x1A\n").force_encoding('ASCII-8BIT') => 'png',
                                 '<svg' => 'svg+xml', # %%% Not yet very good detection for SVG
                                 (+'BM').force_encoding('ASCII-8BIT') => 'bmp',
@@ -90,7 +94,8 @@ module Brick
           val = val[object_start...object_start + real_object_size]
         end
 
-        if (signature = @image_signatures.find { |k, _v| val[0...k.length] == k })
+        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
@@ -647,7 +652,9 @@ window.addEventListener(\"popstate\", linkSchemas);
                             else
                               hm_assoc.active_record.name
                             end
-                keys << [hm_assoc.inverse_of.foreign_type, poly_type]
+                # %%% Might only need hm_assoc.type and not the first part :)
+                type_col = hm_assoc.inverse_of&.foreign_type || hm_assoc.type
+                keys << [type_col, poly_type]
               end
               keys.to_h
             end
@@ -1290,7 +1297,7 @@ erDiagram
 </head>
 <body>
 <div id=\"titleBox\"><div id=\"titleSticky\">
-<p style=\"color: green\"><%= notice %></p>#{"
+<p style=\"color: green\"><%= notice if request.respond_to?(:flash) %></p>#{"
 #{schema_options}" if schema_options}
 <select id=\"tbl\">#{table_options}</select>
 <table id=\"resourceName\"><tr>
@@ -1411,7 +1418,8 @@ end
     brick_grid(@#{table_name}, @_brick_bt_descrip, @_brick_sequence, @_brick_incl, @_brick_excl,
                cols, poly_cols, bts, #{hms_keys.inspect}, {#{hms_columns.join(', ')}}) %>
 
-#{"<hr><%= link_to \"New #{obj_name}\", new_#{path_obj_name}_path %>" unless @_brick_model.is_view?}
+#{"<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?}
 #{script}
 </body>
 </html>
@@ -1423,7 +1431,7 @@ end
 # Must load all models, and then find what table names are represented
 # Easily could be multiple files involved (STI for instance)
 +"#{css}
-<p style=\"color: green\"><%= notice %></p>#{"
+<p style=\"color: green\"><%= notice if request.respond_to?(:flash) %></p>#{"
 #{schema_options}" if schema_options}
 <select id=\"tbl\">#{table_options}</select>
 <h1>Status</h1>
@@ -1473,7 +1481,7 @@ end
                        when 'orphans'
                          if is_orphans
 +"#{css}
-<p style=\"color: green\"><%= notice %></p>#{"
+<p style=\"color: green\"><%= notice if request.respond_to?(:flash) %></p>#{"
 #{schema_options}" if schema_options}
 <select id=\"tbl\">#{table_options}</select>
 <h1>Orphans<%= \" for #\{}\" if false %></h1>
@@ -1520,7 +1528,7 @@ end
   c23.141-70.188,89.141-120.906,167.063-120.906c97.25,0,176,78.813,176,176C511.828,227.078,404.391,119.641,271.844,119.641z\" />
 </svg>
 
-<p style=\"color: green\"><%= notice %></p>#{"
+<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>
@@ -1555,14 +1563,13 @@ end
 %><%= link_to \"(See all #\{model_name.pluralize})\", see_all_path %>
 #{erd_markup}
 <% if obj
-      # path_options = [obj.#{pk}]
-      # path_options << { '_brick_schema':  } if
-      # url = send(:#\{model._brick_index(:singular)}_path, obj.#{pk})
-      options = {}
-      if ::Brick.config.path_prefix
-        path_helper = obj.new_record? ? #{model_name}._brick_index : #{model_name}._brick_index(:singular)
-        options[:url] = send(\"#\{path_helper}_path\".to_sym, obj)
-      end
+     # path_options = [obj.#{pk}]
+     # path_options << { '_brick_schema':  } if
+     options = {}
+     if ::Brick.config.path_prefix
+       path_helper = obj.new_record? ? #{model_name}._brick_index : #{model_name}._brick_index(:singular)
+       options[:url] = send(\"#\{path_helper}_path\".to_sym, obj)
+     end
 %>
   <br><br>
 <%= form_for(obj.becomes(#{model_name}), options) do |f| %>
@@ -1570,11 +1577,11 @@ end
   <% has_fields = false
      @#{obj_name}.attributes.each do |k, val|
        next if !(col = #{model_name}.columns_hash[k]) ||
-               (#{(pk || []).inspect}.include?(k) && !bts.key?(k)) ||
+               (#{(pk.map(&:to_s) || []).inspect}.include?(k) && !bts.key?(k)) ||
                ::Brick.config.metadata_columns.include?(k) %>
     <tr>
     <th class=\"show-field\"<%= \" title=\\\"#\{col.comment}\\\"\".html_safe if col.respond_to?(:comment) && !col.comment.blank? %>>
-    <% has_fields = true
+<%    has_fields = true
       if (bt = bts[k])
         # Add a final member in this array with descriptive options to be used in <select> drop-downs
         bt_name = bt[1].map { |x| x.first.name }.join('/')
@@ -1627,7 +1634,11 @@ end
   <% else %>
     <tr><td colspan=\"2\">(No displayable fields)</td></tr>
   <% end %>
-  </table>
+  </table>#{
+  "<%= binary = begin
+                  ::Brick::Rails.display_binary(obj&.blob&.download)&.html_safe
+                rescue
+                end %>" if model_name == 'ActiveStorage::Attachment'}
 <%  end %>
 
 #{unless args.first == 'new'
@@ -1660,6 +1671,12 @@ end
              # In order to apply DSL properly, evaluate this HO the other way around as if it were as a BT
              collection = assoc.klass.where(assoc.foreign_key => @#{obj_name}.#{pk})
              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
+                            rescue
+                            end
+             end
            else
              collection = @#{obj_name}.#{hm_name}
            end
@@ -1677,9 +1694,9 @@ end
           <tr><td>(none)</td></tr>
      <% else
           collection2.each do |#{hm_singular_name}| %>
-            <tr><td><%= br_descrip = #{hm_singular_name}.brick_descrip(
-                                       descrip_cols&.first&.map { |col| #{hm_singular_name}.send(col.last) }
-                                     )
+            <tr><td><%= br_descrip ||= #{hm_singular_name}.brick_descrip(
+                                         descrip_cols&.first&.map { |col| #{hm_singular_name}.send(col.last) }
+                                       )
                         link_to(br_descrip, #{hm.first.klass._brick_index(:singular)}_path(slashify(#{obj_pk}))) %></td></tr>
           <% end %>
         <% end %>

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

@@ -115,7 +115,14 @@ module Brick::Rails::FormTags
             if col[2] == 'HO'
               descrips = bt_descrip[col_name.to_sym][hm_klass]
               if (ho_id = (ho_id_col = descrips.last).map { |id_col| obj.send(id_col.to_sym) })&.first
-                ho_txt = hm_klass.brick_descrip(obj, descrips[0..-2].map { |id| obj.send(id.last[0..62]) }, ho_id_col)
+                ho_txt = if hm_klass.name == 'ActiveStorage::Attachment'
+                           begin
+                             ::Brick::Rails.display_binary(obj.send(col[3])&.blob&.download)&.html_safe
+                           rescue
+                           end
+                         else
+                           hm_klass.brick_descrip(obj, descrips[0..-2].map { |id| obj.send(id.last[0..62]) }, ho_id_col)
+                         end
                 out << link_to(ho_txt, send("#{hm_klass.base_class._brick_index(:singular)}_path".to_sym, ho_id))
               end
             else

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -1661,7 +1661,8 @@ module ActiveRecord
               relation.brick_links[link_path] = if child.table.is_a?(Arel::Nodes::TableAlias)
                                                   child.table.right
                                                 else
-                                                  result.first&.left&.table_alias || child.table_name
+                                                  # Was:  result.first&.left&.table_alias || child.table_name
+                                                  child.table.table_alias || child.table_name
                                                 end
             end
             result

metadata

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