brick 1.0.117 → 1.0.119

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ed704f637bf6db73f5856be2959ba3490eb721e6de052008914d12cd029a673
-  data.tar.gz: 327a383fc224aebce1c96ba96b02c8a8a8604136bf61355b13b0029c203ff5c2
+  metadata.gz: 6dfec2ebe501c46c17a7466bd98a9fb510ce6676f74c9b914da52e789e279036
+  data.tar.gz: 803598a5b59f73e81ed94079dd2b7dd55328c5c12de6d6968937b6518b68cef7
 SHA512:
-  metadata.gz: eec983fb53ff9e5f010473e7a7f1b4f1b6d07f4b8d166f4dccb66b701565a61fb91ebf30c84145dffd585e83ce13bb86c7746906b2751bbb6702ee2dc09eb7a4
-  data.tar.gz: 339edb3796933184d06de44def59b3ad5fd7d1c37995a73ffab4d62e7bb5dac0d8b63c28cb387e951e9899524ca8513fa938848449460aa234d901c28532f6c5
+  metadata.gz: 1618ef1ff14f0198d45aa0aafc5ee9e0272c82a886b0129e14cfe6c47fea1cbb55c76f32cf2a98eb93915c68a62275ad53e5ab32621da45b9a7397e2d1f95f3f
+  data.tar.gz: f34063a9ebc164bf352d96b1149f1ed501a351c3e786219a29593be13359162c9bb140cf822d9ce1494be9ea43b655afb0422008d6fcc64f59ee7050a1e84072

data/lib/brick/extensions.rb

@@ -279,7 +279,7 @@ module ActiveRecord
     end
 
     def self.brick_import_template
-      template = constants.include?(:IMPORT_TEMPLATE) ? self::IMPORT_TEMPLATE : suggest_template(false, false, 0)
+      template = constants.include?(:IMPORT_TEMPLATE) ? self::IMPORT_TEMPLATE : suggest_template(0, false, true)
       # Add the primary key to the template as being unique (unless it's already there)
       template[:uniques] = [pk = primary_key.to_sym]
       template[:all].unshift(pk) unless template[:all].include?(pk)
@@ -1034,18 +1034,19 @@ Module.class_exec do
 
              # AVO Resource
              elsif base_module == Object && Object.const_defined?('Avo') && requested.end_with?('Resource') &&
-                   ['MotorResource'].exclude?(requested) # Expect that anything called MotorResource could be from that administrative gem
-               if (model = Object.const_get(requested[0..-9]))
+                   # Expect that anything called MotorResource or SpinaResource could be from those administrative gems
+                   requested.length > 8 && ['MotorResource', 'SpinaResource'].exclude?(requested)
+               if (model = Object.const_get(requested[0..-9])) && model < ActiveRecord::Base
                  require 'generators/avo/resource_generator'
                  field_generator = Generators::Avo::ResourceGenerator.new([''])
                  field_generator.instance_variable_set(:@model, model)
-                 fields = field_generator.send(:generate_fields).split("\n")
-                                         .each_with_object([]) do |f, s|
+                 fields = field_generator.send(:generate_fields)&.split("\n")
+                                         &.each_with_object([]) do |f, s|
                                            if (f = f.strip).start_with?('field ')
                                              f = f[6..-1].split(',')
                                              s << [f.first[1..-1].to_sym, [f[1][1..-1].split(': :').map(&:to_sym)].to_h]
                                            end
-                                         end
+                                         end || []
                  built_resource = Class.new(Avo::BaseResource) do |new_resource_class|
                    self.model_class = model
                    self.title = :brick_descrip
@@ -1845,11 +1846,12 @@ class Object
 
               instance_variable_set("@#{singular_table_name}".to_sym, (obj = find_obj))
               upd_params = send(params_name_sym)
-              if (json_cols = model.columns.select { |c| c.type == :json }.map(&:name)).present?
+              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?
                 upd_hash = upd_params.to_h
                 json_cols.each do |c|
                   begin
-                    upd_hash[c] = JSON.parse(upd_hash[c]) # At least attempt to turn this into a parsed hash or array object
+                    upd_hash[c] = JSON.parse(upd_hash[c].tr('`', '"').gsub('^^br_btick__', '`'))
                   rescue
                   end
                 end
@@ -2385,11 +2387,11 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
         "NOT IN ('information_schema', 'pg_catalog', 'pg_toast', 'heroku_ext',
                  'INFORMATION_SCHEMA', 'sys')"
         :
-        "= '#{ActiveRecord::Base.connection.current_database.tr("'", "''")}'"}#{"
+        "= '#{ActiveRecord::Base.connection.current_database&.tr("'", "''")}'"}#{"
       AND t.table_schema = COALESCE(current_setting('SEARCH_PATH'), 'public')" if is_postgres && schema }
   --          AND t.table_type IN ('VIEW') -- 'BASE TABLE', 'FOREIGN TABLE'
       AND t.table_name NOT IN ('pg_stat_statements', ?, ?)
-    ORDER BY 1, t.table_type DESC, 2, kcu.ordinal_position"
+    ORDER BY 1, t.table_type DESC, 2, c.ordinal_position"
     ActiveRecord::Base.execute_sql(sql, *ar_tables)
   end
 

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

@@ -76,6 +76,11 @@ function linkSchemas() {
         [... ev.target.getElementsByTagName(\"SELECT\")].forEach(function (select) {
           if (select.value === \"^^^brick_NULL^^^\") select.value = null;
         });
+        // Take outer <div> tag off the HTML being returned by any Trix editor
+        [... document.getElementsByTagName(\"TRIX-EDITOR\")].forEach(function (trix) {
+          var trixHidden = trix.inputElement;
+          if (trixHidden) trixHidden.value = trixHidden.value.slice(5, -6);
+        });
         return true;
       });
     });
@@ -181,6 +186,21 @@ function linkSchemas() {
               end
             end
 
+            # class Fields::TextField
+            #   alias _original_initialize initialize
+            #   def initialize(id, **args, &block)
+            #     if instance_of?(::Avo::Fields::TextField) || instance_of?(::Avo::Fields::TextareaField)
+            #       args[:format_using] ||= ->(value) do
+            #         if value.is_a?(String) && value.encoding != Encoding::UTF_8
+            #           value = value.encode!("UTF-8", invalid: :replace, undef: :replace, replace: "?")
+            #         end
+            #         value
+            #       end
+            #     end
+            #     _original_initialize(id, **args, &block)
+            #   end
+            # end
+
             class App
               class << self
                 alias _brick_eager_load eager_load
@@ -215,16 +235,16 @@ function linkSchemas() {
             TurboFrameWrapperComponent.class_exec do
               alias _brick_content content
               def content
-                # Avo's logo partial fails if there is not a URL helper called exactly "root_path"
-                # (Finicky line over there is:  avo/app/views/avo/partials/_logo.html.erb:1)
                 if ::Brick.instance_variable_get(:@_brick_avo_js) == view_renderer.object_id
                   _brick_content
                 else
                   ::Brick.instance_variable_set(:@_brick_avo_js, view_renderer.object_id)
+                  # Avo's logo partial fails if there is not a URL helper called exactly "root_path"
+                  # (Finicky line over there is:  avo/app/views/avo/partials/_logo.html.erb:1)
                   unless ::Rails.application.routes.named_routes.names.include?(:root) || ActionView::Base.respond_to?(:root_path)
                     ActionView::Base.class_exec do
                       def root_path
-                        Avo::App.root_path
+                        Avo.configuration.root_path
                       end
                     end
                   end
@@ -420,6 +440,39 @@ window.addEventListener(\"popstate\", linkSchemas);
           end
         end
 
+        # Unconfigured Mobility gem?
+        if Object.const_defined?('Mobility') && Mobility.respond_to?(:translations_class)
+          # Find the current defaults
+          defs = if Mobility.instance_variable_defined?(:@translations_class)
+                   ::Mobility.translations_class.defaults
+                 else
+                   {}
+                 end
+          # Fill in the blanks for any missing defaults
+          ::Mobility.configure do |config|
+            config.plugins do
+              # Default initializer would also set these:
+              #  :backend_reader=>true
+              #  :query=>:i18n
+              #  :cache=>true
+              #  :presence=>true
+              backend :key_value, type: :string unless defs.key?(:backend)
+              reader unless defs.key?(:reader)
+              writer unless defs.key?(:writer)
+              active_record unless ::Mobility::Plugins.instance_variable_get(:@plugins)&.key?(:active_record)
+              fallbacks false unless defs.key?(:fallbacks)
+              default nil unless defs.key?(:default)
+            end
+          end
+        end
+
+        # Spina compatibility
+        if Object.const_defined?('Spina')
+          # Add JSON fields
+          (::Brick.config.json_columns['spina_accounts'] ||= []) << 'json_attributes' if ::Spina.const_defined?('Account')
+          (::Brick.config.json_columns['spina_pages'] ||= []) << 'json_attributes' if ::Spina.const_defined?('Page')
+        end
+
         # ====================================
         # Dynamically create generic templates
         # ====================================
@@ -765,6 +818,7 @@ input+svg.revert {
 
 <% is_includes_dates = nil
    is_includes_json = nil
+   is_includes_text = nil
 def is_bcrypt?(val)
   val.is_a?(String) && val.length == 60 && val.start_with?('$2a$')
 end
@@ -1519,8 +1573,11 @@ end
       # path_options << { '_brick_schema':  } if
       # url = send(:#\{model._brick_index(:singular)}_path, obj.#{pk})
       options = {}
-      options[:url] = send(\"#\{#{model_name}._brick_index(:singular)}_path\".to_sym, obj) if ::Brick.config.path_prefix
- %>
+      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| %>
   <table class=\"shadow\">
@@ -1569,32 +1626,36 @@ end
     <td>
     <table><tr><td>
     <% dt_pickers = { datetime: 'datetimepicker', timestamp: 'datetimepicker', time: 'timepicker', date: 'datepicker' }
-    html_options = {}
-    html_options[:class] = 'dimmed' unless val
-    is_revert = true
-    if bt
-      html_options[:prompt] = \"Select #\{bt_name\}\" %>
-      <%= f.select k.to_sym, bt[3], { value: val || '^^^brick_NULL^^^' }, html_options %>
-      <%= if (bt_obj = bt_class&.find_by(bt_pair[1] => val))
-            link_to('⇛', send(\"#\{bt_class.base_class._brick_index(:singular)\}_path\".to_sym, bt_obj.send(bt_class.primary_key.to_sym)), { class: 'show-arrow' })
-          elsif val
-            \"<span class=\\\"orphan\\\">Orphaned ID: #\{val}</span>\".html_safe
-          end %>
+       html_options = {}
+       html_options[:class] = 'dimmed' unless val
+       is_revert = true
+       if bt
+         html_options[:prompt] = \"Select #\{bt_name\}\" %>
+     <%= f.select k.to_sym, bt[3], { value: val || '^^^brick_NULL^^^' }, html_options %>
+     <%= if (bt_obj = bt_class&.find_by(bt_pair[1] => val))
+           link_to('⇛', send(\"#\{bt_class.base_class._brick_index(:singular)\}_path\".to_sym, bt_obj.send(bt_class.primary_key.to_sym)), { class: 'show-arrow' })
+         elsif val
+           \"<span class=\\\"orphan\\\">Orphaned ID: #\{val}</span>\".html_safe
+         end %>
     <% else
-      col_type = if ::Brick.config.json_columns[tbl_name]&.include?(k)
-                   :json
-                 elsif col&.sql_type == 'geography'
-                   col.sql_type
-                 else
-                   col&.type
-                 end
-      case (col_type ||= col&.sql_type)
-      when :string, :text %>
-        <% if is_bcrypt?(val) # || .readonly?
+         col_type = if ::Brick.config.json_columns[tbl_name]&.include?(k)
+                     :json
+                   elsif col&.sql_type == 'geography'
+                     col.sql_type
+                   else
+                     col&.type
+                   end
+         case (col_type ||= col&.sql_type)
+         when :string, :text
+           if is_bcrypt?(val) # || .readonly?
              is_revert = false %>
           <%= hide_bcrypt(val, nil, 1000) %>
-        <% else %>
+        <% elsif col_type == :string %>
           <%= f.text_field(k.to_sym, html_options) %>
+        <% else
+             is_includes_text = true %>
+          <%= f.hidden_field(k.to_sym, html_options) %>
+          <trix-editor input=\"<%= f.field_id(k) %>\"></trix-editor>
         <% end %>
       <% when :boolean %>
         <%= f.check_box k.to_sym %>
@@ -1630,10 +1691,17 @@ end
       <% when :primary_key
            is_revert = false %>
       <% when :json
-           is_includes_json = true %>
+           is_includes_json = true
+           if val.is_a?(String)
+             val_str = val
+           else
+             eheij = ActiveSupport::JSON::Encoding.escape_html_entities_in_json
+             ActiveSupport::JSON::Encoding.escape_html_entities_in_json = false if eheij
+             val_str = val.to_json
+             ActiveSupport::JSON::Encoding.escape_html_entities_in_json = eheij
+           end %>
         <%= # Because there are so danged many quotes in JSON, escape them specially by converting to backticks.
             # (and previous to this, escape backticks with our own goofy code of ^^br_btick__ )
-            val_str = val.is_a?(String) ? val : val.to_json # Clean up bogus JSON if necessary
             json_field = f.hidden_field k.to_sym, { class: 'jsonpicker', value: val_str.gsub('`', '^^br_btick__').tr('\"', '`').html_safe } %>
         <div id=\"_br_json_<%= f.field_id(k) %>\"></div>
       <% else %>
@@ -1739,6 +1807,11 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
 <link rel=\"stylesheet\" type=\"text/css\" href=\"https://cdnjs.cloudflare.com/ajax/libs/slim-select/1.27.1/slimselect.min.css\">
 <% end %>
 
+<% if is_includes_text %>
+<script src=\"https://cdn.jsdelivr.net/npm/trix@2.0/dist/trix.umd.min.js\"></script>
+<link rel=\"stylesheet\" type=\"text/css\" href=\"https://cdn.jsdelivr.net/npm/trix@2.0/dist/trix.min.css\">
+<% end %>
+
 <% # Started with v0.14.4 of vanilla-jsoneditor
    if is_includes_json %>
 <link rel=\"stylesheet\" type=\"text/css\" href=\"https://cdn.jsdelivr.net/npm/vanilla-jsoneditor/themes/jse-theme-default.min.css\">
@@ -1756,7 +1829,7 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
           onChange: (function (inp2) {
             return function (updatedContent, previousContent, contentErrors, patchResult) {
               // console.log('onChange', updatedContent.json, updatedContent.text);
-              inp2.value = updatedContent.text || JSON.stringify(updatedContent.json);
+              inp2.value = (updatedContent.text || JSON.stringify(updatedContent.json)).replace(/`/g, \"\\^\\^br_btick__\").replace(/\"/g, '`');
             };
           })(inp)
         }

data/lib/brick/version_number.rb

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

metadata

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