brick 1.0.122 → 1.0.123

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1f047f700bc850e0e54210cd9669e2877c2d770010f42c82b7f2616ad14f542
-  data.tar.gz: e89b2be75f7d961b24681b4e6c5aeb8beedef51e2537759f93a68baff1787e60
+  metadata.gz: baad039242ee5623097ad6170fec07e5feb0eb2fed6d41a9079f0775cccaceea
+  data.tar.gz: 603377f6b2c4437c448630bce6581d3650b8dfc13187e82afbaab1d425d171e2
 SHA512:
-  metadata.gz: 54418f3b20260bea82b912383038fce3a019a6daf85e56714a1eb2331c7aa130c44706d64e8d1c86502d9ed7c6f7ece730b8a3d467fbe77ee3e699f8e2eb1586
-  data.tar.gz: baf068daf69952fd2235b14abddd93420b73984912eef5da6ffc33699db124058b2e6a093d9984d2fe31abbe620e6d51d5bdbecc5cf23297f6c31b4d4450ed71
+  metadata.gz: 1f4e48c1a437684929a81ace3e75ab15bb627c006680dba5a7454825fba358142560712f016bf944575aefeb27655716c3212d72a2b9b5a083a09cd2dfa8537c
+  data.tar.gz: ea9c376866230e4c2bab7b6c34dfc435a8cf81b568bc22af3a0e69497accca1620152ae311eab6c96649b79ecedf978b880afa88888dc6d1c4d3700bc3ef3060

data/lib/brick/extensions.rb

@@ -1859,18 +1859,27 @@ class Object
               instance_variable_set("@#{singular_table_name}".to_sym, (obj = find_obj))
               upd_params = send(params_name_sym)
               json_overrides = ::Brick.config.json_columns&.fetch(table_name, nil)
-              if (json_cols = model.columns.select { |c| c.type == :json || json_overrides&.include?(c.name) }.map(&:name)).present?
+              if model.respond_to?(:devise_modules)
                 upd_hash = upd_params.to_h
+                upd_hash['reset_password_token'] = nil if upd_hash['reset_password_token'].blank?
+                upd_hash['reset_password_sent_at'] = nil if upd_hash['reset_password_sent_at'].blank?
+                if model.devise_modules.include?(:invitable)
+                  upd_hash['invitation_token'] = nil if upd_hash['invitation_token'].blank?
+                  upd_hash['invitation_created_at'] = nil if upd_hash['invitation_created_at'].blank?
+                  upd_hash['invitation_sent_at'] = nil if upd_hash['invitation_sent_at'].blank?
+                  upd_hash['invitation_accepted_at'] = nil if upd_hash['invitation_accepted_at'].blank?
+                end
+              end
+              if (json_cols = model.columns.select { |c| c.type == :json || json_overrides&.include?(c.name) }.map(&:name)).present?
+                upd_hash ||= upd_params.to_h
                 json_cols.each do |c|
                   begin
                     upd_hash[c] = JSON.parse(upd_hash[c].tr('`', '"').gsub('^^br_btick__', '`'))
                   rescue
                   end
                 end
-                obj.send(:update, upd_hash)
-              else
-                obj.send(:update, upd_params)
               end
+              obj.send(:update, upd_hash || upd_params)
             end
 
             code << "  def destroy\n"
@@ -1906,10 +1915,11 @@ class Object
                      end
                    end
               # Support friendly_id gem
+              id_simplified = id.is_a?(Array) && id.length == 1 ? id.first : id
               if Object.const_defined?('FriendlyId') && model.instance_variable_get(:@friendly_id_config)
-                model.friendly.find(id.is_a?(Array) && id.length == 1 ? id.first : id)
+                model.friendly.find(id_simplified)
               else
-                model.find(id.is_a?(Array) && id.length == 1 ? id.first : id)
+                model.find(id_simplified)
               end
             end
           end
@@ -2044,8 +2054,18 @@ end.class_exec do
         load inflections
       end
       # Now the Brick initializer since there may be important schema things configured
-      if File.exist?(brick_initializer = ::Rails.root.join('config/initializers/brick.rb'))
+      if !::Brick.initializer_loaded && File.exist?(brick_initializer = ::Rails.root.join('config/initializers/brick.rb'))
         ::Brick.initializer_loaded = load brick_initializer
+
+        # After loading the initializer, add compatibility for ActiveStorage and ActionText if those haven't already been
+        # defined.  (Further JSON configuration for ActiveStorage metadata happens later in the after_initialize hook.)
+        ['ActiveStorage', 'ActionText'].each do |ar_extension|
+          if Object.const_defined?(ar_extension) &&
+             (extension = Object.const_get(ar_extension)).respond_to?(:table_name_prefix) &&
+             !::Brick.config.table_name_prefixes.key?(as_tnp = extension.table_name_prefix)
+            ::Brick.config.table_name_prefixes[as_tnp] = ar_extension
+          end
+        end
       end
       # Load the initializer for the Apartment gem a little early so that if .excluded_models and
       # .default_schema are specified then we can work with non-tenanted models more appropriately

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

@@ -188,6 +188,17 @@ function linkSchemas() {
           (app.config.assets.paths ||= []) << assets_path
         end
 
+        # Treat ActiveStorage::Blob metadata as JSON
+        if ::Brick.config.table_name_prefixes.fetch('active_storage_', nil) == 'ActiveStorage' &&
+           ActiveStorage.const_defined?('Blob')
+          unless (md = (::Brick.config.model_descrips ||= {})).key?('ActiveStorage::Blob')
+            md['ActiveStorage::Blob'] = '[filename]'
+          end
+          unless (asbm = (::Brick.config.json_columns['active_storage_blobs'] ||= [])).include?('metadata')
+            asbm << 'metadata'
+          end
+        end
+
         # Smarten up Avo so it recognises Brick's querystring option for Apartment multi-tenancy
         if Object.const_defined?('Avo') && ::Avo.respond_to?(:railtie_namespace)
           module ::Avo
@@ -586,7 +597,11 @@ window.addEventListener(\"popstate\", linkSchemas);
                     return possible_template
                   end
                 rescue StandardError => e
-                  find_template_err = e # Can come up with stuff like Devise which has its own view templates
+                  # Search through the routes to confirm that something might match (Devise stuff for instance, which has its own view templates),
+                  # and bubble the same exception (probably an ActionView::MissingTemplate) if a legitimate option is found.
+                  raise if ::Rails.application.routes.set.find { |x| args[1].include?(x.defaults[:controller]) && args[0] == x.defaults[:action] }
+
+                  find_template_err = e
                 end
                 # Used to also have:  ActionView.version < ::Gem::Version.new('5.0') &&
                 model_name = set_brick_model(args, @_brick_req_params)&.name
@@ -646,7 +661,7 @@ window.addEventListener(\"popstate\", linkSchemas);
                                      (hm_fk_name.is_a?(String) && hm_fk_name.include?('.')) # HMT?  (Could do a better check for this)
                                     predicates = path_keys(hm_assoc, hm_fk_name, pk).map do |k, v|
                                                    if v == '[sti_type]'
-                                                     "'#{k}': @#{obj_name}.#{hm_assoc.active_record.inheritance_column}"
+                                                     "'#{k}': (@#{obj_name}.#{hm_assoc.active_record.inheritance_column}).constantize.base_class.name"
                                                    else
                                                      v.is_a?(String) ? "'#{k}': '#{v}'" : "'#{k}': @#{obj_name}.#{v}"
                                                    end
@@ -1551,8 +1566,12 @@ end
 <head>
 #{css}
 <title><%=
-  model = (obj = @#{obj_name})&.class
-  model_name = @#{obj_name}.#{inh_col = @_brick_model.inheritance_column} if obj.respond_to?(:#{inh_col})
+  base_model = (model = (obj = @#{obj_name})&.class).base_class
+  see_all_path = send(\"#\{base_model._brick_index}_path\")
+  if obj.respond_to?(:#{inh_col = @_brick_model.inheritance_column}) &&
+     (model_name = @#{obj_name}.#{inh_col}) != base_model.name
+    see_all_path << \"?#{inh_col}=#\{model_name}\"
+  end
   page_title = (\"#\{model_name ||= model.name}: #\{obj&.brick_descrip || controller_name}\")
 %></title>
 </head>
@@ -1596,7 +1615,7 @@ end
 if (description = (relation = Brick.relations[tbl_name = #{model_name}.table_name])&.fetch(:description, nil)) %><%=
   description %><br><%
 end
-%><%= link_to '(See all #{obj_name.pluralize})', #{@_brick_model._brick_index}_path %>
+%><%= link_to \"(See all #\{model_name.pluralize})\", see_all_path %>
 #{erd_markup}
 <% if obj
       # path_options = [obj.#{pk}]
@@ -1612,11 +1631,11 @@ end
 <%= form_for(obj.becomes(#{model_name}), options) do |f| %>
   <table class=\"shadow\">
   <% has_fields = false
-    @#{obj_name}.attributes.each do |k, val|
-      col = #{model_name}.columns_hash[k] %>
-    <tr>
-    <% next if (#{(pk || []).inspect}.include?(k) && !bts.key?(k)) ||
+     @#{obj_name}.attributes.each do |k, val|
+       next if !(col = #{model_name}.columns_hash[k]) ||
+               (#{(pk || []).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
       if (bt = bts[k])
@@ -1680,9 +1699,13 @@ end
            if is_bcrypt?(val) # || .readonly?
              is_revert = false %>
           <%= hide_bcrypt(val, nil, 1000) %>
-        <% elsif col_type == :string %>
-          <%= f.text_field(k.to_sym, html_options) %>
-        <% else
+        <% elsif col_type == :string
+             if model.respond_to?(:enumerized_attributes) && (opts = model.enumerized_attributes[k]&.options).present? %>
+               <%= f.select(k.to_sym, [[\"(No #\{k} chosen)\", '^^^brick_NULL^^^']] + opts, { value: val || '^^^brick_NULL^^^' }, html_options) %><%
+             else %>
+               <%= f.text_field(k.to_sym, html_options) %><%
+             end
+           else
              is_includes_text = true %>
           <%= f.hidden_field(k.to_sym, html_options) %>
           <trix-editor input=\"<%= f.field_id(k) %>\"></trix-editor>

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -1694,6 +1694,29 @@ if Gem::Specification.all_names.any? { |g| g.start_with?('ransack-') }
   end
 end
 
+# Patch Enumerize so that #becomes works when an STI subclass is becoming a base class
+# which does not include Enumerize.
+# (See https://github.com/brainspec/enumerize/issues/426)
+if Object.const_defined?('Enumerize') && Enumerize.const_defined?('ActiveRecordSupport')
+  Enumerize::ActiveRecordSupport::InstanceMethods.class_exec do
+    def becomes(klass)
+      became = super
+      klass = self.class unless klass.respond_to?(:enumerized_attributes)
+      klass.enumerized_attributes.each do |attr|
+        begin
+          if became.respond_to?(setter = "#{attr.name}=")
+            became.send(setter, send(attr.name))
+          end
+        rescue ActiveModel::MissingAttributeError
+        rescue ActiveRecord::SerializationTypeMismatch
+          became.send(setter, send(attr.name).to_ary)
+        end
+      end
+      became
+    end
+  end
+end
+
 # Keyword arguments updates for Rails <= 5.2.x and Ruby >= 3.0
 if ActiveRecord.version < ::Gem::Version.new('6.0') && ruby_version >= ::Gem::Version.new('3.0')
   admsm = ActionDispatch::MiddlewareStack::Middleware

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.122
+  version: 1.0.123
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-23 00:00:00.000000000 Z
+date: 2023-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord