brick 1.0.118 → 1.0.119

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc284b8783ca27862ff567079ba680a238690e3779a57d705ee67a54ed016ab2
-  data.tar.gz: 812044a88cff33dbf4fe7dbfa37a80e91b1b1a94980091590f4665a123529e80
+  metadata.gz: 6dfec2ebe501c46c17a7466bd98a9fb510ce6676f74c9b914da52e789e279036
+  data.tar.gz: 803598a5b59f73e81ed94079dd2b7dd55328c5c12de6d6968937b6518b68cef7
 SHA512:
-  metadata.gz: 9a5f82a5956b40beeaa8aeca2861672561ea552b3b21cb85ebf9b426a31bdbd4025f4c047131ae962cdefb31378c8845c9bea947a50dfc34cf497cd9b68ae6b9
-  data.tar.gz: 83e1c1399045dc67d6c5dcd98347d2c84a7dec4ac474b5cc09da43b86ce21859d01204844be75d6764a5653c7ea1c220f3887835d07f703c789a82b6311bfad0
+  metadata.gz: 1618ef1ff14f0198d45aa0aafc5ee9e0272c82a886b0129e14cfe6c47fea1cbb55c76f32cf2a98eb93915c68a62275ad53e5ab32621da45b9a7397e2d1f95f3f
+  data.tar.gz: f34063a9ebc164bf352d96b1149f1ed501a351c3e786219a29593be13359162c9bb140cf822d9ce1494be9ea43b655afb0422008d6fcc64f59ee7050a1e84072

data/lib/brick/extensions.rb

@@ -1846,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

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

@@ -186,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
@@ -451,6 +466,13 @@ window.addEventListener(\"popstate\", linkSchemas);
           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
         # ====================================
@@ -1551,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\">
@@ -1666,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 %>
@@ -1797,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 = 118
+    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.118
+  version: 1.0.119
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-03 00:00:00.000000000 Z
+date: 2023-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord